diff --git a/_G/Pylons/B-1B_10-store_Conventional_Bomb_Module.lua b/_G/Pylons/B-1B_10-store_Conventional_Bomb_Module.lua new file mode 100644 index 00000000..043eaeca --- /dev/null +++ b/_G/Pylons/B-1B_10-store_Conventional_Bomb_Module.lua @@ -0,0 +1,16 @@ +_G["Pylons"]["B-1B_10-store_Conventional_Bomb_Module"] = { + IsAdapter = true, + ShapeName = "B-1B_10-store_Conventional_Bomb_Module", + _unique_resource_name = "weapons.adapters.B-1B_10-store_Conventional_Bomb_Module", + index = "Redacted", + name = "B-1B_10-store_Conventional_Bomb_Module", + shape_table_data = { { + file = "B-1B_10-store_Conventional_Bomb_Module", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "B-1B_10-store_Conventional_Bomb_Module", + username = "B-1B_10-store_Conventional_Bomb_Module" + } }, + ws_type = { 4, 15, 47, "Redacted" } +} \ No newline at end of file diff --git a/_G/Pylons/B-1B_28-store_Conventional_Bomb_Module.lua b/_G/Pylons/B-1B_28-store_Conventional_Bomb_Module.lua new file mode 100644 index 00000000..fa856b74 --- /dev/null +++ b/_G/Pylons/B-1B_28-store_Conventional_Bomb_Module.lua @@ -0,0 +1,16 @@ +_G["Pylons"]["B-1B_28-store_Conventional_Bomb_Module"] = { + IsAdapter = true, + ShapeName = "B-1B_28-store_Conventional_Bomb_Module", + _unique_resource_name = "weapons.adapters.B-1B_28-store_Conventional_Bomb_Module", + index = "Redacted", + name = "B-1B_28-store_Conventional_Bomb_Module", + shape_table_data = { { + file = "B-1B_28-store_Conventional_Bomb_Module", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "B-1B_28-store_Conventional_Bomb_Module", + username = "B-1B_28-store_Conventional_Bomb_Module" + } }, + ws_type = { 4, 15, 47, "Redacted" } +} \ No newline at end of file diff --git a/_G/Pylons/B-1B_Conventional_Rotary_Launcher.lua b/_G/Pylons/B-1B_Conventional_Rotary_Launcher.lua new file mode 100644 index 00000000..9d6b92d4 --- /dev/null +++ b/_G/Pylons/B-1B_Conventional_Rotary_Launcher.lua @@ -0,0 +1,16 @@ +_G["Pylons"]["B-1B_Conventional_Rotary_Launcher"] = { + IsAdapter = true, + ShapeName = "B-1B_Conventional_Rotary_Launcher", + _unique_resource_name = "weapons.adapters.B-1B_Conventional_Rotary_Launcher", + index = "Redacted", + name = "B-1B_Conventional_Rotary_Launcher", + shape_table_data = { { + file = "B-1B_Conventional_Rotary_Launcher", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "B-1B_Conventional_Rotary_Launcher", + username = "B-1B_Conventional_Rotary_Launcher" + } }, + 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 deleted file mode 100644 index bf00ba1c..00000000 --- a/_G/Pylons/B_1_B_10-store_Conventional_Bomb_Module.lua +++ /dev/null @@ -1,16 +0,0 @@ -_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 deleted file mode 100644 index fac6c6b3..00000000 --- a/_G/Pylons/B_1_B_28-store_Conventional_Bomb_Module.lua +++ /dev/null @@ -1,16 +0,0 @@ -_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 deleted file mode 100644 index b543169e..00000000 --- a/_G/Pylons/B_1_B_Conventional_Rotary_Launcher.lua +++ /dev/null @@ -1,16 +0,0 @@ -_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/lau-117.lua b/_G/Pylons/lau-117.lua index 332a7fcc..3a476374 100644 --- a/_G/Pylons/lau-117.lua +++ b/_G/Pylons/lau-117.lua @@ -1,7 +1,17 @@ -_G["Pylons"]["LAU-117"] = { - ShapeName = "LAU-117", - _unique_resource_name = "weapons.adapters.LAU-117", +_G["Pylons"]["lau-117"] = { + IsAdapter = true, + Position = { 0, 0, 0 }, + ShapeName = "lau-117", + _unique_resource_name = "weapons.adapters.lau-117", index = "Redacted", - name = "LAU-117", + name = "lau-117", + shape_table_data = { { + file = "lau-117", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "lau-117", + username = "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 d6ac7ca7..a3597180 100644 --- a/_G/__DCS_VERSION__.lua +++ b/_G/__DCS_VERSION__.lua @@ -1 +1 @@ -2.9.10.3948 \ No newline at end of file +2.9.11.4686 \ No newline at end of file diff --git a/_G/bombs/BELOUGA.lua b/_G/bombs/BELOUGA.lua deleted file mode 100644 index 1f55a21a..00000000 --- a/_G/bombs/BELOUGA.lua +++ /dev/null @@ -1,16 +0,0 @@ -_G["bombs"]["#Index"] = { - Ag = -1.23, - Cx = 0.000413, - Name = "Redacted", - VyHold = -100, - _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, - name = "BELOUGA", - type = 5, - ws_type = { 4, 5, 38, "Redacted" } -} \ No newline at end of file diff --git a/_G/bombs/BLG66.lua b/_G/bombs/BLG66.lua index 94791f39..dca74cdb 100644 --- a/_G/bombs/BLG66.lua +++ b/_G/bombs/BLG66.lua @@ -7,9 +7,9 @@ _G["bombs"]["#Index"] = { _origin = "AircraftWeaponPack", display_name = "BLG-66 Belouga AC", display_name_short = "BLG-66", - hMax = 5000, - hMin = 60.96, - mass = 305, + hMax = 250, + hMin = 85, + mass = 300, name = "BLG66", type = 5, ws_type = { 4, 5, 38, "Redacted" } diff --git a/_G/bombs/BLG66_EG.lua b/_G/bombs/BLG66_EG.lua new file mode 100644 index 00000000..4c4ebb39 --- /dev/null +++ b/_G/bombs/BLG66_EG.lua @@ -0,0 +1,16 @@ +_G["bombs"]["#Index"] = { + Ag = -1.23, + Cx = 0.000413, + Name = "Redacted", + VyHold = -100, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", + _origin = "AircraftWeaponPack", + display_name = "BLG-66 Belouga EG", + display_name_short = "BLG-66", + hMax = 250, + hMin = 85, + mass = 300, + name = "BLG66_EG", + type = 5, + ws_type = { 4, 5, 38, "Redacted" } +} \ No newline at end of file diff --git a/_G/bombs/LS-6-100.lua b/_G/bombs/LS-6-100.lua deleted file mode 100644 index 71c84561..00000000 --- a/_G/bombs/LS-6-100.lua +++ /dev/null @@ -1,34 +0,0 @@ -_G["bombs"]["#Index"] = { - Ag = -1.23, - AspectDistData = { 15, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 2, 9, 14, 23, 20, 20, 20, 24, 13, 10, 500, 2, 10, 15, 24, 37, 23, 19, 24, 13, 14, 700, 4, 10, 16, 24, 38, 29, 32, 32, 20, 18, 1000, 6, 10, 17, 26, 38, 26, 33, 34, 36, 38, 2000, 8, 10, 24, 29, 38, 20, 28, 34, 45, 45, 3000, 10, 20, 24, 32, 40, 15, 22, 34, 45, 45, 4000, 12, 20, 24, 33, 40, 15, 45, 36, 45, 45, 5000, 14, 20, 36, 40, 40, 40, 45, 36, 45, 45, 6000, 16, 18, 40, 40, 42, 45, 45, 36, 45, 45, 7000, 18, 38, 45, 35, 45, 45, 45, 45, 45, 45, 8000, 20, 22, 35, 35, 45, 45, 45, 45, 45, 35, 9000, 20, 22, 28, 28, 43, 45, 45, 45, 45, 35, 10000, 20, 22, 28, 33, 42, 45, 45, 45, 45, 35, 11000, 20, 22, 28, 34, 36, 38, 45, 45, 45, 45, 12000, 16, 21, 27, 33, 36, 38, 45, 45, 45, 45 }, - Cx = 0.00043, - LaunchDistData = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 1090, 1890, 3760, 6310, 7350, 5760, 16090, 16910, 16850, 22820, 500, 1240, 1960, 3830, 6140, 8520, 13590, 13990, 13620, 22740, 22790, 700, 1000, 2120, 3960, 6680, 9620, 15840, 15840, 16160, 22840, 22840, 1000, 1860, 2380, 4380, 6920, 10020, 16100, 20560, 21900, 21920, 26160, 2000, 2400, 4850, 4950, 7850, 11300, 20200, 22850, 22900, 22900, 26750, 3000, 4550, 5950, 8550, 8600, 12200, 22900, 26650, 26700, 26750, 26750, 4000, 3850, 7050, 9350, 9400, 13150, 25750, 25800, 25850, 25900, 30350, 5000, 7300, 7400, 11900, 18700, 18800, 28500, 30200, 30300, 30300, 30400, 6000, 5600, 7300, 13000, 21100, 20000, 32000, 32000, 32000, 32100, 32200, 7000, 6800, 8700, 15400, 15400, 15400, 30500, 30500, 30500, 30700, 47600, 8000, 8000, 14200, 18600, 23200, 27200, 36200, 36200, 36200, 36400, 51200, 9000, 9200, 16400, 20800, 24200, 31800, 34200, 34200, 34200, 34200, 55000, 10000, 15600, 18000, 23200, 26400, 32800, 40200, 42800, 42800, 42800, 59000, 11000, 16500, 21000, 25500, 28500, 33500, 41000, 48000, 53500, 58000, 62500, 12000, 20000, 23000, 26000, 30500, 34500, 42500, 49500, 56000, 61000, 66500, 13000, 27000, 24500, 29000, 33000, 37000, 43000, 51000, 58000, 64500, 70000, 14000, 21000, 32000, 35500, 36500, 39000, 44000, 52000, 60000, 67500, 73500, 15000, 23000, 33000, 39000, 40000, 42000, 46500, 53000, 61500, 69500, 77000 }, - MaxTOF = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 11.4, 14.2, 24.8, 33.7, 27.6, 17.8, 65.9, 53.1, 49, 84.5, 500, 13, 15.8, 26, 28.6, 34.1, 48.8, 50.7, 39.8, 90.1, 63.7, 700, 11.3, 16.5, 24.6, 36.9, 46.1, 74.1, 62.7, 49.2, 72.7, 69.6, 1000, 19.3, 19.5, 29.1, 36.7, 49.4, 77.6, 88.3, 86.4, 84.8, 83.6, 2000, 26.3, 38.2, 30.7, 42.1, 55.9, 91, 91.7, 89.5, 84.3, 88.3, 3000, 40.2, 46.1, 59.7, 47.4, 57.6, 99.1, 108, 103.4, 116.7, 92.6, 4000, 38.1, 53.3, 60.6, 52.8, 62, 109.4, 99.7, 117.7, 91.9, 98.1, 5000, 57.2, 54.7, 78.1, 104, 100.2, 120.2, 117.1, 120.2, 136.6, 100, 6000, 53.6, 54.8, 83.2, 104.8, 103.7, 142.7, 122, 124.1, 142, 103, 7000, 60.8, 69, 93.8, 80.1, 73.1, 120.8, 119.1, 138.3, 102.3, 158.1, 8000, 67.7, 102.8, 109, 110.5, 134.5, 134.1, 143.5, 154.1, 156.8, 158.9, 9000, 74, 97.7, 119, 115.3, 131.1, 137.7, 135.6, 153.9, 109.5, 168.9, 10000, 107.1, 103.7, 126.3, 132, 134.8, 150.8, 151.4, 179.9, 173.6, 179.7, 11000, 110.7, 118.7, 133.9, 138.8, 136.9, 151.1, 166.9, 177.4, 182.1, 187.2, 12000, 123.1, 127.6, 136.9, 142.4, 132.3, 158.5, 170.2, 184.1, 188.9, 197.4, 13000, 128.2, 136, 143, 148.8, 159.8, 158.9, 174.9, 188, 199, 204.7, 14000, 135.4, 163.9, 155.1, 160, 161.7, 165, 177.7, 193.5, 206.8, 212.5, 15000, 145, 173.8, 163.8, 166.4, 170, 180.5, 182.6, 197.6, 209.5, 221.3 }, - MidTOF = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 11.1, 10, 13, 16.5, 15.9, 11.7, 41.6, 45.5, 38.3, 55.6, 500, 12.7, 10.8, 13.6, 16.2, 18.4, 26.1, 37.4, 22.1, 50.6, 49.1, 700, 11.2, 12.7, 14.4, 17.7, 20.8, 30.9, 28, 36.2, 6.2, 34.4, 1000, 16.7, 14.4, 16.5, 18.4, 22.1, 31.9, 37.7, 37.1, 34.9, 40.3, 2000, 20.7, 31.5, 20.2, 22.8, 25.6, 42.3, 43.2, 41.1, 37.4, 45.5, 3000, 36.3, 27.2, 33.9, 25.3, 28, 48.1, 51.9, 46.9, 44.1, 42, 4000, 36.8, 41.7, 37.6, 28.6, 30.2, 53.9, 46.6, 44.7, 42.5, 54.5, 5000, 45.9, 34.2, 52.4, 75.1, 42.3, 58.1, 54.7, 51.5, 49.5, 47.2, 6000, 44, 36.4, 55.5, 92.5, 44.1, 66.5, 55.6, 52.7, 51, 48.8, 7000, 47, 52.2, 56, 43.6, 36.5, 58.3, 51.3, 46.1, 47.3, 73.9, 8000, 49.6, 64, 65.1, 76.9, 62.9, 73.9, 61.5, 55.1, 52.9, 76.8, 9000, 54.5, 68.9, 79.2, 69, 91.4, 65.6, 56.2, 52.1, 47.7, 79.4, 10000, 69.3, 71.3, 83.3, 89, 83.9, 86.5, 71.5, 64.7, 58.6, 83.5, 11000, 70.1, 78.1, 86.4, 90.9, 82.6, 80.8, 82, 84.5, 81.6, 86.5, 12000, 78, 80.8, 84.6, 92.4, 83.3, 83.3, 82.1, 85.6, 84.7, 89.4, 13000, 102.7, 82.6, 89.3, 95.2, 95.3, 81.4, 83.9, 88.2, 88.8, 90.2, 14000, 78, 105.5, 105.4, 99.6, 95.5, 83.8, 84, 89.3, 91.2, 94, 15000, 81.5, 103.2, 112, 103.3, 100, 90.2, 85.3, 90.5, 91.4, 101 }, - MinLaunchDistData = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 1020, 1020, 1290, 1560, 1800, 2050, 2200, 2400, 2600, 2750, 500, 1180, 1110, 1400, 1650, 1970, 2510, 2400, 2500, 2750, 2900, 700, 1100, 1260, 1580, 1840, 2200, 2840, 3140, 9160, 4060, 4380, 1000, 1040, 1400, 1760, 2040, 2420, 3100, 3680, 4040, 4420, 5000, 2000, 1250, 1900, 2050, 2450, 2800, 3700, 4400, 5550, 5350, 6150, 3000, 2550, 2150, 2150, 2500, 2850, 3800, 4700, 5400, 5950, 6700, 4000, 2550, 2250, 1900, 2350, 2700, 3750, 4400, 5400, 6150, 7450, 5000, 1400, 1900, 1500, 2300, 2900, 3400, 4000, 5400, 6400, 7500, 6000, 1800, 1300, 1600, 2200, 2400, 3200, 3300, 4600, 6200, 7500, 7000, 1200, 1300, 1700, 1700, 1700, 2400, 2400, 2400, 5600, 8000, 8000, 1200, 1600, 1800, 2000, 2200, 2600, 2600, 2600, 4200, 7800, 9000, 1400, 1800, 1800, 2000, 2400, 2600, 2600, 2600, 2600, 7600, 10000, 1800, 1800, 2000, 2200, 2400, 3800, 3000, 3000, 3000, 7600, 11000, 1500, 2000, 2000, 2000, 2500, 3000, 3000, 3500, 3500, 7500, 12000, 1500, 2000, 2000, 2000, 2500, 3000, 3000, 3500, 4000, 7500, 13000, 2000, 2000, 2500, 2500, 2500, 3000, 3500, 3500, 4000, 6500, 14000, 2000, 2500, 2500, 2500, 2500, 3000, 3500, 3500, 4000, 7500, 15000, 2000, 2500, 2500, 2500, 3000, 3000, 3500, 4000, 4000, 10500 }, - MinTOF = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 10.9, 7.6, 7, 6.7, 6.3, 6.2, 5.9, 5.8, 5.7, 5.5, 500, 12.6, 8.5, 7.8, 7.3, 7, 7.6, 6.5, 6.2, 6.1, 6.5, 700, 13, 10.1, 9.2, 8.5, 8.1, 8.7, 8.5, 24.6, 9.1, 9, 1000, 13.4, 12.1, 11, 10, 9.5, 9.9, 10.2, 10.1, 10.1, 10.5, 2000, 20, 18.8, 16.3, 14.7, 13.5, 13.3, 13.4, 14.7, 13.2, 13.7, 3000, 31.7, 24.5, 21.1, 19, 17.3, 16.3, 16.1, 15.9, 15.7, 15.9, 4000, 36.7, 30.8, 25.5, 23.2, 21.4, 19.5, 18.4, 18, 17.8, 18.5, 5000, 36.2, 36.2, 30.3, 26.9, 24.6, 22.9, 21.4, 20.4, 20.2, 20.2, 6000, 46.1, 41.5, 34.2, 30.5, 29.1, 26.4, 25.4, 23.2, 22.3, 22.1, 7000, 50.4, 47.2, 37.5, 35, 34.7, 31.8, 30.5, 30.7, 24.7, 24.5, 8000, 52.6, 54.2, 41.4, 37.9, 36.3, 34.6, 33, 32.3, 29, 26.4, 9000, 54.3, 58.5, 45.4, 41.4, 38.8, 38.1, 36.6, 35.5, 36.5, 28.8, 10000, 53.4, 60.8, 49.8, 44.4, 42.4, 38.2, 38.8, 38, 38.5, 31.6, 11000, 56, 62.5, 53.9, 48.9, 45.4, 43.4, 41.9, 40.3, 40.6, 34.6, 12000, 57.9, 62.5, 57.7, 52.1, 48.7, 46.8, 45.3, 43.7, 42.9, 37.8, 13000, 59, 64, 60.5, 54, 52.3, 50.8, 47.4, 47, 46.8, 43.3, 14000, 60.8, 64.4, 64.3, 57.3, 56.4, 54.4, 50.3, 49.9, 51, 45.4, 15000, 62.6, 66, 67.6, 61.1, 58.2, 57.9, 53.8, 52.8, 55.5, 44.7 }, - Name = "Redacted", - VyHold = -100, - _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, - name = "LS-6-100", - type = 4, - warhead = { - caliber = 160, - concrete_factors = { 3, 1, 1 }, - concrete_obj_factor = 2, - cumulative_factor = 3, - cumulative_thickness = 0, - expl_mass = 40, - mass = 40, - obj_factors = { 3, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - ws_type = { 4, 5, 36, "Redacted" } -} \ No newline at end of file diff --git a/_G/db/Sensors/Sensor/AEGIS_search_radar.lua b/_G/db/Sensors/Sensor/AEGIS_search_radar.lua new file mode 100644 index 00000000..755e1c41 --- /dev/null +++ b/_G/db/Sensors/Sensor/AEGIS_search_radar.lua @@ -0,0 +1,24 @@ +_G["db"]["Sensors"]["Sensor"]["#Index"] = { + DisplayName = "AEGIS_search_radar", + Name = "AEGIS_search_radar", + SensorType = 1, + category = 1, + detection_distance = { { 260000, + [0] = 260000 + }, + [0] = { 260000, + [0] = 260000 + } + }, + lock_on_distance_coeff = 0.85, + max_measuring_distance = 260000, + scan_period = 1, + scan_volume = { + azimuth = { -180, 180 }, + elevation = { 1, 83 } + }, + type = 0, + velocity_limits = { + radial_velocity_min = 0 + } +} \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/2S6 Tunguska.lua b/_G/db/Units/Cars/Car/2S6 Tunguska.lua index f1c2e537..e8c86f40 100644 --- a/_G/db/Units/Cars/Car/2S6 Tunguska.lua +++ b/_G/db/Units/Cars/Car/2S6 Tunguska.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.82, 0 }, DetectionRange = 18000, DisplayName = 'SAM SA-19 Tunguska "Grison" ', DisplayNameShort = "SA-19", diff --git a/_G/db/Units/Cars/Car/AA8.lua b/_G/db/Units/Cars/Car/AA8.lua index 0e7a82e7..0dfb41c9 100644 --- a/_G/db/Units/Cars/Car/AA8.lua +++ b/_G/db/Units/Cars/Car/AA8.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Russia", "USSR" }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "Firefighter Vehicle AA-7.2/60", DisplayNameShort = "AA-7.2", diff --git a/_G/db/Units/Cars/Car/AAV7.lua b/_G/db/Units/Cars/Car/AAV7.lua index 45b240ab..88d93119 100644 --- a/_G/db/Units/Cars/Car/AAV7.lua +++ b/_G/db/Units/Cars/Car/AAV7.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.75, 0 }, DetectionRange = 0, DisplayName = "APC AAV-7 Amphibious", DisplayNameShort = "AAV-7A1", diff --git a/_G/db/Units/Cars/Car/ATMZ-5.lua b/_G/db/Units/Cars/Car/ATMZ-5.lua index f0f67fbf..45c4bc56 100644 --- a/_G/db/Units/Cars/Car/ATMZ-5.lua +++ b/_G/db/Units/Cars/Car/ATMZ-5.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "Refueler ATMZ-5", DisplayNameShort = "AMTZ5", diff --git a/_G/db/Units/Cars/Car/ATZ-10.lua b/_G/db/Units/Cars/Car/ATZ-10.lua index 46167aa1..4089fbc6 100644 --- a/_G/db/Units/Cars/Car/ATZ-10.lua +++ b/_G/db/Units/Cars/Car/ATZ-10.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "Refueler ATZ-10", DisplayNameShort = "ATZ10", diff --git a/_G/db/Units/Cars/Car/ATZ-5.lua b/_G/db/Units/Cars/Car/ATZ-5.lua index 9900376f..477214ad 100644 --- a/_G/db/Units/Cars/Car/ATZ-5.lua +++ b/_G/db/Units/Cars/Car/ATZ-5.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Russia", "USSR" }, + CustomAimPoint = { 0, 1.35, 0 }, DetectionRange = 0, DisplayName = "Refueler ATZ-5", DisplayNameShort = "ATZ-5", diff --git a/_G/db/Units/Cars/Car/ATZ-60_Maz.lua b/_G/db/Units/Cars/Car/ATZ-60_Maz.lua index 09463d1b..d59fbf0e 100644 --- a/_G/db/Units/Cars/Car/ATZ-60_Maz.lua +++ b/_G/db/Units/Cars/Car/ATZ-60_Maz.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Russia", "USSR" }, + CustomAimPoint = { 0, 1.35, 0 }, DetectionRange = 0, DisplayName = "Refueler ATZ-60 Tractor (MAZ-7410)", DisplayNameShort = "MAZ", diff --git a/_G/db/Units/Cars/Car/BMP-1.lua b/_G/db/Units/Cars/Car/BMP-1.lua index 997f049e..4ea402ae 100644 --- a/_G/db/Units/Cars/Car/BMP-1.lua +++ b/_G/db/Units/Cars/Car/BMP-1.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.15, 0 }, DetectionRange = 0, DisplayName = "IFV BMP-1", DisplayNameShort = "BMP1", diff --git a/_G/db/Units/Cars/Car/BMP-2.lua b/_G/db/Units/Cars/Car/BMP-2.lua index 2e11ec9e..fb009117 100644 --- a/_G/db/Units/Cars/Car/BMP-2.lua +++ b/_G/db/Units/Cars/Car/BMP-2.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.15, 0 }, DetectionRange = 0, DisplayName = "IFV BMP-2", DisplayNameShort = "BMP2", diff --git a/_G/db/Units/Cars/Car/BMP-3.lua b/_G/db/Units/Cars/Car/BMP-3.lua index 6e1de15a..26f1fec9 100644 --- a/_G/db/Units/Cars/Car/BMP-3.lua +++ b/_G/db/Units/Cars/Car/BMP-3.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.25, 0 }, DetectionRange = 0, DisplayName = "IFV BMP-3", DisplayNameShort = "BMP3", diff --git a/_G/db/Units/Cars/Car/BRDM-2.lua b/_G/db/Units/Cars/Car/BRDM-2.lua index c1503ba8..220aa17b 100644 --- a/_G/db/Units/Cars/Car/BRDM-2.lua +++ b/_G/db/Units/Cars/Car/BRDM-2.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.4, 0 }, DetectionRange = 0, DisplayName = "Scout BRDM-2", DisplayNameShort = "BRDM2", diff --git a/_G/db/Units/Cars/Car/BTR-80.lua b/_G/db/Units/Cars/Car/BTR-80.lua index de3a6e9f..0ebf8324 100644 --- a/_G/db/Units/Cars/Car/BTR-80.lua +++ b/_G/db/Units/Cars/Car/BTR-80.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "USSR" }, + CustomAimPoint = { 0, 1.38, 0 }, DetectionRange = 0, DisplayName = "APC BTR-80", DisplayNameShort = "BTR80", diff --git a/_G/db/Units/Cars/Car/BTR-82A.lua b/_G/db/Units/Cars/Car/BTR-82A.lua index f088639a..bf27470f 100644 --- a/_G/db/Units/Cars/Car/BTR-82A.lua +++ b/_G/db/Units/Cars/Car/BTR-82A.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Kazakhstan", "Russia", "Syria" }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "IFV BTR-82A", DisplayNameShort = "BTR82A", diff --git a/_G/db/Units/Cars/Car/CCKW_353.lua b/_G/db/Units/Cars/Car/CCKW_353.lua index 09ed5583..417929fa 100644 --- a/_G/db/Units/Cars/Car/CCKW_353.lua +++ b/_G/db/Units/Cars/Car/CCKW_353.lua @@ -12,6 +12,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Australia", "Belgium", "Canada", "Czech Republic", "France", "Italia", "Poland", "The Netherlands", "UK", "USA", "USSR", "Yugoslavia" }, + CustomAimPoint = { 0, 1.3, 0 }, DetectionRange = 0, DisplayName = 'Truck GMC "Jimmy" 6x6', DisplayNameShort = "CCKW335", diff --git a/_G/db/Units/Cars/Car/Challenger2.lua b/_G/db/Units/Cars/Car/Challenger2.lua index 8bcf9286..932fd50b 100644 --- a/_G/db/Units/Cars/Car/Challenger2.lua +++ b/_G/db/Units/Cars/Car/Challenger2.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.55, 0 }, DetectionRange = 0, DisplayName = "MBT Challenger II", DisplayNameShort = "Chall-II", diff --git a/_G/db/Units/Cars/Car/Churchill_VII.lua b/_G/db/Units/Cars/Car/Churchill_VII.lua index a7605bd0..00bbac22 100644 --- a/_G/db/Units/Cars/Car/Churchill_VII.lua +++ b/_G/db/Units/Cars/Car/Churchill_VII.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Australia", "Belgium", "Canada", "Czech Republic", "France", "Italia", "Poland", "The Netherlands", "UK", "USA", "USSR", "Yugoslavia" }, + CustomAimPoint = { 0, 1.2, 0 }, DM = { { area_name = "TURRET_FRONT", armour = { diff --git a/_G/db/Units/Cars/Car/Cobra.lua b/_G/db/Units/Cars/Car/Cobra.lua index 871c2d6c..d5dddc57 100644 --- a/_G/db/Units/Cars/Car/Cobra.lua +++ b/_G/db/Units/Cars/Car/Cobra.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.3, 0 }, DetectionRange = 0, DisplayName = "Scout Cobra", DisplayNameShort = "Cobra", diff --git a/_G/db/Units/Cars/Car/Daimler_AC.lua b/_G/db/Units/Cars/Car/Daimler_AC.lua index bb575546..addb3d40 100644 --- a/_G/db/Units/Cars/Car/Daimler_AC.lua +++ b/_G/db/Units/Cars/Car/Daimler_AC.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Australia", "Belgium", "Canada", "Czech Republic", "France", "Italia", "Poland", "The Netherlands", "UK", "USA", "USSR", "Yugoslavia" }, + CustomAimPoint = { 0, 1.2, 0 }, DetectionRange = 0, DisplayName = "Car Daimler Armored", DisplayNameShort = "Daimler", diff --git a/_G/db/Units/Cars/Car/Elefant_SdKfz_184.lua b/_G/db/Units/Cars/Car/Elefant_SdKfz_184.lua index acf42fbd..3d647d09 100644 --- a/_G/db/Units/Cars/Car/Elefant_SdKfz_184.lua +++ b/_G/db/Units/Cars/Car/Elefant_SdKfz_184.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Germany", "Third Reich", "Japan", "Italian Social Republic", "Finland", "Hungary", "Romania", "Bulgaria" }, + CustomAimPoint = { 0, 1.35, 0 }, DM = { { area_name = "GUN_MASK", armour = { diff --git a/_G/db/Units/Cars/Car/GAZ-3307.lua b/_G/db/Units/Cars/Car/GAZ-3307.lua index 0eec3dce..9079a6a3 100644 --- a/_G/db/Units/Cars/Car/GAZ-3307.lua +++ b/_G/db/Units/Cars/Car/GAZ-3307.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.5, 0 }, DetectionRange = 0, DisplayName = "Truck GAZ-3307", DisplayNameShort = "GAZ-3307", diff --git a/_G/db/Units/Cars/Car/GAZ-3308.lua b/_G/db/Units/Cars/Car/GAZ-3308.lua index c31079d4..a8f20551 100644 --- a/_G/db/Units/Cars/Car/GAZ-3308.lua +++ b/_G/db/Units/Cars/Car/GAZ-3308.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.5, 0 }, DetectionRange = 0, DisplayName = "Truck GAZ-3308", DisplayNameShort = "GAZ-3308", diff --git a/_G/db/Units/Cars/Car/GAZ-66.lua b/_G/db/Units/Cars/Car/GAZ-66.lua index de2d7ca0..1a2a472e 100644 --- a/_G/db/Units/Cars/Car/GAZ-66.lua +++ b/_G/db/Units/Cars/Car/GAZ-66.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.6, 0 }, DetectionRange = 0, DisplayName = "Truck GAZ-66", DisplayNameShort = "GAZ-66", diff --git a/_G/db/Units/Cars/Car/Gepard.lua b/_G/db/Units/Cars/Car/Gepard.lua index d8697da7..67341a92 100644 --- a/_G/db/Units/Cars/Car/Gepard.lua +++ b/_G/db/Units/Cars/Car/Gepard.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.71, 0 }, DetectionRange = 15000, DisplayName = "SPAAA Gepard", DisplayNameShort = "Gepard", diff --git a/_G/db/Units/Cars/Car/Grad-URAL.lua b/_G/db/Units/Cars/Car/Grad-URAL.lua index b6db4c4d..2c43f9ff 100644 --- a/_G/db/Units/Cars/Car/Grad-URAL.lua +++ b/_G/db/Units/Cars/Car/Grad-URAL.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "MLRS BM-21 Grad 122mm", DisplayNameShort = "BM-21", diff --git a/_G/db/Units/Cars/Car/HEMTT TFFT.lua b/_G/db/Units/Cars/Car/HEMTT TFFT.lua index 28bc6f35..d9c80b39 100644 --- a/_G/db/Units/Cars/Car/HEMTT TFFT.lua +++ b/_G/db/Units/Cars/Car/HEMTT TFFT.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.55, 0 }, DetectionRange = 0, DisplayName = "Firefighter HEMMT TFFT", DisplayNameShort = "M1142", diff --git a/_G/db/Units/Cars/Car/HEMTT_C-RAM_Phalanx.lua b/_G/db/Units/Cars/Car/HEMTT_C-RAM_Phalanx.lua index 003fece3..ba69cf28 100644 --- a/_G/db/Units/Cars/Car/HEMTT_C-RAM_Phalanx.lua +++ b/_G/db/Units/Cars/Car/HEMTT_C-RAM_Phalanx.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "USA" }, + CustomAimPoint = { 0, 1.65, 0 }, DetectionRange = 10000, DisplayName = "LPWS C-RAM", DisplayNameShort = "C-RAM", @@ -44,7 +45,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { fire_on_march = false, maxTargetDetectionRange = 10000, radar_type = 104, - searchRadarFrequencies = { { 12000000000, 18000000000 } } + searchRadarFrequencies = { { 12000000000, 18000000000 } }, + searchRadarMaxElevation = 1.3962634015955 }, Waypoint_Custom_Panel = true, _file = "./CoreMods/tech/HeavyMetalCore/Database/db_units_cars.lua", @@ -82,6 +84,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { mapclasskey = "SPAAA_RAD_Truck", maxDeviationPitch = 0.087266462599716, maxDeviationRoll = 0.17453292519943, + radar_rotation_period = 1, sensor = { height = 3.872, max_alt_finding_target = 6000, diff --git a/_G/db/Units/Cars/Car/Hummer.lua b/_G/db/Units/Cars/Car/Hummer.lua index 838430ed..5ad69a0f 100644 --- a/_G/db/Units/Cars/Car/Hummer.lua +++ b/_G/db/Units/Cars/Car/Hummer.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.16, 0 }, DetectionRange = 0, DisplayName = "LUV HMMWV Jeep", DisplayNameShort = "M1025", diff --git a/_G/db/Units/Cars/Car/IKARUS Bus.lua b/_G/db/Units/Cars/Car/IKARUS Bus.lua index c82b740a..a9186368 100644 --- a/_G/db/Units/Cars/Car/IKARUS Bus.lua +++ b/_G/db/Units/Cars/Car/IKARUS Bus.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 2.05, 0 }, DetectionRange = 0, DisplayName = "Bus IKARUS-280", DisplayNameShort = "Ikarus", diff --git a/_G/db/Units/Cars/Car/Jagdpanther_G1.lua b/_G/db/Units/Cars/Car/Jagdpanther_G1.lua index 8245c100..b1172f56 100644 --- a/_G/db/Units/Cars/Car/Jagdpanther_G1.lua +++ b/_G/db/Units/Cars/Car/Jagdpanther_G1.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Germany", "Third Reich", "Japan", "Italian Social Republic", "Finland", "Hungary", "Romania", "Bulgaria" }, + CustomAimPoint = { 0, 1.35, 0 }, DM = { { area_name = "GUN_MASK", armour = { diff --git a/_G/db/Units/Cars/Car/KAMAZ Truck.lua b/_G/db/Units/Cars/Car/KAMAZ Truck.lua index e0825159..b30fd7d3 100644 --- a/_G/db/Units/Cars/Car/KAMAZ Truck.lua +++ b/_G/db/Units/Cars/Car/KAMAZ Truck.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.8, 0 }, DetectionRange = 0, DisplayName = "Truck KAMAZ 43101", DisplayNameShort = "KAMAZ", diff --git a/_G/db/Units/Cars/Car/KrAZ6322.lua b/_G/db/Units/Cars/Car/KrAZ6322.lua index a4a01459..09e630dd 100644 --- a/_G/db/Units/Cars/Car/KrAZ6322.lua +++ b/_G/db/Units/Cars/Car/KrAZ6322.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.85, 0 }, DetectionRange = 0, DisplayName = "Truck KrAZ-6322 6x6", DisplayNameShort = "KrAZ", diff --git a/_G/db/Units/Cars/Car/Kub 1S91 str.lua b/_G/db/Units/Cars/Car/Kub 1S91 str.lua index 0028ca47..186380da 100644 --- a/_G/db/Units/Cars/Car/Kub 1S91 str.lua +++ b/_G/db/Units/Cars/Car/Kub 1S91 str.lua @@ -55,7 +55,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 70000, radar_rotation_type = 1, radar_type = 103, - searchRadarFrequencies = { { 4000000000, 8000000000 } }, + searchRadarFrequencies = { { 500000000, 1000000000 } }, searchRadarMaxElevation = 0.5235987755983 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Cars/Car/Kub 2P25 ln.lua b/_G/db/Units/Cars/Car/Kub 2P25 ln.lua index 1ebeeb57..012c116b 100644 --- a/_G/db/Units/Cars/Car/Kub 2P25 ln.lua +++ b/_G/db/Units/Cars/Car/Kub 2P25 ln.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.4, 0 }, DetectionRange = 0, DisplayName = 'SAM SA-6 Kub "Gainful" TEL', DisplayNameShort = "SA-6", diff --git a/_G/db/Units/Cars/Car/LAZ Bus.lua b/_G/db/Units/Cars/Car/LAZ Bus.lua index 0209dd99..1ba367e5 100644 --- a/_G/db/Units/Cars/Car/LAZ Bus.lua +++ b/_G/db/Units/Cars/Car/LAZ Bus.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.7, 0 }, DetectionRange = 0, DisplayName = "Bus LAZ-695", DisplayNameShort = "LAZ", diff --git a/_G/db/Units/Cars/Car/LiAZ Bus.lua b/_G/db/Units/Cars/Car/LiAZ Bus.lua index a24bb429..b343dc19 100644 --- a/_G/db/Units/Cars/Car/LiAZ Bus.lua +++ b/_G/db/Units/Cars/Car/LiAZ Bus.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.8, 0 }, DetectionRange = 0, DisplayName = "Bus LiAZ-677", DisplayNameShort = "LiAZ", diff --git a/_G/db/Units/Cars/Car/M 818.lua b/_G/db/Units/Cars/Car/M 818.lua index c10a5897..1563896d 100644 --- a/_G/db/Units/Cars/Car/M 818.lua +++ b/_G/db/Units/Cars/Car/M 818.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.8, 0 }, DetectionRange = 0, DisplayName = "Truck M939 Heavy", DisplayNameShort = "M939", diff --git a/_G/db/Units/Cars/Car/M-1 Abrams.lua b/_G/db/Units/Cars/Car/M-1 Abrams.lua index d0a4ad04..cc73a2b2 100644 --- a/_G/db/Units/Cars/Car/M-1 Abrams.lua +++ b/_G/db/Units/Cars/Car/M-1 Abrams.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "USA" }, + CustomAimPoint = { 0, 1.35, 0 }, DM = { { area_name = "Bashnya_BORT_Lev", armour = { @@ -232,9 +233,15 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { shell_name = {} } }, machineGunBeltArgument = 90, - sensor = {}, + sensor = { + Tau = 3.5, + deviation_error_distance_air = 0.03, + deviation_error_speed_sensor_air = 0.3, + deviation_error_stability_air = 0.05 + }, sightIndicationMode = 1, sightMasterMode = 1, + sightMaxTanVel = 55.555555555556, type = 10 } }, angles = { { 3.1415926535898, 2.0943951023932, 0, 0.5235987755983 }, { 2.0943951023932, 1.1344640137963, 0.33161255787892, 0.5235987755983 }, { 1.1344640137963, 0.78539816339745, 0.20943951023932, 0.5235987755983 }, { 0.78539816339745, -0.78539816339745, -0.13962634015955, 0.5235987755983 }, { -0.78539816339745, -3.1415926535898, 0, 0.5235987755983 } }, @@ -282,7 +289,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { crew_locale = "ENG", crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", - driverViewConnectorName = { "DRIVER_POINT", + driverViewConnectorName = { "POINT_DRIVER", offset = { 0.05, 0, 0 } }, enablePlayerCanDrive = true, diff --git a/_G/db/Units/Cars/Car/M-109.lua b/_G/db/Units/Cars/Car/M-109.lua index dc173264..905b64bf 100644 --- a/_G/db/Units/Cars/Car/M-109.lua +++ b/_G/db/Units/Cars/Car/M-109.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.5, 0 }, DetectionRange = 0, DisplayName = "SPH M109 Paladin 155mm", DisplayNameShort = "M109", diff --git a/_G/db/Units/Cars/Car/M-113.lua b/_G/db/Units/Cars/Car/M-113.lua index d9e18454..5eb0e2a8 100644 --- a/_G/db/Units/Cars/Car/M-113.lua +++ b/_G/db/Units/Cars/Car/M-113.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.22, 0 }, DM = { { area_name = "FRONT_01", armour = { diff --git a/_G/db/Units/Cars/Car/M-2 Bradley.lua b/_G/db/Units/Cars/Car/M-2 Bradley.lua index 6ee7d965..0599236a 100644 --- a/_G/db/Units/Cars/Car/M-2 Bradley.lua +++ b/_G/db/Units/Cars/Car/M-2 Bradley.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.5, 0 }, DetectionRange = 0, DisplayName = "IFV M2A2 Bradley", DisplayNameShort = "M2A2", diff --git a/_G/db/Units/Cars/Car/M-60.lua b/_G/db/Units/Cars/Car/M-60.lua index 3970b712..076bf43f 100644 --- a/_G/db/Units/Cars/Car/M-60.lua +++ b/_G/db/Units/Cars/Car/M-60.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.12, 0 }, DM = { { area_name = "TURRET_FRONT", armour = { diff --git a/_G/db/Units/Cars/Car/M1043 HMMWV Armament.lua b/_G/db/Units/Cars/Car/M1043 HMMWV Armament.lua index e561f227..71cb5f38 100644 --- a/_G/db/Units/Cars/Car/M1043 HMMWV Armament.lua +++ b/_G/db/Units/Cars/Car/M1043 HMMWV Armament.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.16, 0 }, DetectionRange = 0, DisplayName = "Scout HMMWV", DisplayNameShort = "M1043", diff --git a/_G/db/Units/Cars/Car/M1045 HMMWV TOW.lua b/_G/db/Units/Cars/Car/M1045 HMMWV TOW.lua index 10399816..a5c1f7a0 100644 --- a/_G/db/Units/Cars/Car/M1045 HMMWV TOW.lua +++ b/_G/db/Units/Cars/Car/M1045 HMMWV TOW.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.16, 0 }, DetectionRange = 0, DisplayName = "ATGM HMMWV", DisplayNameShort = "M1045", diff --git a/_G/db/Units/Cars/Car/M1097 Avenger.lua b/_G/db/Units/Cars/Car/M1097 Avenger.lua index ca44ae9a..258bf8e4 100644 --- a/_G/db/Units/Cars/Car/M1097 Avenger.lua +++ b/_G/db/Units/Cars/Car/M1097 Avenger.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.3, 0 }, DetectionRange = 5200, DisplayName = "SAM Avenger (Stinger)", DisplayNameShort = "Avenger", diff --git a/_G/db/Units/Cars/Car/M10_GMC.lua b/_G/db/Units/Cars/Car/M10_GMC.lua index 55d6d17a..340db902 100644 --- a/_G/db/Units/Cars/Car/M10_GMC.lua +++ b/_G/db/Units/Cars/Car/M10_GMC.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Australia", "Belgium", "Canada", "Czech Republic", "France", "Italia", "Poland", "The Netherlands", "UK", "USA", "USSR", "Yugoslavia" }, + CustomAimPoint = { 0, 1.3, 0 }, DM = { { area_name = "GUN_MASK", armour = { diff --git a/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua b/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua index 751bbfb5..710a3c39 100644 --- a/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua +++ b/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.35, 0 }, DetectionRange = 0, DisplayName = "IFV M1126 Stryker ICV", DisplayNameShort = "M1126", diff --git a/_G/db/Units/Cars/Car/M1128 Stryker MGS.lua b/_G/db/Units/Cars/Car/M1128 Stryker MGS.lua index 99c2bae6..fda189e7 100644 --- a/_G/db/Units/Cars/Car/M1128 Stryker MGS.lua +++ b/_G/db/Units/Cars/Car/M1128 Stryker MGS.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "SPG Stryker MGS", DisplayNameShort = "M1128", diff --git a/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua b/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua index aa87f405..c3c025ea 100644 --- a/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua +++ b/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.35, 0 }, DetectionRange = 0, DisplayName = "ATGM Stryker", DisplayNameShort = "M1134", diff --git a/_G/db/Units/Cars/Car/M12_GMC.lua b/_G/db/Units/Cars/Car/M12_GMC.lua index 275ca17d..79672447 100644 --- a/_G/db/Units/Cars/Car/M12_GMC.lua +++ b/_G/db/Units/Cars/Car/M12_GMC.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Australia", "Belgium", "Canada", "Czech Republic", "France", "Italia", "Poland", "The Netherlands", "UK", "USA", "USSR", "Yugoslavia" }, + CustomAimPoint = { 0, 1.2, 0 }, DM = { { area_name = "FRONT_01", armour = { diff --git a/_G/db/Units/Cars/Car/M1A2C_SEP_V3.lua b/_G/db/Units/Cars/Car/M1A2C_SEP_V3.lua index 5623f13d..67773487 100644 --- a/_G/db/Units/Cars/Car/M1A2C_SEP_V3.lua +++ b/_G/db/Units/Cars/Car/M1A2C_SEP_V3.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "USA" }, + CustomAimPoint = { 0, 1.35, 0 }, DM = { { area_name = "Bashnya_BORT_Lev", armour = { @@ -239,9 +240,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { createMuzzleFlashEffect = true, fireAnimationArgument = 44, machineGunBeltArgument = 90, - sensor = {}, + sensor = { + deviation_error_distance_air = 0.008, + deviation_error_speed_sensor_air = 0.4 + }, sightIndicationMode = 1, sightMasterMode = 1, + sightMaxTanVel = 83.333333333333, type = 10 } }, angles = { { 3.1415926535898, 2.3561944901923, 0, 0.5235987755983 }, { 2.3561944901923, 1.1344640137963, 0.087266462599716, 0.5235987755983 }, { 1.1344640137963, -2.7925268031909, -0.13962634015955, 0.5235987755983 }, { -2.7925268031909, -3.1415926535898, -0.034906585039887, 0.5235987755983 } }, diff --git a/_G/db/Units/Cars/Car/M48 Chaparral.lua b/_G/db/Units/Cars/Car/M48 Chaparral.lua index 85e4d57e..85ad8a29 100644 --- a/_G/db/Units/Cars/Car/M48 Chaparral.lua +++ b/_G/db/Units/Cars/Car/M48 Chaparral.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.6, 0 }, DetectionRange = 10000, DisplayName = "SAM Chaparral M48", DisplayNameShort = "Chap", diff --git a/_G/db/Units/Cars/Car/M4A4_Sherman_FF.lua b/_G/db/Units/Cars/Car/M4A4_Sherman_FF.lua index ffc7f3ce..853532ee 100644 --- a/_G/db/Units/Cars/Car/M4A4_Sherman_FF.lua +++ b/_G/db/Units/Cars/Car/M4A4_Sherman_FF.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Australia", "Belgium", "Canada", "Czech Republic", "France", "Italia", "Poland", "The Netherlands", "UK", "USA", "USSR", "Yugoslavia" }, + CustomAimPoint = { 0, 1.45, 0 }, DM = { { area_name = "GUN_MASK", armour = { diff --git a/_G/db/Units/Cars/Car/M4_Sherman.lua b/_G/db/Units/Cars/Car/M4_Sherman.lua index ec8e060c..08a1b6bf 100644 --- a/_G/db/Units/Cars/Car/M4_Sherman.lua +++ b/_G/db/Units/Cars/Car/M4_Sherman.lua @@ -12,6 +12,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Australia", "Belgium", "Canada", "Czech Republic", "France", "Italia", "Poland", "The Netherlands", "UK", "USA", "USSR", "Yugoslavia" }, + CustomAimPoint = { 0, 1.4, 0 }, DM = { { area_name = "GUN_MASK", armour = { diff --git a/_G/db/Units/Cars/Car/M4_Tractor.lua b/_G/db/Units/Cars/Car/M4_Tractor.lua index 798a5793..345fde98 100644 --- a/_G/db/Units/Cars/Car/M4_Tractor.lua +++ b/_G/db/Units/Cars/Car/M4_Tractor.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Australia", "Belgium", "Canada", "Czech Republic", "France", "Italia", "Poland", "The Netherlands", "UK", "USA", "USSR", "Yugoslavia" }, + CustomAimPoint = { 0, 1.35, 0 }, DetectionRange = 0, DisplayName = "Tractor M4 High Speed", DisplayNameShort = "M4", diff --git a/_G/db/Units/Cars/Car/M6 Linebacker.lua b/_G/db/Units/Cars/Car/M6 Linebacker.lua index f7ff185b..2554e1c8 100644 --- a/_G/db/Units/Cars/Car/M6 Linebacker.lua +++ b/_G/db/Units/Cars/Car/M6 Linebacker.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.5, 0 }, DetectionRange = 8000, DisplayName = "SAM Linebacker - Bradley M6", DisplayNameShort = "Linebacker", diff --git a/_G/db/Units/Cars/Car/M978 HEMTT Tanker.lua b/_G/db/Units/Cars/Car/M978 HEMTT Tanker.lua index 89692402..3af6d802 100644 --- a/_G/db/Units/Cars/Car/M978 HEMTT Tanker.lua +++ b/_G/db/Units/Cars/Car/M978 HEMTT Tanker.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.55, 0 }, DetectionRange = 0, DisplayName = "Refueler M978 HEMTT", DisplayNameShort = "M978", diff --git a/_G/db/Units/Cars/Car/MAZ-6303.lua b/_G/db/Units/Cars/Car/MAZ-6303.lua index 932bb3b5..faaef634 100644 --- a/_G/db/Units/Cars/Car/MAZ-6303.lua +++ b/_G/db/Units/Cars/Car/MAZ-6303.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.95, 0 }, DetectionRange = 0, DisplayName = "Truck MAZ-6303", DisplayNameShort = "MAZ", diff --git a/_G/db/Units/Cars/Car/MCV-80.lua b/_G/db/Units/Cars/Car/MCV-80.lua index 6e55dd71..8f13b9b8 100644 --- a/_G/db/Units/Cars/Car/MCV-80.lua +++ b/_G/db/Units/Cars/Car/MCV-80.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.2, 0 }, DetectionRange = 0, DisplayName = "IFV Warrior ", DisplayNameShort = "MCV80", diff --git a/_G/db/Units/Cars/Car/MLRS.lua b/_G/db/Units/Cars/Car/MLRS.lua index 6a96ebe7..41d77008 100644 --- a/_G/db/Units/Cars/Car/MLRS.lua +++ b/_G/db/Units/Cars/Car/MLRS.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.6, 0 }, DetectionRange = 0, DisplayName = "MLRS M270 227mm", DisplayNameShort = "M270", diff --git a/_G/db/Units/Cars/Car/Marder.lua b/_G/db/Units/Cars/Car/Marder.lua index 1a247993..407c2819 100644 --- a/_G/db/Units/Cars/Car/Marder.lua +++ b/_G/db/Units/Cars/Car/Marder.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.3, 0 }, DetectionRange = 0, DisplayName = "IFV Marder", DisplayNameShort = "Marder", diff --git a/_G/db/Units/Cars/Car/MaxxPro_MRAP.lua b/_G/db/Units/Cars/Car/MaxxPro_MRAP.lua index fb044e98..e7db1a11 100644 --- a/_G/db/Units/Cars/Car/MaxxPro_MRAP.lua +++ b/_G/db/Units/Cars/Car/MaxxPro_MRAP.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "USA" }, + CustomAimPoint = { 0, 1.75, 0 }, DetectionRange = 0, DisplayName = "APC MRAP MaxxPro", DisplayNameShort = "MRAP", @@ -35,9 +36,15 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { shell_name = {} } }, machineGunBeltArgument = 90, - sensor = {}, + sensor = { + Tau = 3.5, + deviation_error_distance_air = 0.03, + deviation_error_speed_sensor_air = 0.3, + deviation_error_stability_air = 0.05 + }, sightIndicationMode = 1, - sightMasterMode = 1 + sightMasterMode = 1, + sightMaxTanVel = 55.555555555556 } }, angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.43633231299858 } }, center = "CENTER_TOWER", diff --git a/_G/db/Units/Cars/Car/Merkava_Mk4.lua b/_G/db/Units/Cars/Car/Merkava_Mk4.lua index 47940559..e0d96f95 100644 --- a/_G/db/Units/Cars/Car/Merkava_Mk4.lua +++ b/_G/db/Units/Cars/Car/Merkava_Mk4.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.7, 0 }, DetectionRange = 0, DisplayName = "MBT Merkava IV", DisplayNameShort = "Merk4", diff --git a/_G/db/Units/Cars/Car/Osa 9A33 ln.lua b/_G/db/Units/Cars/Car/Osa 9A33 ln.lua index f4323ccc..cae0f135 100644 --- a/_G/db/Units/Cars/Car/Osa 9A33 ln.lua +++ b/_G/db/Units/Cars/Car/Osa 9A33 ln.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.85, 0 }, DetectionRange = 30000, DisplayName = 'SAM SA-8 Osa "Gecko" TEL', DisplayNameShort = "SA-8", @@ -59,7 +60,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 35000, radar_rotation_type = 1, radar_type = 104, - searchRadarFrequencies = { { 6000000000, 8000000000 } }, + searchRadarFrequencies = { { 500000000, 1000000000 } }, searchRadarMaxElevation = 0.78539816339745 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Cars/Car/Pz_IV_H.lua b/_G/db/Units/Cars/Car/Pz_IV_H.lua index 39000878..0c7296d0 100644 --- a/_G/db/Units/Cars/Car/Pz_IV_H.lua +++ b/_G/db/Units/Cars/Car/Pz_IV_H.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Germany", "Third Reich", "Japan", "Italian Social Republic", "Finland", "Hungary", "Romania", "Bulgaria" }, + CustomAimPoint = { 0, 1.27, 0 }, DM = { { area_name = "GUN_MASK", armour = { 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 8a2adee7..aa51588e 100644 --- a/_G/db/Units/Cars/Car/S-300PS 40B6MD sr.lua +++ b/_G/db/Units/Cars/Car/S-300PS 40B6MD sr.lua @@ -242,7 +242,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 60000, radar_rotation_type = 0, radar_type = 103, - searchRadarFrequencies = { { 8000000000, 10000000000 } } + searchRadarFrequencies = { { 2900000000, 3300000000 } } }, Waypoint_Custom_Panel = true, _file = "./CoreMods/tech/HeavyMetalCore/Database/db_units_cars.lua", 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 e6ea2f89..cf863cfe 100644 --- a/_G/db/Units/Cars/Car/S-300PS 5P85C ln.lua +++ b/_G/db/Units/Cars/Car/S-300PS 5P85C ln.lua @@ -5,6 +5,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, Countries = { "USSR" }, Crew = 0, + CustomAimPoint = { 0, 1.95, 0 }, DetectionRange = 0, DisplayName = 'SAM SA-10 S-300 "Grumble" TEL C', DisplayNameShort = "SA-10LN", 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 648f9e90..59611abe 100644 --- a/_G/db/Units/Cars/Car/S-300PS 5P85D ln.lua +++ b/_G/db/Units/Cars/Car/S-300PS 5P85D ln.lua @@ -5,6 +5,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, Countries = { "USSR" }, Crew = 0, + CustomAimPoint = { 0, 1.95, 0 }, DetectionRange = 0, DisplayName = 'SAM SA-10 S-300 "Grumble" TEL D', DisplayNameShort = "SA-10LN", 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 31585a4b..8ad67978 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 @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.9, 0 }, DetectionRange = 50000, DisplayName = 'SAM SA-11 Buk "Gadfly" Fire Dome TEL', DisplayNameShort = "SA-11", @@ -23,7 +24,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { depends_on_unit = { { { "self", 4 } }, { { "self", 5 } }, { { "SA-11 Buk CC 9S470M1" } } }, distanceMax = 50000, distanceMin = 3000, - frequencyRange = { 6000000000, 10000000000 }, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_number_of_missiles_channels = 2, max_trg_alt = 22000, @@ -52,7 +53,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { depends_on_unit = { { { "self", 4 } }, { { "self", 5 } }, { { "SA-11 Buk CC 9S470M1" } } }, distanceMax = 50000, distanceMin = 3000, - frequencyRange = { 6000000000, 10000000000 }, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_number_of_missiles_channels = 2, max_trg_alt = 22000, @@ -81,7 +82,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type_ammunition = {} } }, depends_on_unit = { { { "self", 1 } }, { { "self", 2 } } }, - frequencyRange = { 6000000000, 10000000000 }, + frequencyRange = { 6000000000, 9000000000 }, launch_delay = 5, min_launch_angle = 0.34906585039887, sensor = {} @@ -112,7 +113,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { beamWidth = 1.5707963267949, distanceMax = 50000, distanceMin = 3000, - frequencyRange = { 6000000000, 10000000000 }, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_number_of_missiles_channels = 2, max_trg_alt = 22000, @@ -144,7 +145,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { beamWidth = 1.5707963267949, distanceMax = 50000, distanceMin = 3000, - frequencyRange = { 6000000000, 10000000000 }, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_number_of_missiles_channels = 2, max_trg_alt = 22000, 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 3bbb3661..c60d21e6 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 @@ -19,6 +19,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ECM_K = 0.65, distanceMax = 100000, distanceMin = 2000, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_trg_alt = 25000, min_trg_alt = 25, @@ -48,6 +49,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ECM_K = 0.65, distanceMax = 100000, distanceMin = 2000, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_trg_alt = 25000, min_trg_alt = 25, @@ -77,6 +79,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ECM_K = 0.65, distanceMax = 100000, distanceMin = 2000, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_trg_alt = 25000, min_trg_alt = 25, @@ -106,6 +109,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ECM_K = 0.65, distanceMax = 100000, distanceMin = 2000, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_trg_alt = 25000, min_trg_alt = 25, @@ -135,6 +139,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ECM_K = 0.65, distanceMax = 100000, distanceMin = 2000, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_trg_alt = 25000, min_trg_alt = 25, @@ -164,6 +169,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ECM_K = 0.65, distanceMax = 100000, distanceMin = 2000, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_trg_alt = 25000, min_trg_alt = 25, @@ -193,6 +199,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ECM_K = 0.65, distanceMax = 100000, distanceMin = 2000, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_trg_alt = 25000, min_trg_alt = 25, @@ -222,6 +229,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ECM_K = 0.65, distanceMax = 100000, distanceMin = 2000, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_trg_alt = 25000, min_trg_alt = 25, @@ -251,6 +259,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ECM_K = 0.65, distanceMax = 100000, distanceMin = 2000, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_trg_alt = 25000, min_trg_alt = 25, @@ -280,6 +289,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ECM_K = 0.65, distanceMax = 100000, distanceMin = 2000, + frequencyRange = { 6000000000, 9000000000 }, maxShootingSpeed = 0, max_trg_alt = 25000, min_trg_alt = 25, @@ -310,7 +320,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 120000, radar_rotation_type = 1, radar_type = 103, - searchRadarFrequencies = { { 6000000000, 10000000000 } } + searchRadarFrequencies = { { 3000000000, 4000000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = { diff --git a/_G/db/Units/Cars/Car/SAU 2-C9.lua b/_G/db/Units/Cars/Car/SAU 2-C9.lua index b3832904..3b239571 100644 --- a/_G/db/Units/Cars/Car/SAU 2-C9.lua +++ b/_G/db/Units/Cars/Car/SAU 2-C9.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.17, 0 }, DetectionRange = 0, DisplayName = "SPM 2S9 Nona 120mm M", DisplayNameShort = "2S9", diff --git a/_G/db/Units/Cars/Car/SAU Akatsia.lua b/_G/db/Units/Cars/Car/SAU Akatsia.lua index c8ca7668..b1b34cd2 100644 --- a/_G/db/Units/Cars/Car/SAU Akatsia.lua +++ b/_G/db/Units/Cars/Car/SAU Akatsia.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "SPH 2S3 Akatsia 152mm", DisplayNameShort = "2S3", diff --git a/_G/db/Units/Cars/Car/SAU Gvozdika.lua b/_G/db/Units/Cars/Car/SAU Gvozdika.lua index 02feb879..ef0530f8 100644 --- a/_G/db/Units/Cars/Car/SAU Gvozdika.lua +++ b/_G/db/Units/Cars/Car/SAU Gvozdika.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.1, 0 }, DetectionRange = 0, DisplayName = "SPH 2S1 Gvozdika 122mm", DisplayNameShort = "2S1", diff --git a/_G/db/Units/Cars/Car/SAU Msta.lua b/_G/db/Units/Cars/Car/SAU Msta.lua index c65d50aa..64253f20 100644 --- a/_G/db/Units/Cars/Car/SAU Msta.lua +++ b/_G/db/Units/Cars/Car/SAU Msta.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.65, 0 }, DetectionRange = 0, DisplayName = "SPH 2S19 Msta 152mm", DisplayNameShort = "2S19", diff --git a/_G/db/Units/Cars/Car/SKP-11.lua b/_G/db/Units/Cars/Car/SKP-11.lua index 13294957..900e4cbd 100644 --- a/_G/db/Units/Cars/Car/SKP-11.lua +++ b/_G/db/Units/Cars/Car/SKP-11.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.65, 0 }, DetectionRange = 0, DisplayName = "Truck SKP-11 Mobile ATC", DisplayNameShort = "SKP-11", diff --git a/_G/db/Units/Cars/Car/S_75_ZIL.lua b/_G/db/Units/Cars/Car/S_75_ZIL.lua index 9e5f1ae7..1f08a103 100644 --- a/_G/db/Units/Cars/Car/S_75_ZIL.lua +++ b/_G/db/Units/Cars/Car/S_75_ZIL.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "USSR", "Russia" }, + CustomAimPoint = { 0, 1.3, 0 }, DetectionRange = 0, DisplayName = "S-75 Tractor (ZIL-131)", DisplayNameShort = "ZIL", diff --git a/_G/db/Units/Cars/Car/Scud_B.lua b/_G/db/Units/Cars/Car/Scud_B.lua index fc439103..9bf0a210 100644 --- a/_G/db/Units/Cars/Car/Scud_B.lua +++ b/_G/db/Units/Cars/Car/Scud_B.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Egypt", "Iran", "Kazakhstan", "North Korea", "Libya", "Oman", "Syria", "Vietnam", "Yemen", "Belarus", "Bulgaria", "Czech Republic", "Hungary", "Iraq", "Poland", "Romania", "Yemen", "Ukraine", "United Arab Emirates", "Yugoslavia", "USSR" }, + CustomAimPoint = { 0, 1.5, 0 }, DetectionRange = 0, DisplayName = "SSM SS-1C Scud-B", DisplayNameShort = "Scud R-17", 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 22fb7c78..4ba3480e 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 @@ -12,6 +12,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Germany", "Third Reich", "Japan", "Italian Social Republic", "Finland", "Hungary", "Romania", "Bulgaria" }, + CustomAimPoint = { 0, 1.3, 0 }, DM = { { area_name = "FRONT_01", armour = { diff --git a/_G/db/Units/Cars/Car/Smerch.lua b/_G/db/Units/Cars/Car/Smerch.lua index ecabaf31..2845e1ea 100644 --- a/_G/db/Units/Cars/Car/Smerch.lua +++ b/_G/db/Units/Cars/Car/Smerch.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.7, 0 }, DetectionRange = 0, DisplayName = "MLRS 9A52 Smerch CM 300mm", DisplayNameShort = "Smerch", diff --git a/_G/db/Units/Cars/Car/Smerch_HE.lua b/_G/db/Units/Cars/Car/Smerch_HE.lua index cee2b5ac..dffe21d5 100644 --- a/_G/db/Units/Cars/Car/Smerch_HE.lua +++ b/_G/db/Units/Cars/Car/Smerch_HE.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.7, 0 }, DetectionRange = 0, DisplayName = "MLRS 9A52 Smerch HE 300mm", DisplayNameShort = "Smerch HE", diff --git a/_G/db/Units/Cars/Car/SpGH_Dana.lua b/_G/db/Units/Cars/Car/SpGH_Dana.lua index 286d7ae8..5721fe62 100644 --- a/_G/db/Units/Cars/Car/SpGH_Dana.lua +++ b/_G/db/Units/Cars/Car/SpGH_Dana.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.8, 0 }, DetectionRange = 0, DisplayName = "SPH Dana vz77 152mm", DisplayNameShort = "Dana", diff --git a/_G/db/Units/Cars/Car/Strela-1 9P31.lua b/_G/db/Units/Cars/Car/Strela-1 9P31.lua index 906544fc..0c9b1341 100644 --- a/_G/db/Units/Cars/Car/Strela-1 9P31.lua +++ b/_G/db/Units/Cars/Car/Strela-1 9P31.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.35, 0 }, DetectionRange = 5000, DisplayName = 'SAM SA-9 Strela 1 "Gaskin" TEL', DisplayNameShort = "SA-9", diff --git a/_G/db/Units/Cars/Car/Strela-10M3.lua b/_G/db/Units/Cars/Car/Strela-10M3.lua index a4639345..ea2e5220 100644 --- a/_G/db/Units/Cars/Car/Strela-10M3.lua +++ b/_G/db/Units/Cars/Car/Strela-10M3.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.1, 0 }, DetectionRange = 8000, DisplayName = 'SAM SA-13 Strela 10M3 "Gopher" TEL', DisplayNameShort = "SA-13", diff --git a/_G/db/Units/Cars/Car/SturmPzIV.lua b/_G/db/Units/Cars/Car/SturmPzIV.lua index 18cf7fad..7ad445ad 100644 --- a/_G/db/Units/Cars/Car/SturmPzIV.lua +++ b/_G/db/Units/Cars/Car/SturmPzIV.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Germany", "Third Reich", "Japan", "Italian Social Republic", "Finland", "Hungary", "Romania", "Bulgaria" }, + CustomAimPoint = { 0, 1.45, 0 }, DM = { { area_name = "GUN_MASK", armour = { diff --git a/_G/db/Units/Cars/Car/T155_Firtina.lua b/_G/db/Units/Cars/Car/T155_Firtina.lua index 97376403..ea421720 100644 --- a/_G/db/Units/Cars/Car/T155_Firtina.lua +++ b/_G/db/Units/Cars/Car/T155_Firtina.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Turkey" }, + CustomAimPoint = { 0, 1.45, 0 }, DM = { { area_name = "FRONT_01", armour = { diff --git a/_G/db/Units/Cars/Car/TPZ.lua b/_G/db/Units/Cars/Car/TPZ.lua index 14a4ac05..29bfefc0 100644 --- a/_G/db/Units/Cars/Car/TPZ.lua +++ b/_G/db/Units/Cars/Car/TPZ.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.4, 0 }, DetectionRange = 0, DisplayName = "APC TPz Fuchs ", DisplayNameShort = "Fuchs", diff --git a/_G/db/Units/Cars/Car/TZ-22_KrAZ.lua b/_G/db/Units/Cars/Car/TZ-22_KrAZ.lua index 5f0b7b13..e082c0ad 100644 --- a/_G/db/Units/Cars/Car/TZ-22_KrAZ.lua +++ b/_G/db/Units/Cars/Car/TZ-22_KrAZ.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Russia", "USSR" }, + CustomAimPoint = { 0, 1.3, 0 }, DetectionRange = 0, DisplayName = "Refueler TZ-22 Tractor (KrAZ-258B1)", DisplayNameShort = "KrAZ", diff --git a/_G/db/Units/Cars/Car/Tiger_I.lua b/_G/db/Units/Cars/Car/Tiger_I.lua index ab4cd45b..f9e0dfa0 100644 --- a/_G/db/Units/Cars/Car/Tiger_I.lua +++ b/_G/db/Units/Cars/Car/Tiger_I.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Germany", "Third Reich", "Japan", "Italian Social Republic", "Finland", "Hungary", "Romania", "Bulgaria" }, + CustomAimPoint = { 0, 1.6, 0 }, DM = { { area_name = "GUN_MASK", armour = { diff --git a/_G/db/Units/Cars/Car/Tiger_II_H.lua b/_G/db/Units/Cars/Car/Tiger_II_H.lua index 92a7693b..d188ec63 100644 --- a/_G/db/Units/Cars/Car/Tiger_II_H.lua +++ b/_G/db/Units/Cars/Car/Tiger_II_H.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Germany", "Third Reich", "Japan", "Italian Social Republic", "Finland", "Hungary", "Romania", "Bulgaria" }, + CustomAimPoint = { 0, 1.7, 0 }, DM = { { area_name = "GUN_MASK", armour = { diff --git a/_G/db/Units/Cars/Car/Tigr_233036.lua b/_G/db/Units/Cars/Car/Tigr_233036.lua index e2d57033..96986a82 100644 --- a/_G/db/Units/Cars/Car/Tigr_233036.lua +++ b/_G/db/Units/Cars/Car/Tigr_233036.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.3, 0 }, DetectionRange = 0, DisplayName = "LUV Tigr", DisplayNameShort = "Tigr", diff --git a/_G/db/Units/Cars/Car/Tor 9A331.lua b/_G/db/Units/Cars/Car/Tor 9A331.lua index 8bbfbf37..a6799edc 100644 --- a/_G/db/Units/Cars/Car/Tor 9A331.lua +++ b/_G/db/Units/Cars/Car/Tor 9A331.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 2.1, 0 }, DetectionRange = 25000, DisplayName = 'SAM SA-15 Tor "Gauntlet"', DisplayNameShort = "SA-15", @@ -77,7 +78,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 25000, radar_rotation_type = 1, radar_type = 104, - searchRadarFrequencies = { { 4000000000, 8000000000 } }, + searchRadarFrequencies = { { 3000000000, 4000000000 } }, searchRadarMaxElevation = 0.78539816339745 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Cars/Car/Trolley bus.lua b/_G/db/Units/Cars/Car/Trolley bus.lua index 21d2e99f..21734baa 100644 --- a/_G/db/Units/Cars/Car/Trolley bus.lua +++ b/_G/db/Units/Cars/Car/Trolley bus.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.6, 0 }, DetectionRange = 0, DisplayName = "ZIU-9 Trolley", DisplayNameShort = "ZIU-9", diff --git a/_G/db/Units/Cars/Car/Uragan_BM-27.lua b/_G/db/Units/Cars/Car/Uragan_BM-27.lua index 8e5e5339..42830b4a 100644 --- a/_G/db/Units/Cars/Car/Uragan_BM-27.lua +++ b/_G/db/Units/Cars/Car/Uragan_BM-27.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.5, 0 }, DetectionRange = 0, DisplayName = "MLRS 9K57 Uragan BM-27 220mm", DisplayNameShort = "BM-27", diff --git a/_G/db/Units/Cars/Car/Ural ATsP-6.lua b/_G/db/Units/Cars/Car/Ural ATsP-6.lua index 7891adcf..02207e59 100644 --- a/_G/db/Units/Cars/Car/Ural ATsP-6.lua +++ b/_G/db/Units/Cars/Car/Ural ATsP-6.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "Firefighter Ural ATsP-6", DisplayNameShort = "ATsP-6", diff --git a/_G/db/Units/Cars/Car/Ural-375 PBU.lua b/_G/db/Units/Cars/Car/Ural-375 PBU.lua index 667ca693..b1106ac7 100644 --- a/_G/db/Units/Cars/Car/Ural-375 PBU.lua +++ b/_G/db/Units/Cars/Car/Ural-375 PBU.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.55, 0 }, DetectionRange = 0, DisplayName = "Truck Ural-4320 MCC", DisplayNameShort = "Ural-MCC", diff --git a/_G/db/Units/Cars/Car/Ural-375 ZU-23 Insurgent.lua b/_G/db/Units/Cars/Car/Ural-375 ZU-23 Insurgent.lua index 1e93d77d..0b36dcc3 100644 --- a/_G/db/Units/Cars/Car/Ural-375 ZU-23 Insurgent.lua +++ b/_G/db/Units/Cars/Car/Ural-375 ZU-23 Insurgent.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 5000, DisplayName = "AAA ZU-23 on Ural-4320 Insurgent", DisplayNameShort = "ZU23 U", diff --git a/_G/db/Units/Cars/Car/Ural-375 ZU-23.lua b/_G/db/Units/Cars/Car/Ural-375 ZU-23.lua index 69cffcb0..956cbc9d 100644 --- a/_G/db/Units/Cars/Car/Ural-375 ZU-23.lua +++ b/_G/db/Units/Cars/Car/Ural-375 ZU-23.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Crew = 2, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 5000, DisplayName = "AAA ZU-23 on Ural-4320", DisplayNameShort = "ZU23 U", diff --git a/_G/db/Units/Cars/Car/Ural-375.lua b/_G/db/Units/Cars/Car/Ural-375.lua index 3fa9bfc2..2e21bb86 100644 --- a/_G/db/Units/Cars/Car/Ural-375.lua +++ b/_G/db/Units/Cars/Car/Ural-375.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "Truck Ural-4320", DisplayNameShort = "Ural", diff --git a/_G/db/Units/Cars/Car/Ural-4320 APA-5D.lua b/_G/db/Units/Cars/Car/Ural-4320 APA-5D.lua index b4e348b7..1e75db66 100644 --- a/_G/db/Units/Cars/Car/Ural-4320 APA-5D.lua +++ b/_G/db/Units/Cars/Car/Ural-4320 APA-5D.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "GPU APA-5D on Ural 4320", DisplayNameShort = "APA-5", diff --git a/_G/db/Units/Cars/Car/Ural-4320-31.lua b/_G/db/Units/Cars/Car/Ural-4320-31.lua index 2009eaa5..00228a83 100644 --- a/_G/db/Units/Cars/Car/Ural-4320-31.lua +++ b/_G/db/Units/Cars/Car/Ural-4320-31.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "Truck Ural-4320-31 Arm'd", DisplayNameShort = "Ural-4320", diff --git a/_G/db/Units/Cars/Car/Ural-4320T.lua b/_G/db/Units/Cars/Car/Ural-4320T.lua index bd42475b..df8e7352 100644 --- a/_G/db/Units/Cars/Car/Ural-4320T.lua +++ b/_G/db/Units/Cars/Car/Ural-4320T.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "Truck Ural-4320T", DisplayNameShort = "Ural-4320T", diff --git a/_G/db/Units/Cars/Car/VAB_Mephisto.lua b/_G/db/Units/Cars/Car/VAB_Mephisto.lua index 08a79052..268c066d 100644 --- a/_G/db/Units/Cars/Car/VAB_Mephisto.lua +++ b/_G/db/Units/Cars/Car/VAB_Mephisto.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "France", "Lebanon" }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "ATGM VAB Mephisto", DisplayNameShort = "Meph", diff --git a/_G/db/Units/Cars/Car/Vulcan.lua b/_G/db/Units/Cars/Car/Vulcan.lua index 90fbc50f..53e9bcbc 100644 --- a/_G/db/Units/Cars/Car/Vulcan.lua +++ b/_G/db/Units/Cars/Car/Vulcan.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.32, 0 }, DetectionRange = 5000, DisplayName = "SPAAA Vulcan M163", DisplayNameShort = "Vulcan", diff --git a/_G/db/Units/Cars/Car/Wespe124.lua b/_G/db/Units/Cars/Car/Wespe124.lua index 2da66dce..f2be238e 100644 --- a/_G/db/Units/Cars/Car/Wespe124.lua +++ b/_G/db/Units/Cars/Car/Wespe124.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "Germany", "Third Reich", "Japan", "Italian Social Republic", "Finland", "Hungary", "Romania", "Bulgaria" }, + CustomAimPoint = { 0, 1.2, 0 }, DM = { { area_name = "FRONT_01", armour = { diff --git a/_G/db/Units/Cars/Car/ZIL-131 KUNG.lua b/_G/db/Units/Cars/Car/ZIL-131 KUNG.lua index 4ebe8708..6d456998 100644 --- a/_G/db/Units/Cars/Car/ZIL-131 KUNG.lua +++ b/_G/db/Units/Cars/Car/ZIL-131 KUNG.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.6, 0 }, DetectionRange = 0, DisplayName = "Truck ZIL-131 (C2)", DisplayNameShort = "ZIL-MCC", diff --git a/_G/db/Units/Cars/Car/ZIL-135.lua b/_G/db/Units/Cars/Car/ZIL-135.lua index 1018b0e8..79e4ad6e 100644 --- a/_G/db/Units/Cars/Car/ZIL-135.lua +++ b/_G/db/Units/Cars/Car/ZIL-135.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { elevation = {} }, Countries = { "USSR", "Russia" }, + CustomAimPoint = { 0, 1.3, 0 }, DetectionRange = 0, DisplayName = "Truck ZIL-135", DisplayNameShort = "ZIL-135", diff --git a/_G/db/Units/Cars/Car/ZIL-4331.lua b/_G/db/Units/Cars/Car/ZIL-4331.lua index f872dc78..9af54b7d 100644 --- a/_G/db/Units/Cars/Car/ZIL-4331.lua +++ b/_G/db/Units/Cars/Car/ZIL-4331.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.55, 0 }, DetectionRange = 0, DisplayName = "Truck ZIL-4331", DisplayNameShort = "ZIL-4331", 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 636c17a5..19475dd4 100644 --- a/_G/db/Units/Cars/Car/ZSU-23-4 Shilka.lua +++ b/_G/db/Units/Cars/Car/ZSU-23-4 Shilka.lua @@ -35,7 +35,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, beamWidth = 1.5707963267949, display_name = "2A14x4", - frequencyRange = { 20000000000, 30000000000 }, + frequencyRange = { 14600000000, 15600000000 }, name = "2A14_4", reactionTime = 6, reflection_limit = 0.15, diff --git a/_G/db/Units/Cars/Car/ZSU_57_2.lua b/_G/db/Units/Cars/Car/ZSU_57_2.lua index d339bb30..854d50d8 100644 --- a/_G/db/Units/Cars/Car/ZSU_57_2.lua +++ b/_G/db/Units/Cars/Car/ZSU_57_2.lua @@ -13,6 +13,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, Countries = { "Russia", "USSR", "Syria" }, Crew = 5, + CustomAimPoint = { 0, 1.4, 0 }, DetectionRange = 5000, DisplayName = "SPAAA ZSU-57-2", DisplayNameShort = "ZSU57", diff --git a/_G/db/Units/Cars/Car/ZiL-131 APA-80.lua b/_G/db/Units/Cars/Car/ZiL-131 APA-80.lua index 62ce93a7..ce35d58e 100644 --- a/_G/db/Units/Cars/Car/ZiL-131 APA-80.lua +++ b/_G/db/Units/Cars/Car/ZiL-131 APA-80.lua @@ -4,6 +4,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + CustomAimPoint = { 0, 1.45, 0 }, DetectionRange = 0, DisplayName = "GPU APA-80 on ZIL-131", DisplayNameShort = "APA-80", diff --git a/_G/db/Units/Cars/Car/generator_5i57.lua b/_G/db/Units/Cars/Car/generator_5i57.lua index ea81460f..3817e501 100644 --- a/_G/db/Units/Cars/Car/generator_5i57.lua +++ b/_G/db/Units/Cars/Car/generator_5i57.lua @@ -1,5 +1,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Countries = { "Russia", "USSR" }, + CustomAimPoint = { 0, 2, 0 }, DetectionRange = 0, DisplayName = "Diesel Power Station 5I57A", DisplayNameShort = "DPS", 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 33303838..715b320a 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 @@ -165,7 +165,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 160000, radar_rotation_type = 0, radar_type = 103, - searchRadarFrequencies = { { 830000000, 882000000 } } + searchRadarFrequencies = { { 830000000, 875000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = { 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 c08e89f9..1801e988 100644 --- a/_G/db/Units/Cars/Car/rapier_fsa_blindfire_radar.lua +++ b/_G/db/Units/Cars/Car/rapier_fsa_blindfire_radar.lua @@ -46,7 +46,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 30000, radar_type = 104, - searchRadarFrequencies = { { 10000000000, 20000000000 } } + searchRadarFrequencies = { { 3000000000, 4000000000 } } }, Waypoint_Custom_Panel = true, _file = "./CoreMods/tech/TechWeaponPack/Database/db_units_cars.lua", diff --git a/_G/db/Units/Cars/Car/rapier_fsa_launcher.lua b/_G/db/Units/Cars/Car/rapier_fsa_launcher.lua index ab191db9..8354425f 100644 --- a/_G/db/Units/Cars/Car/rapier_fsa_launcher.lua +++ b/_G/db/Units/Cars/Car/rapier_fsa_launcher.lua @@ -93,6 +93,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 30000, radar_rotation_type = 0, radar_type = 104, + searchRadarFrequencies = { { 1000000000, 4000000000 } }, searchRadarMaxElevation = 0.34906585039887 }, Waypoint_Custom_Panel = true, 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 1b923240..31c32f87 100644 --- a/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua +++ b/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua @@ -885,6 +885,12 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } }, HumanCommPanelPath = "./Mods/aircraft/AH-64D/comm.lua", HumanFM = { "AH-64D BLK.II", "AH64D", + Kwx2 = 170, + Kwx2_hold = 150, + Kwy2 = 400, + Kwy2_hold = 6, + Kwz2 = 150, + Kwz2_hold = 200, MainRotorPos = { 0.3, 2.1, 0 }, TailRotorPos = { -8.725, 2.106, -0.721 }, altHold = 0.02, @@ -915,30 +921,32 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { table = { { 0, 0 }, { 0.1, 0 }, { 0.2, 0 }, { 0.3, 0 }, { 0.4, 0 }, { 0.5, 0 }, { 0.6, 0 }, { 0.7, 0 }, { 0.8, 0 }, { 0.9, 0 }, { 1, 0 } } }, tail_collective_by_pedals = { - range = { -27, 15 }, - table = { { -1, -27 }, { -0.95, -25.697 }, { -0.9, -24.406 }, { -0.85, -23.129 }, { -0.8, -21.864 }, { -0.75, -20.613 }, { -0.7, -19.374 }, { -0.65, -18.149 }, { -0.6, -16.936 }, { -0.55, -15.737 }, { -0.5, -14.55 }, { -0.45, -13.377 }, { -0.4, -12.216 }, { -0.35, -11.069 }, { -0.3, -9.934 }, { -0.25, -8.813 }, { -0.2, -7.704 }, { -0.15, -6.609 }, { -0.1, -5.526 }, { -0.05, -4.457 }, { 0, -3.4 }, { 0.05, -2.357 }, { 0.1, -1.326 }, { 0.15, -0.309 }, { 0.2, 0.696 }, { 0.25, 1.688 }, { 0.3, 2.666 }, { 0.35, 3.632 }, { 0.4, 4.584 }, { 0.45, 5.524 }, { 0.5, 6.45 }, { 0.55, 7.364 }, { 0.6, 8.264 }, { 0.65, 9.152 }, { 0.7, 10.026 }, { 0.75, 10.888 }, { 0.8, 11.736 }, { 0.85, 12.572 }, { 0.9, 13.394 }, { 0.95, 14.204 }, { 1, 15 } } + range = { -22, 9 }, + table = { { -1, -22 }, { -0.95, -21.323 }, { -0.9, -20.64 }, { -0.85, -19.953 }, { -0.8, -19.26 }, { -0.75, -18.563 }, { -0.7, -17.86 }, { -0.65, -17.153 }, { -0.6, -16.44 }, { -0.55, -15.723 }, { -0.5, -15 }, { -0.45, -14.273 }, { -0.4, -13.54 }, { -0.35, -12.803 }, { -0.3, -12.06 }, { -0.25, -11.313 }, { -0.2, -10.56 }, { -0.15, -9.803 }, { -0.1, -9.04 }, { -0.05, -8.273 }, { 0, -7.5 }, { 0.05, -6.723 }, { 0.1, -5.94 }, { 0.15, -5.153 }, { 0.2, -4.36 }, { 0.25, -3.563 }, { 0.3, -2.76 }, { 0.35, -1.953 }, { 0.4, -1.14 }, { 0.45, -0.323 }, { 0.5, 0.5 }, { 0.55, 1.328 }, { 0.6, 2.16 }, { 0.65, 2.998 }, { 0.7, 3.84 }, { 0.75, 4.688 }, { 0.8, 5.54 }, { 0.85, 6.398 }, { 0.9, 7.26 }, { 0.95, 8.128 }, { 1, 9 } } } }, - debugLine = "{Vx_l}:%4.1f {Vy_w}:%4.1f {Vz_l}:%4.1f {pitch}:%4.1f {roll}:%5.1f {RAlt}:%7.1f {Alt}:%7.1f {BAlt}:%7.1f;{mass}:%6.1f {mass_lb}:%7.1f {CG_X_inch}:%5.1f {CgX_Relative}:%5.1f {CenteringX}:%4.0f {CenteringY}:%4.0f {ny}:%4.1f ;{FAT}:%5.1f {TailRotPitch}:%5.1f {StickR}:%6.1f {StickP}:%6.1f {Rud}:%6.1f {TailRotF}:%5.0f {FinFz}:%5.0f;{FuselageFx}:%5.0f {FuselageFy}:%5.0f {FuselageFz}:%5.0f {MainRotPitch}:%4.1f {Lstab}:%4.1f;{RotorRPM}:%5.1f {PlateR}:%4.1f {PlateP}:%4.1f {N1_L}:%5.1f {N1_R}:%5.1f {N2_L}:%5.1f {N2_R}:%5.1f ", + debugLine = "{Vx_l}:%4.1f {Vy_w}:%4.1f {Vz_l}:%4.1f {pitch}:%4.1f {roll}:%5.1f {RAlt}:%7.1f {Alt}:%7.1f {BAlt}:%7.1f;{mass}:%6.1f {mass_lb}:%7.1f {CG_X_inch}:%5.1f {CgX_Relative}:%5.1f {CenteringX}:%4.0f {CenteringY}:%4.0f {ny}:%4.1f ;{FAT}:%5.1f {TailRotPitch}:%6.2f {StickR}:%6.1f {StickP}:%6.1f {Rud}:%6.1f {TailRotF}:%5.0f {FinFz}:%5.0f;{FuselageFx}:%5.0f {FuselageFy}:%5.0f {FuselageFz}:%5.0f {MainRotPitch}:%5.2f {Lstab}:%4.1f;{RotorRPM}:%5.1f {PlateR}:%6.2f {PlateP}:%6.2f {N1_L}:%5.1f {N1_R}:%5.1f {N2_L}:%5.1f {N2_R}:%5.1f ", disable_built_in_oxygen_system = true, ffbPitchK = 0.65, ffbRollK = 0.65, + filterPeriod_pitch = 10, + filterPeriod_roll = 10, headingHold_K_int = 0.5, - headingHold_K_wy = 0.09, - headingHold_K_yaw = 0.2, + headingHold_K_wy = 0.07, + headingHold_K_yaw = 0.42, imgui_permissions = {}, kDamp_Mx_d1 = -4, - kDamp_Mx_d2 = -4, + kDamp_Mx_d2 = -6, kDamp_Mx_s1 = 0, - kDamp_Mx_s2 = -4000, + kDamp_Mx_s2 = -10000, kDamp_My_d1 = -85, kDamp_My_d2 = -20, kDamp_My_s1 = 0, - kDamp_My_s2 = -16000, + kDamp_My_s2 = -20000, kDamp_Mz_d1 = -40, - kDamp_Mz_d2 = -20, + kDamp_Mz_d2 = -30, kDamp_Mz_s1 = 0, - kDamp_Mz_s2 = -4000, + kDamp_Mz_s2 = -15000, keyboard_control = { collective_speed = 0.076923076923077, cyclic_pitch_speed = 0.13333333333333, @@ -948,29 +956,30 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { mainRotorStiffnessCoefficient = 0.095, mainRotorVortexRingCyclicLoss = 0.95, mainRotorVortexRingK1 = 0.45, - mainRotorVortexRingK2 = 0.9, - mainRotorVortexRingK3 = 4, + mainRotorVortexRingK2 = 1.3, + mainRotorVortexRingK3 = 3.3, + mainRotorVortexRingParsDispersion = 0.185, mainRotorVortexRingThrustLoss = 0.5, - mainRotorVortexRingVibration = 0.17, + mainRotorVortexRingVibration = 0.45, mainRotorVortexRingWashout = 13, major_shake_ampl = 0.25, minor_shake_ampl = 0.07, moment_of_inertia = { 9290, 51874, 51468, -5937 }, pedalCoeff = 0.5, pitchHold_K_int = 0.5, - pitchHold_K_pitch = 0.4, - pitchHold_K_wz = 1, + pitchHold_K_pitch = 0.35, + pitchHold_K_wz = 0.3, pitchOutK = 1, - pitchRateDirectFB_Coef = 0.7, - pitchRateInputK = 0.3, + pitchRateDirectFB_Coef = 1.1, + pitchRateInputK = 0.12, pitchStickK = 0.75, pos_distance = 10, pos_dxMaxVal = 0.1, pos_dzMaxVal = 0.1, - recordStep = 0.06, + recordStep = 0.1, rollHold_K_int = 0.2, - rollHold_K_roll = 1.8, - rollHold_K_wx = 2.5, + rollHold_K_roll = 1.2, + rollHold_K_wx = 0.9, rollOutK = 1, rollRateDirectFB_Coef = 1.1, rollRateInputK = 0.3, @@ -979,15 +988,31 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { rotorCritRollBladeMach = 0.7, rotorCritRollGrowthRatio = 12, rotorCritRollIntensity = 1, - rotorDampCoeff_wx = 2.25, - rotorDampCoeff_wz = 2.25, + rotorDampCoeff_wx = 3.15, + rotorDampCoeff_wz = 3.15, rotorFlapAnimationScaleMax = 10, rotorFlapAnimationScaleMin = -10, - rotorGroundEffectAttenuation = 0.45, + rotorGroundEffectAttenuation = 0.2, rotorGroundEffectDensCoeff = 1, - rotorGroundEffectIntensity = 0.1, + rotorGroundEffectIntensity = 0.13, rotorGyroscopicMomentCoeff = 1, rotorInducedVelocityWashout = 0, + stab_direction_set = 0, + stab_pitchGain = 20.01, + stab_pitchIntegGain = 0, + stab_pitchIntegLimit = 4, + stab_pitchRateGain = 40.03, + stab_pitch_active = false, + stab_rollGain = 7, + stab_rollIntegGain = 0, + stab_rollIntegLimit = 4, + stab_rollRateGain = 15, + stab_roll_active = false, + stab_yawGain = 20, + stab_yawIntegGain = 1, + stab_yawIntegLimit = 4, + stab_yawRateGain = 60, + stab_yaw_active = false, suspension = { { AxleFric0f = 4, AxleFric0s = 190, @@ -1086,13 +1111,12 @@ _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, yawOutK = 1, yawRateDirectFB_Coef = 0.7, - yawRateInputK = 0.5, + yawRateInputK = 0.175, zeroize_amortizers_before_collision_check = false }, HumanRadio = { diff --git a/_G/db/Units/Helicopters/Helicopter/CH-47Fbl1.lua b/_G/db/Units/Helicopters/Helicopter/CH-47Fbl1.lua index d3d9087f..ca405906 100644 --- a/_G/db/Units/Helicopters/Helicopter/CH-47Fbl1.lua +++ b/_G/db/Units/Helicopters/Helicopter/CH-47Fbl1.lua @@ -2080,7 +2080,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { country_of_origin = "USA", crew_members = { { can_be_playable = true, - canopy_arg = 38, + canopy_arg = 8, drop_canopy_name = 0, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { 0, 0, 1 }, @@ -2092,7 +2092,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { role_display_name = "Pilot" }, { can_be_playable = true, - canopy_arg = 421, + canopy_arg = 8, drop_canopy_name = 0, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { 0, 0, -1 }, @@ -2105,7 +2105,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { role_display_name = "Co-Pilot" }, { can_be_playable = true, - canopy_arg = 421, + canopy_arg = 8, drop_canopy_name = 0, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { 0, 0, -1 }, @@ -2118,7 +2118,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { role_display_name = "Engineer" }, { can_be_playable = true, - canopy_arg = 421, + canopy_arg = 8, drop_canopy_name = 0, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { 0, 0, -1 }, @@ -2131,7 +2131,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { role_display_name = "Port Gunner" }, { can_be_playable = true, - canopy_arg = 421, + canopy_arg = 8, drop_canopy_name = 0, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { 0, 0, -1 }, @@ -2144,7 +2144,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { role_display_name = "Stbd. Gunner" }, { can_be_playable = true, - canopy_arg = 421, + canopy_arg = 8, drop_canopy_name = 0, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { 0, 0, -1 }, @@ -2198,6 +2198,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { pos = { -5.555, 1.2, 1.205 }, smokiness_level = 0 } }, + fires_pos = { { -5.958, 1.843, 0 }, { -4.883, 1.221, -1.222 }, { -4.883, 1.221, 1.222 }, { -5.958, 1.843, 0 }, { -0.277, -0.995, -1.612 }, { -0.277, -0.995, 1.612 } }, flight_time_maximum = 189, flight_time_typical = 142, fuselage_Cxa0 = 0.6, @@ -2829,6 +2830,44 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { C = { { "PokeSound", 12005 } } } }, Transition = { "Any", "CustomStage1" } + } }, + WindscreenWiper0 = { { + Sequence = { { + C = { { "Sleep", "for", 0 } } + } }, + Transition = { "Any", "Hang" } + }, { + Sequence = { { + C = { { "Arg", 628, "to", 0, "speed", 1, "sign", -1 } } + } }, + Transition = { "Any", "Retract" } + }, { + Sequence = { { + C = { { "Arg", 628, "to", 1, "speed", 1, "sign", 1 } } + }, { + C = { { "Arg", 628, "to", 0, "speed", 1, "sign", -1 } } + }, { + C = { { "ValuePhase", 0 } } + } }, + Transition = { "Any", "CustomStage0" } + }, { + Sequence = { { + C = { { "Arg", 628, "to", 1, "speed", 2, "sign", 1 } } + }, { + C = { { "Arg", 628, "to", 0, "speed", 2, "sign", -1 } } + }, { + C = { { "ValuePhase", 0 } } + } }, + Transition = { "Any", "CustomStage1" } + }, { + Sequence = { { + C = { { "Arg", 628, "to", 1, "speed", 3, "sign", 1 } } + }, { + C = { { "Arg", 628, "to", 0, "speed", 3, "sign", -1 } } + }, { + C = { { "ValuePhase", 0 } } + } }, + Transition = { "Any", "CustomStage2" } } } }, moment_of_inertia = { 46000, 259000, 274000 }, diff --git a/_G/db/Units/Planes/Plane/B-52H.lua b/_G/db/Units/Planes/Plane/B-52H.lua index f968430a..95f594d9 100644 --- a/_G/db/Units/Planes/Plane/B-52H.lua +++ b/_G/db/Units/Planes/Plane/B-52H.lua @@ -725,39 +725,39 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [2] = { lights = { { lights = { { - angle_max = 0.69813170079773, - angle_min = 0.31415926535898, - argument = 208, - connector = "RESERV_SPOT_PTR_1", + angle_max = 0.62831853071796, + angle_min = 0.36651914291881, + argument = 211, + connector = "MAIN_SPOT_PTR_1", dir_correction = { - azimuth = 0.13962634015955, - elevation = -0.38397243543875 + azimuth = 0, + elevation = 0.05235987755983 }, exposure = { { 0, 0.9, 1 } }, movable = true, proto = <2>{ - angle_change_rate = 0.05235987755983, - angle_max = 0.20943951023932, - angle_min = 0.13962634015955, - color = { 255, 201, 125, 0.40347331922021 }, - power_up_t = 3.22, - range = 6480 + 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 }, - range = 4000, + range = 5000, typename = "Spot" }, { - angle_max = 0.78539816339745, - angle_min = 0.20943951023932, - argument = 209, - connector = "RESERV_SPOT_PTR_2", + angle_max = 0.62831853071796, + angle_min = 0.36651914291881, + argument = 211, + connector = "MAIN_SPOT_PTR_4", dir_correction = { - azimuth = -0.1221730476396, - elevation = -0.24434609527921 + azimuth = 0, + elevation = 0.034906585039887 }, exposure = { { 0, 0.9, 1 } }, movable = true, proto = , - range = 2500, + range = 5000, typename = "Spot" } }, typename = "Collection" @@ -840,65 +840,67 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [6] = { lights = { { lights = { { - angle_max = 0.62831853071796, - angle_min = 0.36651914291881, - argument = 211, - connector = "MAIN_SPOT_PTR_1", + angle_max = 0.69813170079773, + angle_min = 0.31415926535898, + argument = 208, + connector = "RESERV_SPOT_PTR_1", dir_correction = { - azimuth = 0, - elevation = 0.069813170079773 + azimuth = 0.05235987755983, + elevation = -0.10471975511966 }, exposure = { { 0, 0.9, 1 } }, movable = true, 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 + angle_change_rate = 0.05235987755983, + angle_max = 0.20943951023932, + angle_min = 0.13962634015955, + color = { 255, 201, 125, 0.40347331922021 }, + power_up_t = 3.22, + range = 6480 }, + range = 900, typename = "Spot" }, { - angle_max = 1.4311699866354, - angle_min = 0.75049157835756, - argument = 211, - connector = "MAIN_SPOT_PTR_2", + angle_max = 0.78539816339745, + angle_min = 0.20943951023932, + argument = 209, + connector = "RESERV_SPOT_PTR_2", dir_correction = { - azimuth = 0, - elevation = 0 + azimuth = -0.05235987755983, + elevation = -0.1221730476396 }, exposure = { { 0, 0.9, 1 } }, movable = true, proto =
, - range = 200, + range = 900, typename = "Spot" }, { - angle_max = 2.0943951023932, - angle_min = 1.3962634015955, - argument = 211, - connector = "MAIN_SPOT_PTR_3", + angle_max = 1.4311699866354, + angle_min = 0.75049157835756, + argument = 208, + connector = "MAIN_SPOT_PTR_2", dir_correction = { azimuth = 0, - elevation = 0 + elevation = -0.43633231299858 }, exposure = { { 0, 0.9, 1 } }, movable = true, - proto =
, - range = 100, + proto =
, + range = 1200, typename = "Spot" }, { - angle_max = 0.62831853071796, - angle_min = 0.36651914291881, - argument = 211, - connector = "MAIN_SPOT_PTR_4", + angle_max = 2.0943951023932, + angle_min = 1.3962634015955, + argument = 208, + connector = "MAIN_SPOT_PTR_3", dir_correction = { azimuth = 0, - elevation = 0.034906585039887 + elevation = -0.48869219055841 }, exposure = { { 0, 0.9, 1 } }, movable = true, - proto =
, + proto =
, + range = 1500, typename = "Spot" } }, typename = "Collection" diff --git a/_G/db/Units/Planes/Plane/C-101CC.lua b/_G/db/Units/Planes/Plane/C-101CC.lua index 8be380bc..f2bbe1c1 100644 --- a/_G/db/Units/Planes/Plane/C-101CC.lua +++ b/_G/db/Units/Planes/Plane/C-101CC.lua @@ -826,10 +826,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { station = 6 } } }, { - CLSID = "{BLG66_BELOUGA}", + CLSID = "{BLG66_AC}", arg_value = 0.1, required = { { - loadout = { "{BLG66_BELOUGA}" }, + loadout = { "{BLG66_AC}" }, station = 6 } } }, { @@ -915,10 +915,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { station = 5 } } }, { - CLSID = "{BLG66_BELOUGA}", + CLSID = "{BLG66_AC}", arg_value = 0.1, required = { { - loadout = { "{BLG66_BELOUGA}" }, + loadout = { "{BLG66_AC}" }, station = 5 } } }, { @@ -1037,10 +1037,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { station = 3 } } }, { - CLSID = "{BLG66_BELOUGA}", + CLSID = "{BLG66_AC}", arg_value = 0.1, required = { { - loadout = { "{BLG66_BELOUGA}" }, + loadout = { "{BLG66_AC}" }, station = 3 } } }, { @@ -1155,10 +1155,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { station = 2 } } }, { - CLSID = "{BLG66_BELOUGA}", + CLSID = "{BLG66_AC}", arg_value = 0.1, required = { { - loadout = { "{BLG66_BELOUGA}" }, + loadout = { "{BLG66_AC}" }, station = 2 } } }, { diff --git a/_G/db/Units/Planes/Plane/Mirage-F1AD.lua b/_G/db/Units/Planes/Plane/Mirage-F1AD.lua index 8421d80d..db0a9aa7 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1AD.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1AD.lua @@ -1548,9 +1548,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1641,9 +1640,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1657,8 +1655,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1754,9 +1751,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1788,8 +1784,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1832,9 +1827,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1848,8 +1842,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1951,9 +1944,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2191,56 +2183,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <4>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <5>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <6>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <7>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2307,7 +2311,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2371,7 +2375,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1AZ.lua b/_G/db/Units/Planes/Plane/Mirage-F1AZ.lua index ec8e745e..45acfbe4 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1AZ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1AZ.lua @@ -1544,9 +1544,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1637,9 +1636,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1653,8 +1651,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1750,9 +1747,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1784,8 +1780,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1828,9 +1823,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1844,8 +1838,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1947,9 +1940,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2183,56 +2175,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <4>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <5>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <6>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <7>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2299,7 +2303,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2363,7 +2367,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1B.lua b/_G/db/Units/Planes/Plane/Mirage-F1B.lua index 42be57ca..241853f0 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1B.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1B.lua @@ -275,7 +275,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { defValue = false, id = "SoloFlight", label = "Solo Flight", - weight = -80 + wCtrl = 75, + wLbl = 220, + weight = -80, + xCtrl = 240 }, { control = "comboList", defValue = 1, @@ -1427,9 +1430,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1520,9 +1522,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1536,8 +1537,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1699,9 +1699,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1733,8 +1732,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1829,9 +1827,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1845,8 +1842,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2014,9 +2010,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2274,56 +2269,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <5>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <6>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <7>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <8>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2435,7 +2442,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2535,7 +2542,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BD.lua b/_G/db/Units/Planes/Plane/Mirage-F1BD.lua index ab36910c..ec740349 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BD.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BD.lua @@ -275,7 +275,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { defValue = false, id = "SoloFlight", label = "Solo Flight", - weight = -80 + wCtrl = 75, + wLbl = 220, + weight = -80, + xCtrl = 240 }, { control = "comboList", defValue = 1, @@ -1427,9 +1430,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1540,9 +1542,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1556,8 +1557,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1705,9 +1705,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1739,8 +1738,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1810,9 +1808,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1826,8 +1823,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1981,9 +1977,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2261,56 +2256,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <2>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <3>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <4>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <5>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2422,7 +2429,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2522,7 +2529,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BE.lua b/_G/db/Units/Planes/Plane/Mirage-F1BE.lua index c74dc8f7..3bf2bfaa 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BE.lua @@ -294,7 +294,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { defValue = false, id = "SoloFlight", label = "Solo Flight", - weight = -80 + wCtrl = 75, + wLbl = 220, + weight = -80, + xCtrl = 240 }, { control = "comboList", defValue = 1, @@ -1719,9 +1722,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1827,9 +1829,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1843,8 +1844,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2036,9 +2036,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -2070,8 +2069,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -2211,9 +2209,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -2227,8 +2224,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2426,9 +2422,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2966,56 +2961,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <3>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <4>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <5>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <6>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -3127,7 +3134,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -3227,7 +3234,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua b/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua index cec37984..28d45928 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua @@ -275,7 +275,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { defValue = false, id = "SoloFlight", label = "Solo Flight", - weight = -80 + wCtrl = 75, + wLbl = 220, + weight = -80, + xCtrl = 240 }, { control = "comboList", defValue = 1, @@ -1427,9 +1430,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1540,9 +1542,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1556,8 +1557,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1705,9 +1705,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1739,8 +1738,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1810,9 +1808,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1826,8 +1823,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1981,9 +1977,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2261,56 +2256,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <2>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <3>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <4>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <5>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2422,7 +2429,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2522,7 +2529,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua b/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua index b151c8ad..ed1612f7 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua @@ -1544,9 +1544,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1606,6 +1605,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 6 + } } } }, Number = 2, Order = 2, @@ -1637,9 +1644,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1653,8 +1659,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1816,9 +1821,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1850,8 +1854,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1958,9 +1961,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1974,8 +1976,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2143,9 +2144,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2205,6 +2205,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 2 + } } } }, Number = 6, Order = 6, @@ -2379,56 +2387,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure = { { 929, 0, 1, 0, 1 } }, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" } }, typename = "collection" @@ -2437,15 +2457,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, @@ -2513,7 +2543,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2528,7 +2558,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 903, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "REFUEL_SPOT_PTR", cool_down_t = 1, movable = true, @@ -2593,7 +2623,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926, 997 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929, 997 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1C.lua b/_G/db/Units/Planes/Plane/Mirage-F1C.lua index 86ea7f09..2975b72a 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1C.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1C.lua @@ -1549,9 +1549,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1642,9 +1641,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1658,8 +1656,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1821,9 +1818,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1855,8 +1851,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1951,9 +1946,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1967,8 +1961,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2136,9 +2129,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2375,56 +2367,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <7>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <8>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <9>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <10>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2491,7 +2495,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2555,7 +2559,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CE.lua b/_G/db/Units/Planes/Plane/Mirage-F1CE.lua index 6eb6cd1f..56d6b317 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CE.lua @@ -1840,9 +1840,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1948,9 +1947,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1964,8 +1962,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2157,9 +2154,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -2191,8 +2187,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -2332,9 +2327,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -2348,8 +2342,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2547,9 +2540,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2948,56 +2940,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <5>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <6>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <7>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <8>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -3064,7 +3068,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -3128,7 +3132,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CG.lua b/_G/db/Units/Planes/Plane/Mirage-F1CG.lua index 32a0c2e4..521151d4 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CG.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CG.lua @@ -1549,9 +1549,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1651,9 +1650,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1667,8 +1665,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1830,9 +1827,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1864,8 +1860,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1972,9 +1967,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1988,8 +1982,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2157,9 +2150,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2406,56 +2398,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <4>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <5>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <6>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <7>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2522,7 +2526,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2586,7 +2590,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CH.lua b/_G/db/Units/Planes/Plane/Mirage-F1CH.lua index 1d174ec8..77554dd0 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CH.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CH.lua @@ -1544,9 +1544,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1606,6 +1605,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 6 + } } } }, Number = 2, Order = 2, @@ -1637,9 +1644,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1653,8 +1659,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1816,9 +1821,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1850,8 +1854,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1958,9 +1961,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1974,8 +1976,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2143,9 +2144,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2205,6 +2205,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 2 + } } } }, Number = 6, Order = 6, @@ -2378,56 +2386,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <4>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <5>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <6>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <7>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2494,7 +2514,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2558,7 +2578,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua b/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua index df6e2b52..527088d1 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua @@ -1544,9 +1544,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1606,6 +1605,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 6 + } } } }, Number = 2, Order = 2, @@ -1637,9 +1644,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1653,8 +1659,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1816,9 +1821,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1850,8 +1854,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1958,9 +1961,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1974,8 +1976,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2143,9 +2144,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2205,6 +2205,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 2 + } } } }, Number = 6, Order = 6, @@ -2378,56 +2386,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <4>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <5>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <6>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <7>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2494,7 +2514,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2558,7 +2578,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CK.lua b/_G/db/Units/Planes/Plane/Mirage-F1CK.lua index cf99601a..3fce8299 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CK.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CK.lua @@ -1544,9 +1544,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1606,6 +1605,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 6 + } } } }, Number = 2, Order = 2, @@ -1637,9 +1644,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1653,8 +1659,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1816,9 +1821,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1850,8 +1854,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1958,9 +1961,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1974,8 +1976,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2143,9 +2144,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2205,6 +2205,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 2 + } } } }, Number = 6, Order = 6, @@ -2378,56 +2386,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <4>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <5>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <6>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <7>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2494,7 +2514,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2558,7 +2578,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CR.lua b/_G/db/Units/Planes/Plane/Mirage-F1CR.lua index 6854be84..ec96ab6c 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CR.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CR.lua @@ -1498,9 +1498,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1607,9 +1606,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1623,8 +1621,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1726,9 +1723,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1760,8 +1756,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1822,9 +1817,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1838,8 +1832,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1947,9 +1940,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2203,56 +2195,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_L", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_L", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure = { { 929, 0, 1, 0, 1 } }, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" } }, typename = "collection" @@ -2261,15 +2265,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_L", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_L", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, @@ -2337,7 +2351,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2352,7 +2366,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 903, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "REFUEL_SPOT_PTR", cool_down_t = 1, movable = true, @@ -2417,7 +2431,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926, 997 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929, 997 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CT.lua b/_G/db/Units/Planes/Plane/Mirage-F1CT.lua index 1ee68453..e9af3cd7 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CT.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CT.lua @@ -1498,9 +1498,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1607,9 +1606,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1623,8 +1621,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1752,9 +1749,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1786,8 +1782,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1842,9 +1837,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1858,8 +1852,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1993,9 +1986,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2249,56 +2241,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_R", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_R", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure = { { 929, 0, 1, 0, 1 } }, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" } }, typename = "collection" @@ -2307,15 +2311,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_R", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_R", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, @@ -2383,7 +2397,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2398,7 +2412,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 903, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "REFUEL_SPOT_PTR", cool_down_t = 1, movable = true, @@ -2463,7 +2477,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926, 997 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929, 997 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua b/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua index a917e5c0..500faf04 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua @@ -1544,9 +1544,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1606,6 +1605,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 6 + } } } }, Number = 2, Order = 2, @@ -1637,9 +1644,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1653,8 +1659,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1816,9 +1821,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1850,8 +1854,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1958,9 +1961,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1974,8 +1976,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2143,9 +2144,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2205,6 +2205,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 2 + } } } }, Number = 6, Order = 6, @@ -2378,56 +2386,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <4>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <5>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <6>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <7>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2494,7 +2514,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2558,7 +2578,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua b/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua index c79f2451..5c9a6c3b 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua @@ -275,7 +275,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { defValue = false, id = "SoloFlight", label = "Solo Flight", - weight = -80 + wCtrl = 75, + wLbl = 220, + weight = -80, + xCtrl = 240 }, { control = "comboList", defValue = 1, @@ -1423,9 +1426,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1528,9 +1530,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1544,8 +1545,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1685,9 +1685,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1719,8 +1718,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1784,9 +1782,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1800,8 +1797,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1947,9 +1943,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2215,56 +2210,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <2>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <3>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <4>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <5>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2376,7 +2383,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2476,7 +2483,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1ED.lua b/_G/db/Units/Planes/Plane/Mirage-F1ED.lua index 74fe5ed4..d20054dd 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1ED.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1ED.lua @@ -1548,9 +1548,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1661,9 +1660,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1677,8 +1675,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1826,9 +1823,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1860,8 +1856,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1931,9 +1926,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1947,8 +1941,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2102,9 +2095,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2361,56 +2353,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <4>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <5>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <6>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <7>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2477,7 +2481,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2541,7 +2545,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua b/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua index 73caaa4d..d3420096 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua @@ -1544,9 +1544,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1649,9 +1648,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1665,8 +1663,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1806,9 +1803,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1840,8 +1836,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1905,9 +1900,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1921,8 +1915,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2068,9 +2061,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2315,56 +2307,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <4>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <5>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <6>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <7>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2431,7 +2435,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2495,7 +2499,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EE.lua b/_G/db/Units/Planes/Plane/Mirage-F1EE.lua index 1d43805c..2fed3ed0 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EE.lua @@ -1875,9 +1875,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1991,9 +1990,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -2007,8 +2005,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2200,9 +2197,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -2234,8 +2230,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -2375,9 +2370,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -2391,8 +2385,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2590,9 +2583,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -3000,56 +2992,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure = { { 929, 0, 1, 0, 1 } }, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" } }, typename = "collection" @@ -3058,15 +3062,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, @@ -3134,7 +3148,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -3149,7 +3163,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 903, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "REFUEL_SPOT_PTR", cool_down_t = 1, movable = true, @@ -3214,7 +3228,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926, 997 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929, 997 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EH.lua b/_G/db/Units/Planes/Plane/Mirage-F1EH.lua index 2471ec89..0948d93a 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EH.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EH.lua @@ -1544,9 +1544,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1606,6 +1605,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 6 + } } } }, Number = 2, Order = 2, @@ -1637,9 +1644,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1653,8 +1659,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1816,9 +1821,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1850,8 +1854,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1958,9 +1961,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1974,8 +1976,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2143,9 +2144,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2205,6 +2205,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0.25 }, { arg_value = 0.25 + }, { + CLSID = "BARAX_ECM", + arg_value = 0.15, + attach_point_position = { -0.4, 0.02, 0 }, + forbidden = { { + loadout = { "BARAX_ECM" }, + station = 2 + } } } }, Number = 6, Order = 6, @@ -2379,56 +2387,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure = { { 929, 0, 1, 0, 1 } }, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" } }, typename = "collection" @@ -2437,15 +2457,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, @@ -2513,7 +2543,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2528,7 +2558,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 903, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "REFUEL_SPOT_PTR", cool_down_t = 1, movable = true, @@ -2593,7 +2623,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926, 997 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929, 997 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua b/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua index bb6ebd19..2f40be10 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua @@ -1548,9 +1548,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1661,9 +1660,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1677,8 +1675,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1826,9 +1823,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1860,8 +1856,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1931,9 +1926,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1947,8 +1941,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2102,9 +2095,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2362,56 +2354,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure = { { 929, 0, 1, 0, 1 } }, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" } }, typename = "collection" @@ -2420,15 +2424,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, @@ -2496,7 +2510,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2511,7 +2525,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 903, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "REFUEL_SPOT_PTR", cool_down_t = 1, movable = true, @@ -2576,7 +2590,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926, 997 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929, 997 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1JA.lua b/_G/db/Units/Planes/Plane/Mirage-F1JA.lua index aaa79661..c7a94082 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1JA.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1JA.lua @@ -1540,9 +1540,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1636,9 +1635,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1652,8 +1650,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1749,9 +1746,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1783,8 +1779,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -1827,9 +1822,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1843,8 +1837,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1946,9 +1939,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2180,56 +2172,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <4>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <5>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <6>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <7>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2296,7 +2300,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2360,7 +2364,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua b/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua index 253737f5..b7c5b72b 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua @@ -1563,9 +1563,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1671,9 +1670,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1687,8 +1685,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1880,9 +1877,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1914,8 +1910,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -2055,9 +2050,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -2071,8 +2065,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2270,9 +2263,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2539,56 +2531,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = <4>{ { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = <5>{ 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color =
, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = <6>{ { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure =
, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure =
, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure =
, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = <7>{ { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure =
, typename = "argumentlight" } }, typename = "collection" @@ -2655,7 +2659,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color =
, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2719,7 +2723,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua b/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua index b3ec85b5..0427c42f 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua @@ -1563,9 +1563,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -1679,9 +1678,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -1695,8 +1693,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -1888,9 +1885,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{SAMP400HD}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{CLB4_BLU107}", arg_value = 0.35 @@ -1922,8 +1918,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "PTB-1200-F1", @@ -2063,9 +2058,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.15 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.15, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.15 }, { CLSID = "{AUF2_BLU107}", arg_value = 0.15 @@ -2079,8 +2073,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{AUF2_SAMP250HD}", arg_value = 0.15 }, { - arg_value = 0.15 - }, { + CLSID = "{AUF2_BLG66}", arg_value = 0.15 }, { CLSID = "{MATRA_F1_SNEBT250}", @@ -2278,9 +2271,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BLU107B_DURANDAL}", arg_value = 0.25 }, { - CLSID = "{BLG66_BELOUGA}", - arg_value = 0.25, - attach_point_position = { 0.04, 0, 0 } + CLSID = "{BLG66_AC}", + arg_value = 0.25 }, { CLSID = "{MATRA_F1_SNEBT250}", arg_value = 0.35 @@ -2556,56 +2548,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { is_tanker = false, length = 15.3, lights_data = { - lights = { { - lights = { { - argument = 83, - period = 1.333, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 802, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - }, { - argument = 803, - period = 1.4, - phase_shift = 0, - typename = "argnatostrobelight" - } }, - typename = "collection" - }, { + lights = { + [2] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, typename = "collection" - }, { + }, + [3] = { lights = { { argument = 190, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" }, { argument = 191, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, + typename = "argumentlight" + }, { + argument = 83, + exposure = { { 929, 0, 1, 0, 1 } }, + flash_time = 0.3333, + period = 1.3333, + typename = "argnatostrobelight" + }, { + argument = 802, + exposure = { { 929, 0, 1, 0, 1 } }, + power_up_t = 0.052, typename = "argumentlight" } }, typename = "collection" - }, { + }, + [4] = { lights = { { argument = 200, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" }, { argument = 201, + exposure = { { 928, 0, 1, 0, 1 } }, typename = "argumentlight" } }, typename = "collection" @@ -2614,15 +2618,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { lights = { { angle_change_rate = 0.13962634015955, - angle_max = 0.55850536063819, - angle_min = 0.19198621771938, + angle_max = 0.5235987755983, + angle_min = 0.17453292519943, argument = 209, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "MAIN_SPOT_PTR", movable = true, power_up_t = 1, range = 1500, typename = "spotlight" + }, { + angle_change_rate = -0.90757121103705, + angle_max = 2.8797932657906, + angle_min = 2.5307274153918, + color = { 255, 194, 97, 0.4 }, + connector = "MAIN_SPOT_PTR", + movable = true, + power_up_t = 1, + range = 40, + typename = "spotlight" } }, typename = "collection" } }, @@ -2690,7 +2704,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 905, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "PILOT_LIGHT", movable = true, power_up_t = 1, @@ -2705,7 +2719,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_max = 0.55850536063819, angle_min = 0.19198621771938, argument = 903, - color = { 255, 216, 160, 0.4 }, + color = { 255, 194, 97, 0.4 }, connector = "REFUEL_SPOT_PTR", cool_down_t = 1, movable = true, @@ -2770,7 +2784,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "High" } } } }, - net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 845, 905, 911, 920, 924, 925, 926, 997 }, + net_animation = { 11, 12, 13, 14, 15, 16, 18, 23, 28, 35, 36, 37, 38, 75, 86, 90, 115, 116, 117, 120, 123, 126, 127, 128, 129, 149, 182, 184, 282, 283, 284, 285, 308, 309, 310, 311, 312, 313, 314, 338, 339, 340, 341, 427, 705, 750, 751, 752, 753, 754, 755, 780, 781, 782, 803, 845, 905, 911, 920, 924, 925, 926, 928, 929, 997 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.162225, nose_gear_amortizer_reversal_stroke = -0.309, diff --git a/_G/db/Units/Planes/Plane/RQ-1A Predator.lua b/_G/db/Units/Planes/Plane/RQ-1A Predator.lua index 14835614..f4ec5851 100644 --- a/_G/db/Units/Planes/Plane/RQ-1A Predator.lua +++ b/_G/db/Units/Planes/Plane/RQ-1A Predator.lua @@ -4,100 +4,19 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CAS_min = 20, Categories = {}, Damage = { - [0] = { - args = { 82 }, - critical_damage = 5 - }, - [3] = { - args = { 65 }, - critical_damage = 10 - }, - [8] = { - critical_damage = 10 - }, - [11] = { - critical_damage = 3 - }, - [12] = { + [10] = { critical_damage = 3 }, - [15] = { - critical_damage = 10 - }, - [16] = { - critical_damage = 10 - }, - [17] = { - critical_damage = 3 - }, - [18] = { + [11] = { critical_damage = 3 }, - [25] = { - args = { 53 }, - critical_damage = 5 - }, - [26] = { - args = { 54 }, - critical_damage = 5 - }, [35] = { args = { 67 }, - critical_damage = 10, - deps_cells = { 25, 37 } + critical_damage = 5 }, [36] = { args = { 68 }, - critical_damage = 10, - deps_cells = { 26, 38 } - }, - [37] = { - args = { 55 }, - critical_damage = 4 - }, - [38] = { - args = { 56 }, - critical_damage = 4 - }, - [43] = { - args = { 61 }, - critical_damage = 4, - deps_cells = { 53 } - }, - [44] = { - args = { 62 }, - critical_damage = 4, - deps_cells = { 54 } - }, - [47] = { - args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } - }, - [48] = { - args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 - }, - [53] = { - args = { 57 }, - critical_damage = 2 - }, - [54] = { - args = { 58 }, - critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 15 + critical_damage = 5 } }, DefaultTask = <1>{ diff --git a/_G/db/Units/Ships/Ship/TICONDEROG.lua b/_G/db/Units/Ships/Ship/TICONDEROG.lua index 2ac6b451..2d2d2b7e 100644 --- a/_G/db/Units/Ships/Ship/TICONDEROG.lua +++ b/_G/db/Units/Ships/Ship/TICONDEROG.lua @@ -170,7 +170,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Rate = 4000, Sensors = { OPTIC = { "long-range naval optics", "long-range naval LLTV", "long-range naval FLIR" }, - RADAR = { "Patriot str", "ticonderoga search radar" } + RADAR = { "AEGIS_search_radar", "ticonderoga search radar" } }, Singleton = "no", Tail_Width = 15, @@ -425,7 +425,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { angles = { { 3.1415926535898, 0, -1.5707963267949, 1.5707963267949 } }, area = "KORMA_TOP", canSetTacticalDir = true, - pos = { -83.594, 7.002, -4.54 } + pos = { -83.594, 7.002, -4.54 }, + reference_angle_Y = 1.5707963267949 }, { LN = { { BR = { { @@ -447,7 +448,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { sensor = {} } }, angles = { { 0, -3.1415926535898, -1.5707963267949, 1.5707963267949 } }, - pos = {} + pos = {}, + reference_angle_Y = -1.5707963267949 }, { LN = { { ECM_K = 0.5, 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 500d4d90..88ef48fe 100644 --- a/_G/db/Units/Ships/Ship/USS_Arleigh_Burke_IIa.lua +++ b/_G/db/Units/Ships/Ship/USS_Arleigh_Burke_IIa.lua @@ -149,7 +149,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Rate = 3000, Sensors = { OPTIC = { "long-range naval optics", "long-range naval LLTV", "long-range naval FLIR" }, - RADAR = { "Patriot str", "ticonderoga search radar" } + RADAR = { "AEGIS_search_radar", "ticonderoga search radar" } }, Singleton = "no", Tail_Width = 15, diff --git a/_G/db/Units/Ships/Ship/atconveyor.lua b/_G/db/Units/Ships/Ship/atconveyor.lua index 4993a528..2ea034af 100644 --- a/_G/db/Units/Ships/Ship/atconveyor.lua +++ b/_G/db/Units/Ships/Ship/atconveyor.lua @@ -202,7 +202,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { turret_azimuth = { {} }, turret_elevation = { {} } }, - attribute = { 3, 12, 12, "Redacted", "Aircraft Carriers", "DetectionByAWACS", "Straight_in_approach_type", "AircraftCarrier", "Armed Ship", "Naval", "All", "Ships", "Armed ships", "Armed Air Defence", "HeavyArmoredUnits", "Heavy armed ships" }, + attribute = { 3, 12, 12, "Redacted", "Aircraft Carriers", "DetectionByAWACS", "Straight_in_approach_type", "HelicopterCarrier", "AircraftCarrier", "Armed Ship", "Naval", "All", "Ships", "Armed ships", "Armed Air Defence", "HeavyArmoredUnits", "Heavy armed ships" }, carrierIlluminationStates = { { { 69, 0, 1 }, { 88, 0, 0 }, { 792, 0, 1 }, { 797, 0, 1 } }, { { 69, 0, 1 }, { 88, 0, 1 }, { 792, 0, 0 }, { 797, 0, 1 } }, { { 69, 0, 0 }, { 88, 0, 1 }, { 792, 0, 0 }, { 797, 0, 1 } } }, chassis = {}, distFindObstacles = 250, diff --git a/_G/launcher/B-1B_Mk-848.lua b/_G/launcher/B-1B_Mk-848.lua index e54b8efe..3520da19 100644 --- a/_G/launcher/B-1B_Mk-848.lua +++ b/_G/launcher/B-1B_Mk-848.lua @@ -1,7 +1,7 @@ _G["launcher"]["B-1B_Mk-84*8"] = { CLSID = "B-1B_Mk-84*8", Count = 8, - Elements = { "_G/Pylons/B_1_B_Conventional_Rotary_Launcher.lua", { + Elements = { "_G/Pylons/B-1B_Conventional_Rotary_Launcher.lua", { ShapeName = "MK-84", connector_name = "AttachPoint001" }, { diff --git a/_G/launcher/CBU8710.lua b/_G/launcher/CBU8710.lua index da0ef45c..735cd22e 100644 --- a/_G/launcher/CBU8710.lua +++ b/_G/launcher/CBU8710.lua @@ -1,7 +1,7 @@ _G["launcher"]["CBU87*10"] = { CLSID = "CBU87*10", Count = 10, - Elements = { "_G/Pylons/B_1_B_10-store_Conventional_Bomb_Module.lua", { + Elements = { "_G/Pylons/B-1B_10-store_Conventional_Bomb_Module.lua", { ShapeName = "CBU-87", connector_name = "AttachPoint010" }, { diff --git a/_G/launcher/CBU9710.lua b/_G/launcher/CBU9710.lua index 8a44408f..b7ff98e0 100644 --- a/_G/launcher/CBU9710.lua +++ b/_G/launcher/CBU9710.lua @@ -3,7 +3,7 @@ _G["launcher"]["CBU97*10"] = { Count = 10, Elements = { { IsAdapter = true, - ShapeName = "B_1_B_10-store_Conventional_Bomb_Module" + ShapeName = "B-1B_10-store_Conventional_Bomb_Module" }, { ShapeName = "CBU-97", connector_name = "AttachPoint010" diff --git a/_G/launcher/DIS_C-701IR.lua b/_G/launcher/DIS_C-701IR.lua index 3f9701dd..6d6c4a53 100644 --- a/_G/launcher/DIS_C-701IR.lua +++ b/_G/launcher/DIS_C-701IR.lua @@ -9,8 +9,8 @@ _G["launcher"]["DIS_C-701IR"] = { Weight = 170, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_c701.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - attribute = "weapons.missiles.C-701IR", + attribute = "weapons.missiles.C_701T", category = 2, displayName = "C-701IR", - ejectVelocity = 0 + 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 3a36b404..df595e85 100644 --- a/_G/launcher/DIS_C-701T.lua +++ b/_G/launcher/DIS_C-701T.lua @@ -12,5 +12,5 @@ _G["launcher"]["DIS_C-701T"] = { attribute = "weapons.missiles.C_701T", category = 2, displayName = "C-701T", - ejectVelocity = 0 + 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 c7c74e13..5f0dbc25 100644 --- a/_G/launcher/DIS_CM-802AKG.lua +++ b/_G/launcher/DIS_CM-802AKG.lua @@ -8,10 +8,10 @@ _G["launcher"]["DIS_CM-802AKG"] = { ShapeName = "cm802akg" } }, Picture = "c802akg.png", - Weight = 765, + Weight = 720, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_cm802akg.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - attribute = { 4, 4, 8, "Redacted" }, + attribute = "weapons.missiles.CM-802AKG", category = 2, displayName = "CM802AKG (DIS)", ejectDirection = { 0, -1, 0 }, diff --git a/_G/launcher/DIS_CM-802AKG_AI.lua b/_G/launcher/DIS_CM-802AKG_AI.lua index 749671e2..fd79a88c 100644 --- a/_G/launcher/DIS_CM-802AKG_AI.lua +++ b/_G/launcher/DIS_CM-802AKG_AI.lua @@ -8,10 +8,10 @@ _G["launcher"]["DIS_CM-802AKG_AI"] = { ShapeName = "cm802akg" } }, Picture = "c802akg.png", - Weight = 765, + Weight = 720, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_cm802akg.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - attribute = { 4, 4, 8, "Redacted" }, + attribute = "weapons.missiles.CM_802AKG", category = 2, displayName = "CM802AKG (DIS) for AI", ejectDirection = { 0, -1, 0 }, diff --git a/_G/launcher/DIS_GDJ_YJ83K.lua b/_G/launcher/DIS_GDJ_YJ83K.lua index c0bf5278..f71ae746 100644 --- a/_G/launcher/DIS_GDJ_YJ83K.lua +++ b/_G/launcher/DIS_GDJ_YJ83K.lua @@ -14,9 +14,9 @@ _G["launcher"]["DIS_GDJ_YJ83K"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", attribute = { 4, 4, 32, "Redacted" }, category = 2, - displayName = "YJ-83K", + displayName = "YJ83K", ejectDirection = { 0, -1, 0 }, ejectVelocity = 2, name = "DIS_GDJ_YJ83K", - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + wsTypeOfWeapon = "weapons.missiles.YJ-83" } \ No newline at end of file diff --git a/_G/launcher/DIS_YJ83K.lua b/_G/launcher/DIS_YJ83K.lua index eccbb8d7..9aeefe78 100644 --- a/_G/launcher/DIS_YJ83K.lua +++ b/_G/launcher/DIS_YJ83K.lua @@ -10,9 +10,9 @@ _G["launcher"]["DIS_YJ83K"] = { Weight = 715, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_c802ak.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - attribute = { 4, 4, 8, "Redacted" }, + attribute = "weapons.missiles.YJ-83", category = 2, - displayName = "YJ-83K", + displayName = "YJ83K", ejectDirection = { 0, -1, 0 }, ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/GBU-318.lua b/_G/launcher/GBU-318.lua index 937fab0a..54ab1f46 100644 --- a/_G/launcher/GBU-318.lua +++ b/_G/launcher/GBU-318.lua @@ -3,7 +3,7 @@ _G["launcher"]["GBU-31*8"] = { Count = 8, Elements = { { IsAdapter = true, - ShapeName = "B_1_B_Conventional_Rotary_Launcher" + ShapeName = "B-1B_Conventional_Rotary_Launcher" }, { ShapeName = "GBU-31", connector_name = "AttachPoint001" diff --git a/_G/launcher/GBU-31V3B8.lua b/_G/launcher/GBU-31V3B8.lua index 2837a8d3..9c956841 100644 --- a/_G/launcher/GBU-31V3B8.lua +++ b/_G/launcher/GBU-31V3B8.lua @@ -3,7 +3,7 @@ _G["launcher"]["GBU-31V3B*8"] = { Count = 8, Elements = { { IsAdapter = true, - ShapeName = "B_1_B_Conventional_Rotary_Launcher" + ShapeName = "B-1B_Conventional_Rotary_Launcher" }, { ShapeName = "GBU-31(V)3B", connector_name = "AttachPoint001" @@ -41,267 +41,5 @@ _G["launcher"]["GBU-31V3B*8"] = { ejectVelocity = 3, kind_of_shipping = 0, name = "GBU-31V3B*8", - settings = { { - baseDim = "", - control = "comboList", - defValue = "FMU139CB_LD", - id = "NFP_fuze_type_tail", - label = "Tail Fuze Well", - stringIndex = 1, - values = { { - dispName = "FMU-139", - id = "FMU139CB_LD", - secondaryParams = { - addDef = { - ID = "NFP_VIS_DrawArgNo_55", - val = 0.1 - }, - tooltip = "Electronic, impact" - } - }, { - dispName = "FMU-143", - id = "FMU143", - secondaryParams = { - addDef = { - ID = "NFP_VIS_DrawArgNo_55", - val = 0.1 - }, - tooltip = "Electronic, impact" - } - }, { - dispName = "FMU-152", - id = "FMU152AB_LD", - secondaryParams = { - addDef = { - ID = "NFP_VIS_DrawArgNo_55", - val = 0.1 - }, - tooltip = "Electronic, impact\nFuze parameters are adjustable in-flight" - } - } }, - wCtrl = 360, - xCtrl = 200 - }, { - VisibilityCondition = { { - id = "NFP_fuze_type_tail", - value = "FMU143" - } }, - baseDim = "s", - control = "comboList", - defValue = 5.5, - dimension = "s", - id = "arm_delay_ctrl_FMU143", - label = "Arm Delay", - nLocDim = "s", - stringIndex = 2, - values = { { - dispName = 5.5, - id = 5.5, - units = "s" - }, { - dispName = 12, - id = 12, - units = "s" - }, { - dispName = 21, - id = 21, - units = "s" - } }, - wCtrl = 60, - xCtrl = 200, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "NFP_fuze_type_tail", - value = "FMU139CB_LD" - } }, - baseDim = "s", - control = "comboList", - defValue = 4, - dimension = "s", - id = "arm_delay_ctrl_FMU139CB_LD", - label = "Arm Delay", - nLocDim = "s", - stringIndex = 2, - values = { { - dispName = 4, - id = 4, - units = "s" - }, { - dispName = 6, - id = 6, - units = "s" - }, { - dispName = 7, - id = 7, - units = "s" - }, { - dispName = 10, - id = 10, - units = "s" - }, { - dispName = 14, - id = 14, - units = "s" - }, { - dispName = 20, - id = 20, - units = "s" - } }, - wCtrl = 60, - xCtrl = 200, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "NFP_fuze_type_tail", - value = "FMU152AB_LD" - } }, - baseDim = "s", - control = "comboList", - defValue = 4, - dimension = "s", - id = "arm_delay_ctrl_FMU152AB_LD", - label = "Arm Delay", - nLocDim = "s", - stringIndex = 2, - values = { { - dispName = 4, - id = 4, - units = "s" - }, { - dispName = 5, - id = 5, - units = "s" - }, { - dispName = 6, - id = 6, - units = "s" - }, { - dispName = 7, - id = 7, - units = "s" - }, { - dispName = 8, - id = 8, - units = "s" - }, { - dispName = 10, - id = 10, - units = "s" - }, { - dispName = 14, - id = 14, - units = "s" - }, { - dispName = 21, - id = 21, - units = "s" - } }, - wCtrl = 60, - xCtrl = 200, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "NFP_fuze_type_tail", - value = "FMU139CB_LD" - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_FMU139CB_LD", - label = "Function Delay", - nLocDim = "s", - stringIndex = 2, - values = { { - dispName = 0, - id = 0, - units = "s" - }, { - dispName = 0.01, - id = 0.01, - units = "s" - }, { - dispName = 0.025, - id = 0.025, - units = "s" - }, { - dispName = 0.06, - id = 0.06, - units = "s" - } }, - wCtrl = 60, - xCtrl = 500, - xLbl = 310 - }, { - VisibilityCondition = { { - id = "NFP_fuze_type_tail", - value = "FMU152AB_LD" - } }, - baseDim = "", - control = "comboList", - defValue = 0, - dimension = "", - id = "function_delay_ctrl_FMU152AB_LD", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = "0 s", - id = 0 - }, { - dispName = "5 ms", - id = 0.005 - }, { - dispName = "25 ms", - id = 0.025 - }, { - dispName = "60 ms", - id = 0.06 - }, { - dispName = "0.18 s", - id = 0.18 - }, { - dispName = "0.25 h", - id = 900 - }, { - dispName = "4 h", - id = 14400 - }, { - dispName = "24 h", - id = 86400 - } }, - wCtrl = 60, - xCtrl = 500, - xLbl = 310 - }, { - VisibilityCondition = { { - id = "NFP_fuze_type_tail", - value = "FMU143" - } }, - baseDim = "s", - control = "comboList", - defValue = 0.03, - dimension = "ms", - id = "function_delay_ctrl_FMU143", - label = "Function Delay", - nLocDim = "ms", - stringIndex = 2, - values = { { - dispName = 0.03, - id = 0.03, - units = "s" - }, { - dispName = 0.06, - id = 0.06, - units = "s" - }, { - dispName = 0.12, - id = 0.12, - units = "s" - } }, - wCtrl = 60, - xCtrl = 500, - xLbl = 310 - } }, 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 cbde317e..233a8832 100644 --- a/_G/launcher/GBU-3816.lua +++ b/_G/launcher/GBU-3816.lua @@ -3,7 +3,7 @@ _G["launcher"]["GBU-38*16"] = { Count = 28, Elements = { { IsAdapter = true, - ShapeName = "B_1_B_28-store_Conventional_Bomb_Module" + ShapeName = "B-1B_28-store_Conventional_Bomb_Module" }, { ShapeName = "GBU-38", connector_name = "AttachPoint012" diff --git a/_G/launcher/MK_8228.lua b/_G/launcher/MK_8228.lua index c3378a52..55e6ba68 100644 --- a/_G/launcher/MK_8228.lua +++ b/_G/launcher/MK_8228.lua @@ -1,7 +1,7 @@ _G["launcher"]["MK_82*28"] = { CLSID = "MK_82*28", Count = 28, - Elements = { "_G/Pylons/B_1_B_28-store_Conventional_Bomb_Module.lua", { + Elements = { "_G/Pylons/B-1B_28-store_Conventional_Bomb_Module.lua", { ShapeName = "MK-82", connector_name = "AttachPoint012" }, { diff --git a/_G/launcher/{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}.lua b/_G/launcher/{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}.lua index 0303c2f7..b2a3899f 100644 --- a/_G/launcher/{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}.lua +++ b/_G/launcher/{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}.lua @@ -3,7 +3,7 @@ _G["launcher"]["{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}"] = { Count = 4, Elements = { { IsAdapter = true, - ShapeName = "B_1_B_Conventional_Rotary_Launcher" + ShapeName = "B-1B_Conventional_Rotary_Launcher" }, { ShapeName = "agm-154", connector_name = "AttachPoint001" diff --git a/_G/launcher/{AUF2_BLG66_AC}.lua b/_G/launcher/{AUF2_BLG66_AC}.lua new file mode 100644 index 00000000..26fa4f08 --- /dev/null +++ b/_G/launcher/{AUF2_BLG66_AC}.lua @@ -0,0 +1,26 @@ +_G["launcher"]["{AUF2_BLG66_AC}"] = { + CLSID = "{AUF2_BLG66_AC}", + Count = 2, + Cx_pil = 0.001326, + Elements = { { + IsAdapter = true, + ShapeName = "AUF2_RACK" + }, { + ShapeName = "BLG-66", + connector_name = "AUF2_1" + }, { + ShapeName = "BLG-66", + connector_name = "AUF2_2" + } }, + Picture = "Mk20.png", + Weight = 680, + Weight_Empty = 80, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "AUF 2 - 2 x BLG-66 Belouga AC - CBU, 151 x HEAT Bomblets", + name = "{AUF2_BLG66_AC}", + shape_table_data = {}, + wsTypeOfWeapon = { 4, 5, 38, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{AUF2_BLG66_EG}.lua b/_G/launcher/{AUF2_BLG66_EG}.lua new file mode 100644 index 00000000..5767817d --- /dev/null +++ b/_G/launcher/{AUF2_BLG66_EG}.lua @@ -0,0 +1,26 @@ +_G["launcher"]["{AUF2_BLG66_EG}"] = { + CLSID = "{AUF2_BLG66_EG}", + Count = 2, + Cx_pil = 0.001326, + Elements = { { + IsAdapter = true, + ShapeName = "AUF2_RACK" + }, { + ShapeName = "BLG-66", + connector_name = "AUF2_1" + }, { + ShapeName = "BLG-66", + connector_name = "AUF2_2" + } }, + Picture = "Mk20.png", + Weight = 680, + Weight_Empty = 80, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "AUF 2 - 2 x BLG-66 Belouga EG - CBU, 151 x HE/Frag Bomblets", + name = "{AUF2_BLG66_EG}", + shape_table_data = {}, + wsTypeOfWeapon = { 4, 5, 38, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{AUF2_BLG66}.lua b/_G/launcher/{AUF2_BLG66}.lua new file mode 100644 index 00000000..121d1abe --- /dev/null +++ b/_G/launcher/{AUF2_BLG66}.lua @@ -0,0 +1,26 @@ +_G["launcher"]["{AUF2_BLG66}"] = { + CLSID = "{AUF2_BLG66}", + Count = 2, + Cx_pil = 0.001326, + Elements = { { + IsAdapter = true, + ShapeName = "AUF2_RACK" + }, { + ShapeName = "BLG-66", + connector_name = "AUF2_1" + }, { + ShapeName = "BLG-66", + connector_name = "AUF2_2" + } }, + Picture = "Mk20.png", + Weight = 680, + Weight_Empty = 80, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "AUF 2 - 2 x BLG-66 Belouga AC - CBU, 151 x HEAT Bomblets", + name = "{AUF2_BLG66}", + shape_table_data = {}, + wsTypeOfWeapon = { 4, 5, 38, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{AUF2_BLU107}.lua b/_G/launcher/{AUF2_BLU107}.lua index 9b382d76..a3bc3140 100644 --- a/_G/launcher/{AUF2_BLU107}.lua +++ b/_G/launcher/{AUF2_BLU107}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{AUF2_BLU107}"] = { CLSID = "{AUF2_BLU107}", Count = 2, - Cx_pil = 0.001, + Cx_pil = 0.00164, Elements = { { IsAdapter = true, ShapeName = "AUF2_RACK" @@ -13,12 +13,14 @@ _G["launcher"]["{AUF2_BLU107}"] = { connector_name = "AUF2_2" } }, Picture = "blu107.png", - Weight = 513, - _file = "./CoreMods/aircraft/Mirage-F1/Weapons.lua", - _origin = "Mirage F1 Assets by Aerges", + Weight = 518, + Weight_Empty = 80, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "AUF 2 - 2 x BLU-107/B Durandal - 219kg Concrete Piercing Chute Retarded Bomb w/Booster", name = "{AUF2_BLU107}", - wsTypeOfWeapon = "weapons.bombs.Durandal" + shape_table_data = {}, + wsTypeOfWeapon = { 4, 5, 37, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{AUF2_BR250}.lua b/_G/launcher/{AUF2_BR250}.lua index 42f42d1e..978afff4 100644 --- a/_G/launcher/{AUF2_BR250}.lua +++ b/_G/launcher/{AUF2_BR250}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{AUF2_BR250}"] = { CLSID = "{AUF2_BR250}", Count = 2, - Cx_pil = 0.001, + Cx_pil = 0.00196, Elements = { { IsAdapter = true, ShapeName = "AUF2_RACK" @@ -13,12 +13,14 @@ _G["launcher"]["{AUF2_BR250}"] = { connector_name = "AUF2_2" } }, Picture = "br250.png", - Weight = 575, - _file = "./CoreMods/aircraft/Mirage-F1/Weapons.lua", - _origin = "Mirage F1 Assets by Aerges", + Weight = 580, + Weight_Empty = 80, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "AUF 2 - 2 x BR-250 - 250kg GP Bomb LD", name = "{AUF2_BR250}", - wsTypeOfWeapon = "weapons.bombs.BR_250" + shape_table_data = {}, + wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{AUF2_GBU12}.lua b/_G/launcher/{AUF2_GBU12}.lua index 55006eaa..671ad440 100644 --- a/_G/launcher/{AUF2_GBU12}.lua +++ b/_G/launcher/{AUF2_GBU12}.lua @@ -1,11 +1,8 @@ _G["launcher"]["{AUF2_GBU12}"] = { CLSID = "{AUF2_GBU12}", Count = 2, - Cx_pil = 0.001, - Elements = { { - IsAdapter = true, - ShapeName = "AUF2_RACK" - }, { + Cx_pil = 0.00123, + Elements = { "_G/Pylons/AUF2_RACK.lua", { ShapeName = "GBU-12", connector_name = "AUF2_1" }, { @@ -13,9 +10,10 @@ _G["launcher"]["{AUF2_GBU12}"] = { connector_name = "AUF2_2" } }, Picture = "GBU12.png", - Weight = 629, - _file = "./CoreMods/aircraft/Mirage-F1/Weapons.lua", - _origin = "Mirage F1 Assets by Aerges", + Weight = 634, + Weight_Empty = 80, + _file = "./CoreMods/aircraft/AircraftWeaponPack/paveway.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "AUF 2 - 2 x GBU-12 - 500lb Laser Guided Bomb", @@ -309,5 +307,6 @@ _G["launcher"]["{AUF2_GBU12}"] = { xCtrl = 200, xLbl = 10 } }, - wsTypeOfWeapon = { 4, 5, 36, "Redacted" } + shape_table_data = {}, + wsTypeOfWeapon = "weapons.bombs.GBU_12" } \ No newline at end of file diff --git a/_G/launcher/{AUF2_MK82}.lua b/_G/launcher/{AUF2_MK82}.lua index fa5188c5..0b1a95df 100644 --- a/_G/launcher/{AUF2_MK82}.lua +++ b/_G/launcher/{AUF2_MK82}.lua @@ -1,21 +1,22 @@ _G["launcher"]["{AUF2_MK82}"] = { CLSID = "{AUF2_MK82}", Count = 2, - Cx_pil = 0.001, + Cx_pil = 0.00196, Elements = { { IsAdapter = true, ShapeName = "AUF2_RACK" }, { - ShapeName = "MK-82", + ShapeName = "Mk-82", connector_name = "AUF2_1" }, { - ShapeName = "MK-82", + ShapeName = "Mk-82", connector_name = "AUF2_2" } }, Picture = "mk82.png", - Weight = 531, - _file = "./CoreMods/aircraft/Mirage-F1/Weapons.lua", - _origin = "Mirage F1 Assets by Aerges", + Weight = 536, + Weight_Empty = 80, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "AUF 2 - 2 x Mk-82 - 500lb GP Bomb LD", @@ -479,5 +480,6 @@ _G["launcher"]["{AUF2_MK82}"] = { xCtrl = 200, xLbl = 10 } }, - wsTypeOfWeapon = { 4, 5, 9, "Redacted" } + shape_table_data = {}, + wsTypeOfWeapon = "weapons.bombs.Mk_82" } \ No newline at end of file diff --git a/_G/launcher/{AUF2_SAMP125LD}.lua b/_G/launcher/{AUF2_SAMP125LD}.lua index 269b3014..bb5948bf 100644 --- a/_G/launcher/{AUF2_SAMP125LD}.lua +++ b/_G/launcher/{AUF2_SAMP125LD}.lua @@ -1,8 +1,11 @@ _G["launcher"]["{AUF2_SAMP125LD}"] = { CLSID = "{AUF2_SAMP125LD}", Count = 2, - Cx_pil = 0.001, - Elements = { "_G/Pylons/AUF2_RACK.lua", { + Cx_pil = 0.00148, + Elements = { { + IsAdapter = true, + ShapeName = "AUF2_RACK" + }, { ShapeName = "SAMP_125", connector_name = "AUF2_1" }, { @@ -10,12 +13,14 @@ _G["launcher"]["{AUF2_SAMP125LD}"] = { connector_name = "AUF2_2" } }, Picture = "mk82.png", - Weight = 315, - _file = "./CoreMods/aircraft/Mirage-F1/Weapons.lua", - _origin = "Mirage F1 Assets by Aerges", + Weight = 320, + Weight_Empty = 80, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "AUF 2 - 2 x SAMP-125 - 125 kg GP Bomb LD", name = "{AUF2_SAMP125LD}", - wsTypeOfWeapon = "weapons.bombs.SAMP125LD" + shape_table_data = {}, + wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{AUF2_SAMP250HD}.lua b/_G/launcher/{AUF2_SAMP250HD}.lua index 9c5120db..37178777 100644 --- a/_G/launcher/{AUF2_SAMP250HD}.lua +++ b/_G/launcher/{AUF2_SAMP250HD}.lua @@ -1,24 +1,26 @@ _G["launcher"]["{AUF2_SAMP250HD}"] = { CLSID = "{AUF2_SAMP250HD}", Count = 2, - Cx_pil = 0.001, + Cx_pil = 0.00228, Elements = { { IsAdapter = true, ShapeName = "AUF2_RACK" }, { - ShapeName = "SAMP_250R", + ShapeName = "SAMP_250FB", connector_name = "AUF2_1" }, { - ShapeName = "SAMP_250R", + ShapeName = "SAMP_250FB", connector_name = "AUF2_2" } }, - Picture = "mk82AIR.png", - Weight = 613, - _file = "./CoreMods/aircraft/Mirage-F1/Weapons.lua", - _origin = "Mirage F1 Assets by Aerges", + Picture = "mk82.png", + Weight = 570, + Weight_Empty = 80, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 5, 32, "Redacted" }, category = 1, - displayName = "AUF 2 - 2 x SAMP-250 - 250 kg GP Chute Retarded Bomb HD", + displayName = "AUF 2 - 2 x SAMP-250 - 250 kg GP Bomb LD", name = "{AUF2_SAMP250HD}", - wsTypeOfWeapon = "weapons.bombs.SAMP250HD" + shape_table_data = {}, + wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{AUF2_SAMP250LD}.lua b/_G/launcher/{AUF2_SAMP250LD}.lua index b129b897..1577c2dd 100644 --- a/_G/launcher/{AUF2_SAMP250LD}.lua +++ b/_G/launcher/{AUF2_SAMP250LD}.lua @@ -1,24 +1,26 @@ _G["launcher"]["{AUF2_SAMP250LD}"] = { CLSID = "{AUF2_SAMP250LD}", Count = 2, - Cx_pil = 0.001, + Cx_pil = 0.00228, Elements = { { IsAdapter = true, ShapeName = "AUF2_RACK" }, { - ShapeName = "SAMP_250FB", + ShapeName = "SAMP_250R", connector_name = "AUF2_1" }, { - ShapeName = "SAMP_250FB", + ShapeName = "SAMP_250R", connector_name = "AUF2_2" } }, - Picture = "mk82.png", - Weight = 565, - _file = "./CoreMods/aircraft/Mirage-F1/Weapons.lua", - _origin = "Mirage F1 Assets by Aerges", + Picture = "mk82AIR.png", + Weight = 618, + Weight_Empty = 80, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 5, 32, "Redacted" }, category = 1, - displayName = "AUF 2 - 2 x SAMP-250 - 250 kg GP Bomb LD", + displayName = "AUF 2 - 2 x SAMP-250 - 250 kg GP Chute Retarded Bomb HD", name = "{AUF2_SAMP250LD}", - wsTypeOfWeapon = "weapons.bombs.SAMP250LD" + shape_table_data = {}, + wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{BLG66_AC}.lua b/_G/launcher/{BLG66_AC}.lua index 3b92f4da..4b2fb8fb 100644 --- a/_G/launcher/{BLG66_AC}.lua +++ b/_G/launcher/{BLG66_AC}.lua @@ -1,15 +1,16 @@ _G["launcher"]["{BLG66_AC}"] = { CLSID = "{BLG66_AC}", Count = 1, + Cx_pil = 0.000413, Elements = { { - ShapeName = "M2000C_BLG66" + ShapeName = "BLG-66" } }, Picture = "Mk20.png", - Weight = 305, + Weight = 300, _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", _origin = "AircraftWeaponPack", attribute = <1>{ 4, 5, 38, "Redacted" }, category = 1, - displayName = "BLG-66 Belouga AC - 305kg CBU, 151 x HEAT Bomblets", + displayName = "BLG-66 Belouga AC - CBU, 151 x HEAT Bomblets", wsTypeOfWeapon =
} \ No newline at end of file diff --git a/_G/launcher/{BLG66_BELOUGA}.lua b/_G/launcher/{BLG66_BELOUGA}.lua deleted file mode 100644 index 168b11f2..00000000 --- a/_G/launcher/{BLG66_BELOUGA}.lua +++ /dev/null @@ -1,17 +0,0 @@ -_G["launcher"]["{BLG66_BELOUGA}"] = { - CLSID = "{BLG66_BELOUGA}", - Count = 1, - Elements = { { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, 0, 0 }, - ShapeName = "BELOUGA" - } }, - Picture = "Mk20.png", - Weight = 290, - _file = "./CoreMods/aircraft/C-101/Weapons.lua", - _origin = "C-101 Aviojet by AvioDev", - attribute = <1>{ 4, 5, 38, "Redacted" }, - category = 1, - displayName = "Belouga", - wsTypeOfWeapon =
-} \ No newline at end of file diff --git a/_G/launcher/{BLG66_EG}.lua b/_G/launcher/{BLG66_EG}.lua new file mode 100644 index 00000000..48111339 --- /dev/null +++ b/_G/launcher/{BLG66_EG}.lua @@ -0,0 +1,16 @@ +_G["launcher"]["{BLG66_EG}"] = { + CLSID = "{BLG66_EG}", + Count = 1, + Cx_pil = 0.000413, + Elements = { { + ShapeName = "BLG-66" + } }, + Picture = "Mk20.png", + Weight = 300, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", + _origin = "AircraftWeaponPack", + attribute = <1>{ 4, 5, 38, "Redacted" }, + category = 1, + displayName = "BLG-66 Belouga EG - CBU, 151 x HE/Frag Bomblets", + wsTypeOfWeapon =
+} \ No newline at end of file diff --git a/_G/rockets/ADM_141A.lua b/_G/rockets/ADM_141A.lua index 599945fa..f2b1d742 100644 --- a/_G/rockets/ADM_141A.lua +++ b/_G/rockets/ADM_141A.lua @@ -28,7 +28,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Planes" }, + add_attributes = { "Cruise missiles", "Planes", "Air" }, autopilot = { Kdv = 0.92, Kiv = 1e-05, diff --git a/_G/rockets/ADM_141B.lua b/_G/rockets/ADM_141B.lua index e09d4949..2764ac15 100644 --- a/_G/rockets/ADM_141B.lua +++ b/_G/rockets/ADM_141B.lua @@ -28,7 +28,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Planes" }, + add_attributes = { "Cruise missiles", "Planes", "Air" }, autopilot = { Kdv = 0.12, Kiv = 1e-05, diff --git a/_G/rockets/AGM_119.lua b/_G/rockets/AGM_119.lua index 174e6eb0..bbbf87a4 100644 --- a/_G/rockets/AGM_119.lua +++ b/_G/rockets/AGM_119.lua @@ -27,7 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = -0.159, Z_back = 0, _unique_resource_name = "weapons.missiles.AGM_119", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, display_name = "AGM-119B Penguin", display_name_short = "AGM-119", exhaust = { 1, 1, 1, 1 }, diff --git a/_G/rockets/AGM_154.lua b/_G/rockets/AGM_154.lua index 9051e58d..5b03451b 100644 --- a/_G/rockets/AGM_154.lua +++ b/_G/rockets/AGM_154.lua @@ -31,7 +31,7 @@ _G["rockets"]["#Index"] = { X_back = -2.552, Y_back = -0.252, Z_back = 0, - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, display_name = "AGM-154C", display_name_short = "AGM-154", encyclopediaAnimation = { diff --git a/_G/rockets/AGM_84A.lua b/_G/rockets/AGM_84A.lua index 337643e6..8336cfe6 100644 --- a/_G/rockets/AGM_84A.lua +++ b/_G/rockets/AGM_84A.lua @@ -29,7 +29,7 @@ _G["rockets"]["#Index"] = { X_back = -1.581, Y_back = -0.173, Z_back = 0, - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, display_name = "AGM-84A Harpoon", display_name_short = "AGM-84", name = "AGM_84A", diff --git a/_G/rockets/AGM_84D.lua b/_G/rockets/AGM_84D.lua index 87fc9068..5ce4bf60 100644 --- a/_G/rockets/AGM_84D.lua +++ b/_G/rockets/AGM_84D.lua @@ -30,7 +30,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.6, Kd = 0, diff --git a/_G/rockets/AGM_84E.lua b/_G/rockets/AGM_84E.lua index 46853345..d62b01f9 100644 --- a/_G/rockets/AGM_84E.lua +++ b/_G/rockets/AGM_84E.lua @@ -33,7 +33,7 @@ _G["rockets"]["#Index"] = { X_back = -1.581, Y_back = -0.173, Z_back = 0, - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, display_name = "AGM-84E", display_name_short = "AGM-84", name = "AGM_84E", diff --git a/_G/rockets/AGM_84H.lua b/_G/rockets/AGM_84H.lua index e8037f0c..3fab1c0e 100644 --- a/_G/rockets/AGM_84H.lua +++ b/_G/rockets/AGM_84H.lua @@ -28,7 +28,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, diff --git a/_G/rockets/AGM_84S.lua b/_G/rockets/AGM_84S.lua index d0760ba0..96f687b9 100644 --- a/_G/rockets/AGM_84S.lua +++ b/_G/rockets/AGM_84S.lua @@ -26,7 +26,7 @@ _G["rockets"]["#Index"] = { X_back = -2.8, Y_back = 0, Z_back = 0, - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, display_name = "RGM-84D Harpoon", display_name_short = "RGM-84", encyclopediaAnimation = { diff --git a/_G/rockets/AGM_86.lua b/_G/rockets/AGM_86.lua index af3e1f21..f77b3674 100644 --- a/_G/rockets/AGM_86.lua +++ b/_G/rockets/AGM_86.lua @@ -30,7 +30,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, diff --git a/_G/rockets/AGM_86C.lua b/_G/rockets/AGM_86C.lua index 247239c3..d23a32d1 100644 --- a/_G/rockets/AGM_86C.lua +++ b/_G/rockets/AGM_86C.lua @@ -30,7 +30,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, diff --git a/_G/rockets/AIM-9E.lua b/_G/rockets/AIM-9E.lua index ac016baf..6b2c71f7 100644 --- a/_G/rockets/AIM-9E.lua +++ b/_G/rockets/AIM-9E.lua @@ -37,7 +37,7 @@ _G["rockets"]["#Index"] = { ccm_k0 = 2, display_name = "AIM-9E", display_name_short = "AIM-9", - exhaust = { 1, 1, 1, 1 }, + exhaust = { 0.7, 0.7, 0.7, 1 }, name = "AIM-9E", nozzle_exit_area = 0.005, shape_table_data = { { diff --git a/_G/rockets/AIM-9J.lua b/_G/rockets/AIM-9J.lua index 52f4f127..4eee7c22 100644 --- a/_G/rockets/AIM-9J.lua +++ b/_G/rockets/AIM-9J.lua @@ -37,7 +37,7 @@ _G["rockets"]["#Index"] = { ccm_k0 = 2, display_name = "AIM-9J", display_name_short = "AIM-9", - exhaust = { 1, 1, 1, 1 }, + exhaust = { 0.7, 0.7, 0.7, 1 }, name = "AIM-9J", nozzle_exit_area = 0.005, shape_table_data = { { diff --git a/_G/rockets/AIM-9JULI.lua b/_G/rockets/AIM-9JULI.lua index e7df971c..6b027c63 100644 --- a/_G/rockets/AIM-9JULI.lua +++ b/_G/rockets/AIM-9JULI.lua @@ -37,7 +37,7 @@ _G["rockets"]["#Index"] = { ccm_k0 = 0.75, display_name = "AIM-9JULI", display_name_short = "AIM-9", - exhaust = { 0.7, 0.7, 0.7, 0.1 }, + exhaust = { 0.7, 0.7, 0.7, 0.3 }, name = "AIM-9JULI", nozzle_exit_area = 0.0068, shape_table_data = { { diff --git a/_G/rockets/AIM-9P.lua b/_G/rockets/AIM-9P.lua index b03b79ad..2579b01d 100644 --- a/_G/rockets/AIM-9P.lua +++ b/_G/rockets/AIM-9P.lua @@ -37,7 +37,7 @@ _G["rockets"]["#Index"] = { ccm_k0 = 2, display_name = "AIM-9P", display_name_short = "AIM-9", - exhaust = { 1, 1, 1, 1 }, + exhaust = { 0.7, 0.7, 0.7, 1 }, name = "AIM-9P", nozzle_exit_area = 0.005, shape_table_data = { { diff --git a/_G/rockets/AIM-9P3.lua b/_G/rockets/AIM-9P3.lua index 1f32b75f..34108538 100644 --- a/_G/rockets/AIM-9P3.lua +++ b/_G/rockets/AIM-9P3.lua @@ -37,7 +37,7 @@ _G["rockets"]["#Index"] = { ccm_k0 = 2, display_name = "AIM-9P3", display_name_short = "AIM-9", - exhaust = { 0.7, 0.7, 0.7, 0.1 }, + exhaust = { 0.7, 0.7, 0.7, 0.3 }, name = "AIM-9P3", nozzle_exit_area = 0.005, shape_table_data = { { diff --git a/_G/rockets/AIM-9P5.lua b/_G/rockets/AIM-9P5.lua index 4d29b4bd..c48ec058 100644 --- a/_G/rockets/AIM-9P5.lua +++ b/_G/rockets/AIM-9P5.lua @@ -37,7 +37,7 @@ _G["rockets"]["#Index"] = { ccm_k0 = 0.75, display_name = "AIM-9P5", display_name_short = "AIM-9", - exhaust = { 0.7, 0.7, 0.7, 0.1 }, + exhaust = { 0.7, 0.7, 0.7, 0.3 }, name = "AIM-9P5", nozzle_exit_area = 0.0068, shape_table_data = { { diff --git a/_G/rockets/AIM_9.lua b/_G/rockets/AIM_9.lua index d130e302..6e0a9bf2 100644 --- a/_G/rockets/AIM_9.lua +++ b/_G/rockets/AIM_9.lua @@ -37,7 +37,7 @@ _G["rockets"]["#Index"] = { ccm_k0 = 0.5, display_name = "AIM-9M", display_name_short = "AIM-9", - exhaust = { 0.7, 0.7, 0.7, 0.08 }, + exhaust = { 0.7, 0.7, 0.7, 0.3 }, name = "AIM_9", nozzle_exit_area = 0.0068, shape_table_data = { { diff --git a/_G/rockets/BGM_109B.lua b/_G/rockets/BGM_109B.lua index c53a42e3..06fdc94e 100644 --- a/_G/rockets/BGM_109B.lua +++ b/_G/rockets/BGM_109B.lua @@ -26,7 +26,7 @@ _G["rockets"]["#Index"] = { X_back = -3.463, Y_back = 0, Z_back = 0, - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, display_name = "BGM-109C Tomahawk", display_name_short = "BGM-109", encyclopediaAnimation = { diff --git a/_G/rockets/C-701IR.lua b/_G/rockets/C-701IR.lua deleted file mode 100644 index c427b2d6..00000000 --- a/_G/rockets/C-701IR.lua +++ /dev/null @@ -1,156 +0,0 @@ -_G["rockets"]["#Index"] = { - Cx_pil = 1.7, - D_max = 30000, - D_min = 500, - Damage = 75, - Diam = 180, - Engine_Type = 1, - Engine_Type_ = 1, - 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, 8400, 11000, 12000, 13000, 13000, 2000, 14000, 15500, 17000, 18000, 18000, 5000, 22000, 23000, 23500, 24500, 26800, 10000, 25600, 26800, 28000, 28700, 29800 }, - Life_Time = 110, - M = 100, - Mach_max = 0.95, - MinLaunchDistData = { 4, 5, 100, 165, 230, 300, 400, 50, 1000, 1200, 1400, 1600, 3000, 2000, 2000, 2300, 2500, 2700, 3000, 5000, 3000, 3000, 3000, 3000, 4000, 10000, 6000, 6000, 6000, 6000, 6000 }, - Name = "Redacted", - Nr_max = 16, - OmViz_max = 99.9, - Range_max = 30000, - Reflection = 0.05, - X_back = -1.22, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_c701.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - 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 = 0 - }, - boost = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 12, - impulse = 125, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.22, 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", - controller = { - boost_start = 0.01, - march_start = 0.1 - }, - display_name = "C-701IR", - display_name_short = "C-701IR", - exhaust = { 1, 1, 1, 1 }, - fm = { - A = 0.36, - I = 52.375408333333, - I_x = 45, - L = 2.507, - Ma = 0.68, - Ma_x = 0.005, - Mw = 1.116, - Mw_x = 0.1, - Sw = 0.55, - caliber = 0.18, - cx_coeff = { 1, 0.3, 0.38, 0.236, 1.31 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, - mass = 100, - maxAoa = 0.3, - 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.22, 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-701IR", - scheme = "tv_homing_gyrost_missile", - seeker = { - FOV = 1.0471975511966, - aim_sigma = 0.5, - delay = 0, - max_w_LOS = 0.5, - max_w_LOS_surf = 0.016, - op_time = 40, - send_off_data = 0 - }, - shape_table_data = { { - file = "c701t", - fire = { 0, 1 }, - index = "Redacted", - life = 0.4, - name = "C-701IR", - username = "C-701IR" - } }, - sigma = { 5, 5, 5 }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 - }, - t_acc = 0, - t_b = 0, - t_marsh = 6, - user_name = "C-701IR", - v_mid = 150, - v_min = 50, - warhead = { - 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 = 0 - }, - warhead_air = { - 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 = 0 - }, - wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, - ws_type =
-} \ No newline at end of file diff --git a/_G/rockets/CM-802AKG.lua b/_G/rockets/CM-802AKG.lua index 912386a4..716f4061 100644 --- a/_G/rockets/CM-802AKG.lua +++ b/_G/rockets/CM-802AKG.lua @@ -18,7 +18,7 @@ _G["rockets"]["#Index"] = { KillDistance = 0, LaunchDistData = { 12, 7, 100, 125, 150, 175, 200, 250, 300, 500, 150000, 155000, 160000, 165000, 170000, 175000, 180000, 600, 152000, 157000, 162000, 167000, 172000, 177000, 182000, 700, 154000, 159000, 164000, 169000, 174000, 179000, 184000, 800, 156000, 161000, 166000, 171000, 176000, 181000, 186000, 900, 158000, 163000, 168000, 173000, 178000, 183000, 188000, 1000, 160000, 165000, 170000, 175000, 180000, 185000, 190000, 1200, 163000, 168000, 173000, 178000, 183000, 188000, 193000, 2200, 170000, 175000, 180000, 185000, 189000, 194000, 199000, 3200, 176000, 181000, 186000, 191000, 194000, 199000, 204000, 4200, 181000, 186000, 191000, 196000, 199000, 203000, 208000, 5200, 185000, 190000, 195000, 199000, 203000, 207000, 212000, 7500, 190000, 195000, 200000, 204000, 208000, 212000, 217000 }, Life_Time = 660, - M = 715, + M = 670, Mach_max = 1.3, 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 }, Name = "Redacted", @@ -36,7 +36,7 @@ _G["rockets"]["#Index"] = { add_attributes = { "Cruise missiles" }, category = 2, display_name = "CM802AKG (DIS)", - mass = 715, + mass = 670, model = "cm802akg", name = "CM-802AKG", shape_table_data = { { diff --git a/_G/rockets/CM-802AKG_AI.lua b/_G/rockets/CM-802AKG_AI.lua deleted file mode 100644 index 840f005d..00000000 --- a/_G/rockets/CM-802AKG_AI.lua +++ /dev/null @@ -1,222 +0,0 @@ -_G["rockets"]["#Index"] = { - Cx_pil = 1, - D_max = 220000, - D_min = 2000, - Damage = 500, - Diam = 343, - Engine_Type = 5, - Escort = 0, - Fi_excort = 3.14152, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.25, - H_max = 10000, - H_min = -1, - H_min_t = 0, - Head_Form = 0, - Head_Type = 5, - KillDistance = 0, - LaunchDistData = { 12, 7, 100, 125, 150, 175, 200, 250, 300, 500, 150000, 155000, 160000, 165000, 170000, 175000, 180000, 600, 152000, 157000, 162000, 167000, 172000, 177000, 182000, 700, 154000, 159000, 164000, 169000, 174000, 179000, 184000, 800, 156000, 161000, 166000, 171000, 176000, 181000, 186000, 900, 158000, 163000, 168000, 173000, 178000, 183000, 188000, 1000, 160000, 165000, 170000, 175000, 180000, 185000, 190000, 1200, 163000, 168000, 173000, 178000, 183000, 188000, 193000, 2200, 170000, 175000, 180000, 185000, 189000, 194000, 199000, 3200, 176000, 181000, 186000, 191000, 194000, 199000, 204000, 4200, 181000, 186000, 191000, 196000, 199000, 203000, 208000, 5200, 185000, 190000, 195000, 199000, 203000, 207000, 212000, 7500, 190000, 195000, 200000, 204000, 208000, 212000, 217000 }, - Life_Time = 660, - M = 715, - Mach_max = 1.3, - 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 }, - Name = "Redacted", - Nr_max = 15, - OmViz_max = 99.9, - Range_max = 220000, - Reflection = 0.09, - Stage_ = 1, - X_back = -2.566, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_cm802akg.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - 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 - }, - booster_animation = { - start_val = 0 - }, - category = 2, - class_name = "wAmmunitionAntiShip", - control_block = { - can_update_target_pos = 1, - default_cruise_height = 200, - obj_sensor = 0, - seeker_activation_dist = 20000, - 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 = 5 - }, - 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 = 50, - delay = 1, - eng_max_thrust = 3000, - eng_min_thrust = -100, - estimated_N_max = 6, - finsLimit = 0.8, - max_roll = 0.8, - max_start_y_vel = 35, - no_alg_vel_k = 10, - 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, - J_Diff_K = 0.4, - J_FinAngle_K = 0.32, - J_Int_K = 0, - J_Power_K = 1.5, - J_Trigger_Vert = 1, - K = 60, - 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 = 0 - }, - fm = { - A = 0.08, - I = 1577.23190625, - Kw_x = 0.01, - L = 5.145, - Ma = 0.6, - Ma_x = 3, - Ma_z = 3, - Mw = 1.116, - Sw = 0.75, - addDeplSw = 0.6, - caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, - maxAoa = 0.3, - no_wings_A_mlt = 7, - wind_sigma = 0, - wind_time = 1000, - wingsDeplDelay = 1, - wingsDeplProcTime = 5 - }, - march = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 180, - impulse = 660, - max_thrust = 5000, - min_fuel_rate = 0.005, - min_thrust = -100, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.566, 0, 0 } }, - smoke_color = { 0, 0, 0 }, - smoke_transparency = 0.2, - start_burn_effect = 0, - start_effect_delay = { 0, 0.3, 0.8 }, - start_effect_size = { 0.09, 0.104, 0.11 }, - start_effect_smoke = { 0.01, 0.4, 0.01 }, - start_effect_time = { 0.7, 1, 0.1 }, - start_effect_x_dist = { 1.1, 0.9, 0 }, - start_effect_x_pow = { 1, 1, 1 }, - start_effect_x_shift = { 0.15, 0.15, 0.2 }, - tail_width = 0.5, - thrust_Tau = 0.0017, - work_time = 9999 - }, - mass = 715, - model = "cm802akg", - name = "CM-802AKG_AI", - 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 = "cm802akg", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "CM-802AKG_AI", - username = "CM-802AKG_AI" - } }, - sigma = { 8, 8, 8 }, - t_acc = 0, - t_b = 5, - t_marsh = 1000, - user_name = "CM802AKG (DIS) for AI", - v_mid = 372, - v_min = 270, - warhead = { - caliber = 360, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 100, - mass = 165, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - warhead_air = { - caliber = 360, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 100, - mass = 165, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, - ws_type =
-} \ No newline at end of file diff --git a/_G/rockets/CM_802AKG.lua b/_G/rockets/CM_802AKG.lua index 1481e847..59cc2b42 100644 --- a/_G/rockets/CM_802AKG.lua +++ b/_G/rockets/CM_802AKG.lua @@ -31,7 +31,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1, Kd = 0, diff --git a/_G/rockets/C_802AK.lua b/_G/rockets/C_802AK.lua index a4170f28..5fa53a6b 100644 --- a/_G/rockets/C_802AK.lua +++ b/_G/rockets/C_802AK.lua @@ -30,7 +30,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.6, Kd = 0, diff --git a/_G/rockets/GAR-8.lua b/_G/rockets/GAR-8.lua index 5cdf5a2c..5a10f4f6 100644 --- a/_G/rockets/GAR-8.lua +++ b/_G/rockets/GAR-8.lua @@ -38,7 +38,7 @@ _G["rockets"]["#Index"] = { ccm_k0 = 5, display_name = "AIM-9B", display_name_short = "AIM-9", - exhaust = { 1, 1, 1, 1 }, + exhaust = { 0.7, 0.7, 0.7, 1 }, name = "GAR-8", nozzle_exit_area = 0.005, shape_table_data = { { diff --git a/_G/rockets/HOT3.lua b/_G/rockets/HOT3.lua deleted file mode 100644 index d665241e..00000000 --- a/_G/rockets/HOT3.lua +++ /dev/null @@ -1,65 +0,0 @@ -_G["rockets"]["#Index"] = { - Cx_pil = 2, - D_max = 4300, - D_min = 500, - Damage = 19.5, - Diam = 5, - Escort = 1, - Fi_excort = 1, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 3.14152, - H_max = 28000, - H_min = -1, - H_min_t = 0, - Head_Form = 1, - Head_Type = 7, - KillDistance = 0, - Life_Time = 16.8, - M = 23.5, - Mach_max = 1, - Name = "Redacted", - Nr_max = 16, - OmViz_max = 99.9, - Range_max = 4300, - Reflection = 0.015, - X_back = -0.63, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/SA342/SA342_Weapons.lua", - _origin = "SA342 AI by Polychop-Simulations", - _unique_resource_name = "weapons.missiles.HOT3", - category = 2, - display_name = "HOT3", - exhaust = { 0.9, 0.9, 0.85, 0.05 }, - name = "HOT3", - shape_table_data = { { - file = "HOT3", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "HOT3", - username = "HOT3" - } }, - sigma = { 0, 0, 0 }, - t_acc = 0.5, - t_b = 0, - t_marsh = 16.3, - user_name = "HOT3", - v_mid = 256, - v_min = 226, - warhead = { - caliber = 5, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0.5, - cumulative_factor = 3, - cumulative_thickness = 0.9, - expl_mass = 2.6, - mass = 6.5, - obj_factors = { 4, 4 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 1.3 - }, - wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, - ws_type =
-} \ No newline at end of file diff --git a/_G/rockets/KD-63B.lua b/_G/rockets/KD-63B.lua deleted file mode 100644 index 40913ea3..00000000 --- a/_G/rockets/KD-63B.lua +++ /dev/null @@ -1,248 +0,0 @@ -_G["rockets"]["#Index"] = { - Cx_pil = 6, - D_max = 200000, - D_min = 20000, - Damage = 1500, - Damage_correction_coeff = 1, - Diam = 760, - Escort = 0, - Fi_excort = 1.05, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.5, - H_max = 10000, - H_min = 500, - H_min_t = 0, - Head_Form = 0, - Head_Type = 5, - KillDistance = 0, - LaunchDistData = { 13, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 0, 0, 183100, 186950, 189075, 191400, 192850, 194625, 200, 0, 0, 183350, 187225, 188925, 191250, 193125, 194825, 300, 0, 0, 183600, 187025, 189300, 191525, 193325, 194950, 500, 0, 179575, 183675, 187650, 189950, 192000, 193675, 195275, 700, 0, 180200, 184550, 188150, 190350, 192200, 193850, 195450, 1000, 0, 181000, 185750, 188700, 190700, 192450, 194050, 195700, 2000, 180700, 185100, 188200, 190500, 192450, 194050, 195500, 197050, 3000, 183500, 187200, 190000, 192200, 194200, 195800, 197200, 198700, 4000, 185400, 188800, 191700, 193900, 195800, 197600, 198900, 200500, 5000, 186800, 190300, 193000, 195300, 197400, 199300, 200700, 202300, 6000, 187750, 191500, 194250, 196500, 198750, 200750, 202250, 204000, 8000, 190500, 194000, 196500, 199000, 201500, 203500, 205500, 207500, 10000, 193000, 195500, 199000, 201000, 203500, 206000, 208500, 211500 }, - Life_Time = 1850, - M = 2000, - Mach_max = 0.9, - MinLaunchDistData = { 13, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 0, 0, 23850, 22950, 23200, 22975, 16675, 17525, 200, 0, 0, 23350, 22375, 16000, 16600, 17075, 17500, 300, 0, 0, 22725, 15475, 16175, 16525, 17100, 17250, 500, 0, 23900, 15125, 15800, 16275, 16850, 17300, 17800, 700, 0, 22850, 15250, 15850, 16400, 16900, 17350, 17700, 1000, 0, 14650, 15450, 15950, 16500, 16950, 17350, 17850, 2000, 14250, 15250, 16050, 16700, 17250, 17650, 18100, 18650, 3000, 14500, 15600, 16300, 17100, 17900, 18500, 19000, 19500, 4000, 14100, 15500, 16500, 17300, 18300, 18900, 19500, 20000, 5000, 14000, 15100, 16300, 17300, 18400, 19100, 19700, 20400, 6000, 14250, 15000, 16250, 17250, 18500, 19250, 19750, 21000, 8000, 14500, 14500, 16000, 17500, 18500, 19000, 20000, 21500, 10000, 14500, 15000, 15000, 15000, 15500, 19500, 15500, 22500 }, - Name = "Redacted", - Nr_max = 18, - OmViz_max = 99.9, - Range_max = 200000, - Reflection = 0.121, - X_back = -3.79, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_kd63.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Cruise missiles" }, - autopilot = { - K = 1, - Kd = 0, - Kdx = 0.001, - Ki = 10, - Ks = 1, - Ksd = 0, - Ksi = 0, - Kw = 2.4, - Kx = 0.04, - PN_dist_data = { 2000, 0, 500, 0 }, - altim_vel_k = 4, - conv_input = 0, - default_glide_height = 600, - delay = 0.5, - dont_climb_on_cruise_height = 0, - fins_limit = 1.4, - fins_limit_x = 0.5, - glide_height = 600, - glide_height_eq_error = 0.03, - hor_err_limit = 0.5, - inertial_km_error = 10, - integr_val_limit = 0.5, - max_climb_ang_hdiff = 180, - max_climb_angle = 0.17453292519943, - max_dive_ang_hdiff = -500, - max_dive_angle = -0.5235987755983, - op_time = 9999, - pre_maneuver_glide_height = 600, - rotated_WLOS_input = 0, - 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.043633231299858, - w_limit_data = { 100, 0.034906585039887, 185, 0.10471975511966 } - }, - 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 = "wAmmunitionAntiShip", - control_block = { - default_cruise_height = 600 - }, - controller = { - boost_start = 0, - march_start = 0 - }, - display_name = "KD-63B", - display_name_short = "KD-63B", - engine_control = { - K = 240, - Kd = 1, - Ki = 0.01, - default_speed = 250, - speed_delta = 5 - }, - final_autopilot = { - K = 5, - K_loft_err = 1, - Kd = 0, - Ki = 0, - Kix = 0, - Ks = 20, - Kw = 1, - Kx = 0, - PN_dist_data = { 2000, 1, 500, 1 }, - add_err_val = 0, - add_err_vert = 0, - add_out_val = 0.1, - add_out_vert = 1, - conv_input = 0, - delay = 0, - fins_limit = 1.4, - loft_active_by_default = 0, - loft_angle = 0.10471975511966, - loft_angle_vert = 1, - loft_trig_angle = 0.17453292519943, - op_time = 9999, - rotated_WLOS_input = 0, - w_limit = 0.17453292519943 - }, - fm = { - A = 0.5, - I = 8166.6666666667, - L = 7, - Ma = 0.68, - Ma_x = 3, - Ma_z = 3, - Mw = 1.116, - Mw_x = 2.6, - Sw = 0.7, - addDeplSw = 0.6, - caliber = 0.76, - cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 2000, - maxAoa = 0.3, - no_wings_A_mlt = 7, - wind_sigma = 0, - wind_time = 1000, - wingsDeplDelay = 1, - wingsDeplProcTime = 5 - }, - ins = { - aim_sigma = 350, - check_AI = 1, - error_coeff = 0.03 - }, - march = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 500, - impulse = 3000, - max_thrust = 20000, - min_fuel_rate = 0.005, - min_thrust = -100, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -3.79, 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.0018, - work_time = 9999 - }, - mass = 2000, - model = "kd63b", - name = "KD-63B", - scheme = "AGM-84E", - seeker = { - FOV = 1.0471975511966, - activate_on_update = 1, - delay = 0, - max_lock_dist = 30000, - max_target_speed = 33, - max_target_speed_rnd_coeff = 10, - op_time = 800 - }, - shape_table_data = { { - file = "kd63b", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "KD-63B", - username = "KD-63B" - } }, - sigma = { 8, 8, 8 }, - t_acc = 0, - t_b = 5, - t_marsh = 1800, - triggers_control = { - action_wait_timer = 5, - default_destruct_tg_dist = 3000, - default_final_maneuver_tg_dist = 7000, - default_sensor_tg_dist = 11000, - default_straight_nav_tg_dist = 7000, - final_maneuver_trig_angle = 0.83775804095728, - final_maneuver_trig_v_lim = 3, - min_cruise_height = 600, - min_cruise_height_trigger_mlt = 7.1818181818182, - min_cruise_height_trigger_sum = 11000, - pre_maneuver_glide_height = 600, - trigger_by_path = 1, - use_horiz_dist = 1 - }, - user_name = "KD-63B", - v_mid = 272, - v_min = 170, - warhead = { - caliber = 760, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 300, - mass = 500, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - warhead_air = { - caliber = 760, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 300, - mass = 500, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, - ws_type =
-} \ No newline at end of file diff --git a/_G/rockets/KD_20.lua b/_G/rockets/KD_20.lua index 325c2c4f..20ed8165 100644 --- a/_G/rockets/KD_20.lua +++ b/_G/rockets/KD_20.lua @@ -30,7 +30,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, diff --git a/_G/rockets/KD_63.lua b/_G/rockets/KD_63.lua index e0e87d2a..448f8470 100644 --- a/_G/rockets/KD_63.lua +++ b/_G/rockets/KD_63.lua @@ -31,7 +31,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1, Kd = 0, diff --git a/_G/rockets/KD_63B.lua b/_G/rockets/KD_63B.lua index 588519ad..3cbf748b 100644 --- a/_G/rockets/KD_63B.lua +++ b/_G/rockets/KD_63B.lua @@ -31,7 +31,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1, Kd = 0, diff --git a/_G/rockets/Kh25MP_PRGS1VP.lua b/_G/rockets/Kh25MP_PRGS1VP.lua index aba29cd7..45229f10 100644 --- a/_G/rockets/Kh25MP_PRGS1VP.lua +++ b/_G/rockets/Kh25MP_PRGS1VP.lua @@ -15,10 +15,11 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 3, KillDistance = 0, - LaunchDistData = { 8, 2, 50, 300, 1000, 14000, 14000, 2000, 14000, 14000, 3000, 13000, 13000, 5000, 13000, 13000, 6000, 12000, 12000, 7000, 12000, 12000, 8000, 11000, 11000, 9000, 10000, 10000 }, + LaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 9220, 9220, 9220, 9220, 9220, 27180, 28080, 28890, 200, 15520, 15520, 15520, 15520, 15520, 27330, 28230, 29040, 300, 17040, 17040, 17040, 17040, 17040, 27470, 28370, 29180, 400, 18240, 18240, 18240, 18240, 18240, 27610, 28500, 29300, 500, 19180, 19180, 19180, 19180, 19180, 27740, 28630, 29450, 600, 19980, 19980, 19980, 19980, 19980, 27870, 28760, 29600, 700, 20640, 20640, 20640, 20640, 20640, 27990, 28910, 29750, 800, 21225, 21225, 21225, 21225, 21225, 28100, 29050, 29875, 900, 21725, 21725, 21725, 21725, 21725, 28250, 29175, 30025, 1000, 22950, 24175, 25300, 26325, 27325, 28375, 29300, 30150, 2000, 24350, 25425, 26450, 27450, 28525, 29600, 30575, 31425, 3000, 25250, 26300, 26550, 26550, 26700, 30700, 31450, 31500, 4000, 26050, 27150, 28200, 29250, 30600, 31500, 31550, 31600, 5000, 26700, 27900, 29000, 30100, 30800, 30900, 30900, 31700, 6000, 26750, 27500, 28500, 30250, 30500, 31500, 32250, 32750, 7000, 27750, 28500, 29500, 30750, 31750, 32500, 33500, 34250, 8000, 28500, 29500, 30750, 32000, 33000, 33750, 34750, 35500, 9000, 29750, 30750, 31500, 33000, 34000, 35000, 36000, 37000, 10000, 30500, 31500, 32500, 34000, 35250, 36250, 37250, 38250, 11000, 31000, 32500, 33500, 35000, 36000, 37000, 38000, 39500, 12000, 32000, 33500, 34500, 36000, 37500, 38500, 39500, 40500, 13000, 33000, 34000, 35500, 37500, 38500, 39500, 40500, 41500, 14000, 33500, 35000, 37000, 38500, 39500, 41000, 42000, 43000, 15000, 34500, 36000, 38000, 39500, 41000, 42000, 43000, 44500 }, Life_Time = 100000, - M = 310, + M = 316, Mach_max = 2.65, + MinLaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 3560, 3560, 3560, 3560, 3560, 5180, 5260, 5330, 200, 4130, 4130, 4130, 4130, 4130, 5190, 5270, 5350, 300, 4270, 4270, 4270, 4270, 4270, 5210, 5290, 5360, 400, 4380, 4380, 4380, 4380, 4380, 5220, 5300, 5370, 500, 4460, 4460, 4460, 4460, 4460, 5230, 5310, 5480, 600, 4530, 4530, 4530, 4530, 4530, 5240, 5340, 5680, 700, 4590, 4590, 4590, 4590, 4590, 5250, 5530, 5870, 800, 4650, 4650, 4650, 4650, 4650, 5275, 5700, 6050, 900, 4700, 4700, 4700, 4700, 4700, 5375, 5875, 6225, 1000, 4800, 4925, 5025, 5100, 5200, 5525, 6025, 6375, 2000, 4925, 5025, 5125, 5200, 6000, 6725, 7300, 7825, 3000, 5000, 5100, 5150, 5150, 6500, 7700, 8400, 8900, 4000, 5100, 5200, 5350, 5600, 7700, 8750, 9450, 9950, 5000, 5200, 5400, 5700, 6200, 8600, 9600, 8900, 11000, 6000, 5250, 5250, 5500, 7000, 9750, 10750, 11500, 12000, 7000, 5250, 5500, 5500, 9000, 10750, 11750, 12500, 13000, 8000, 5500, 5500, 5500, 10000, 11750, 12750, 13500, 14000, 9000, 5500, 5500, 5750, 11250, 12500, 13500, 14500, 15000, 10000, 5500, 5750, 6000, 12250, 13500, 14500, 15500, 16000, 11000, 5500, 6000, 10000, 13500, 14500, 15500, 16500, 17500, 12000, 6000, 6000, 11500, 14000, 15500, 17000, 17500, 18000, 13000, 6000, 6000, 12500, 15000, 16500, 18000, 19000, 19500, 14000, 6000, 7000, 14000, 16000, 18000, 19000, 20000, 21000, 15000, 6500, 8000, 15000, 17000, 19000, 20500, 21500, 22500 }, Name = "Redacted", Nr_max = 12, OmViz_max = 99.9, @@ -29,21 +30,41 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/kh25_29_family.lua", _origin = "AircraftWeaponPack", + actuator = { + D = 250, + T1 = 0.002, + T2 = 0.006, + Tf = 0.005, + fin_stall = 0, + max_delta = 0.26179938779915, + max_omega = 6.9813170079773, + sim_count = 4 + }, autopilot = { - J_Angle_K = 0.20943951023932, - J_Angle_W = 3.5, - J_Diff_K = 0.4, - J_FinAngle_K = 0.31415926535898, - J_Int_K = 0, - J_Power_K = 1.2, - K = 100, - Kg = 6, - Ki = 0, - delay = 1, - finsLimit = 0.22, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.20943951023932, + K_Eloc = -0.003, + K_Eloc_x = 0.0001, + K_Fi = 0.6, + K_LOS_omega = 6.2, + K_fins = 1, + K_fins_x = 0.4, + K_n1 = 0.018, + K_n2 = 0.001, + K_roll = 1, + Ki_LOS_omega = 2.4, + Ki_dG = -0.02, + delay_guidance = 1, + delay_roll = 0.4, + fins_limit = 0.26179938779915, + fins_limit_x = 0.33161255787892, + have_switching_delay = true, + min_loft_time = 1.4, + n_limit = 7, + n_req = 0.6, + null_roll = 0.78539816339745, + op_time = 200 }, - booster = { + boost = { boost_factor = 0, boost_time = 0, custom_smoke_dissipation_factor = 0.2, @@ -65,27 +86,51 @@ _G["rockets"]["#Index"] = { display_name = "Kh-25MP (AS-12 Kegler)", display_name_short = "Kh-25", fm = { - A = 0.36, - I = 353.65833333333, - I_x = 30, - Kw_x = 0.001, - L = 3.7, - Ma = 0.3, - Ma_x = 0.001, - Mw = 1.116, - Sw = 0.46, + 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.34, 0.34, 0.34, 0.34, 0.59, 0.65, 0.655, 0.651, 0.63, 0.592, 0.556, 0.556 }, + CxB = { 0.034, 0.034, 0.034, 0.034, 0.04, 0.188, 0.188, 0.142, 0.112, 0.091, 0.076, 0.076 }, + 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.8, + Iy = 207, + Iz = 207, + 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 = 4.255, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + S = 0.059, caliber = 0.275, - cx_coeff = { 1, 0.55, 1, 0.75, 1.2 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, - mass = 310, - maxAoa = 0.3, - wind_sigma = 20, - wind_time = 1000 + delta_max = 0.26179938779915, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, + mass = 316, + 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 }, fuze_proximity = { ignore_inp_armed = 0 }, + gimbal = { + delay = 0, + lock_time = 0, + max_tracking_rate = 0.1221730476396, + op_time = 200, + pitch_max = 0.5235987755983, + tracking_gain = 10, + yaw_max = 0.5235987755983 + }, manualWeaponFlag = 1, march = { boost_factor = 0, @@ -103,23 +148,26 @@ _G["rockets"]["#Index"] = { mass = 310, model = "X-25MP", name = "Kh25MP_PRGS1VP", - radio_seeker = { - FOV = 0.5235987755983, + scheme = "KH-25MP", + seeker = { + FOV = 2.0943951023932, + abs_err_val = 2, + aim_sigma = 4, aim_y_offset = 2, - blind_ctrl_dist = 2000, + ang_err_val = 0.00013962634015955, blind_rad_val = 0.2, calc_aim_dist = 500000, + delay = 1.5, err_correct_time = 2.5, - err_val = 0.0065, - keep_aim_time = 0.1, - min_sens_rad_val = 0.0005, - no_signal_turn_off_time = 0.1, + filter_ignore_strings = { "EWR", "ewr" }, + keep_aim_time = 4, + lock_manual_target_types_only = 0, + max_w_LOS = 0.34906585039887, op_time = 90, - pos_memory_time = 0.1, - sens_far_dist = 15000, - sens_near_dist = 300 + pos_memory_time = 40, + sens_far_dist = 70000, + sens_near_dist = 100 }, - scheme = "anti_radiation_missile", shape_table_data = { { file = "X-25MP", fire = { 0, 1 }, @@ -129,9 +177,6 @@ _G["rockets"]["#Index"] = { username = "Kh-25MP" } }, sigma = { 0, 0, 0 }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 - }, t_acc = 0, t_b = 0, t_marsh = 10000, @@ -140,6 +185,11 @@ _G["rockets"]["#Index"] = { v_min = 170, warhead = "_G/warheads/X_25MP.lua", warhead_air = "_G/warheads/X_25MP.lua", + wcs_emulator = { + K_loft = 2.5e-05, + delay = 0.005, + los_roll = 0 + }, wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, ws_type =
} \ No newline at end of file diff --git a/_G/rockets/Kormoran.lua b/_G/rockets/Kormoran.lua index 09f8034c..d996c027 100644 --- a/_G/rockets/Kormoran.lua +++ b/_G/rockets/Kormoran.lua @@ -27,7 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = -0.151, Z_back = 0, _unique_resource_name = "weapons.missiles.Kormoran", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, display_name = "AS.34 Kormoran", display_name_short = "AS.34", exhaust = { 1, 1, 1, 1 }, diff --git a/_G/rockets/Mistral.lua b/_G/rockets/Mistral.lua index aa76547e..dd68b2fa 100644 --- a/_G/rockets/Mistral.lua +++ b/_G/rockets/Mistral.lua @@ -28,8 +28,8 @@ _G["rockets"]["#Index"] = { X_back = 0, Y_back = 0, Z_back = 0, - _file = "./CoreMods/aircraft/SA342/SA342_Weapons.lua", - _origin = "SA342 AI by Polychop-Simulations", + _file = "./CoreMods/tech/TechWeaponPack/Database/Weapons/manpads_missiles.lua", + _origin = "TechWeaponPack", autopilot = { K = 5, Kg = 0.1, @@ -89,9 +89,11 @@ _G["rockets"]["#Index"] = { mass = 18.7, maxAoa = 0.27925268031909 }, - fuze_proximity = { - ignore_inp_armed = 1, - radius = 2 + fuze = { + default_arm_delays = { 0.8 }, + default_proximity_radius = 2, + default_self_destruct_delay = 14, + is_proxy_tdd_always_enabled = true }, march = { boost_factor = 0, @@ -135,7 +137,6 @@ _G["rockets"]["#Index"] = { sigma = { 10, 10, 10 }, simple_IR_seeker = { FOV = 0.069813170079773, - GimbLim = 0.66322511575785, ccm_k0 = 0.5, cooled = true, delay = 0, @@ -145,6 +146,7 @@ _G["rockets"]["#Index"] = { target_H_min = 0 }, simple_gyrostab_seeker = { + gimbal_lim = 0.66322511575785, omega_max = 0.34906585039887 }, t_acc = 0, @@ -153,19 +155,8 @@ _G["rockets"]["#Index"] = { user_name = "Mistral", v_mid = 450, v_min = 140, - warhead = <1>{ - caliber = 93, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, - expl_mass = 3, - mass = 3, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0.6 - }, - warhead_air =
, - wsTypeOfWeapon = <2>{ 4, 4, 34, "Redacted" }, - ws_type =
+ warhead = "_G/warheads/Mistral_MBDA.lua", + warhead_air = {}, + wsTypeOfWeapon = <1>{ 4, 4, 34, "Redacted" }, + ws_type =
} \ No newline at end of file diff --git a/_G/rockets/Rb 24.lua b/_G/rockets/Rb 24.lua index df89ee90..a10316ac 100644 --- a/_G/rockets/Rb 24.lua +++ b/_G/rockets/Rb 24.lua @@ -38,7 +38,7 @@ _G["rockets"]["#Index"] = { ccm_k0 = 5, display_name = "RB-24", display_name_short = "Rb24", - exhaust = { 1, 1, 1, 1 }, + exhaust = { 0.7, 0.7, 0.7, 1 }, name = "Rb 24", nozzle_exit_area = 0.005, shape_table_data = { { diff --git a/_G/rockets/Rb 24J.lua b/_G/rockets/Rb 24J.lua index 444223e6..fe818556 100644 --- a/_G/rockets/Rb 24J.lua +++ b/_G/rockets/Rb 24J.lua @@ -37,7 +37,7 @@ _G["rockets"]["#Index"] = { ccm_k0 = 2, display_name = "RB-24J", display_name_short = "Rb24", - exhaust = { 0.7, 0.7, 0.7, 0.1 }, + exhaust = { 0.7, 0.7, 0.7, 0.3 }, name = "Rb 24J", nozzle_exit_area = 0.005, shape_table_data = { { diff --git a/_G/rockets/Rb_04.lua b/_G/rockets/Rb_04.lua index ef3025a2..06c9a4ef 100644 --- a/_G/rockets/Rb_04.lua +++ b/_G/rockets/Rb_04.lua @@ -29,7 +29,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.6, Kd = 0, diff --git a/_G/rockets/SA2V755.lua b/_G/rockets/SA2V755.lua index bd982887..15d2b758 100644 --- a/_G/rockets/SA2V755.lua +++ b/_G/rockets/SA2V755.lua @@ -19,7 +19,7 @@ _G["rockets"]["#Index"] = { M = 2388, Mach_max = 3, Name = "Redacted", - Nr_max = 17, + Nr_max = 6, OmViz_max = 99.9, PN_coeffs = { 2, 1000, 1, 40000, 0.5 }, Range_max = 30000, diff --git a/_G/rockets/SA5B27.lua b/_G/rockets/SA5B27.lua index eaa287fe..f9a2641e 100644 --- a/_G/rockets/SA5B27.lua +++ b/_G/rockets/SA5B27.lua @@ -19,26 +19,27 @@ _G["rockets"]["#Index"] = { M = 690, Mach_max = 2.2, Name = "Redacted", - Nr_max = 16, + Nr_max = 6, OmViz_max = 99.9, Range_max = 25000, Reflection = 0.2, SeekerGen = 1, - X_back = -0.6, + X_back = -0.4, X_back_acc = -2.49, Y_back = 0, Z_back = 0, _unique_resource_name = "weapons.missiles.SA5B27", - ccm_k0 = 2, + ccm_k0 = 3, display_name = "5V27 S-125 Neva (SA-3 Goa)", display_name_short = "5V27", - exhaust = { 0.63, 0.67, 0.75, 0.2 }, + exhaust = { 0.63, 0.67, 0.75, 1 }, exhaust_effect_type = 1, name = "SA5B27", sigma = { 50, 50, 50 }, t_acc = 4, t_b = 0, t_marsh = 20, + tail_scale = 0.2, v_mid = 430, v_min = 170, warhead = "_G/warheads/SA5B27.lua", diff --git a/_G/rockets/SA5V28.lua b/_G/rockets/SA5V28.lua index e5ed4cd9..e6515b74 100644 --- a/_G/rockets/SA5V28.lua +++ b/_G/rockets/SA5V28.lua @@ -20,7 +20,7 @@ _G["rockets"]["#Index"] = { Mach_max = 5, ModelData = { 58, 3.49, 0.07, 0.12, 0.02, 0.04, 1.5, 1, 4.2, 2.4, 1.2, 0.26179938779915, 0, -1, -1, 3.75, 59, 0, 0, 1000000000, 0, 0, 712.1, 38.47, 0, 0, 0, 0, 0, 960000, 91322, 0, 0, 0, 1000000000, 250, 300, 4, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 11000, 4000, 5000, 0.2, 1, 1.4, -3, 0.5 }, Name = "Redacted", - Nr_max = 12, + Nr_max = 10, OmViz_max = 0.11344640137963, PN_coeffs = { 3, 5000, 1, 50000, 0.5, 300000, 2 }, Range_max = 240000, @@ -35,11 +35,11 @@ _G["rockets"]["#Index"] = { _origin = "TechWeaponPack", _unique_resource_name = "weapons.missiles.SA5V28", category = 2, - ccm_k0 = 1.5, + ccm_k0 = 2, display_name = "5V28 (SA-5 Gammon)", effect_max_length = 1300, - exhaust1 = { 1, 1, 1, 1 }, - exhaust2 = { 0.9, 0.9, 0.9, 0.05 }, + exhaust1 = { 0.9, 0.9, 0.9, 1 }, + exhaust2 = { 0.9, 0.9, 0.9, 0.2 }, hasDetachableAccelerator_ = 1, name = "SA5V28", shape_table_data = { { diff --git a/_G/rockets/Sea_Dart.lua b/_G/rockets/Sea_Dart.lua index 1de5b7a4..9009d50a 100644 --- a/_G/rockets/Sea_Dart.lua +++ b/_G/rockets/Sea_Dart.lua @@ -1,7 +1,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 2.5, D_max = 56000, - D_min = 1000, + D_min = 4100, Damage = 57.5, Diam = 420, Escort = 3, @@ -9,7 +9,7 @@ _G["rockets"]["#Index"] = { Fi_rak = 3.1415926535898, Fi_search = 2.0943951023932, Fi_start = 2.0943951023932, - H_max = 18300, + H_max = 25000, H_min = 30, H_min_t = 30, Head_Form = 1, @@ -17,7 +17,7 @@ _G["rockets"]["#Index"] = { KillDistance = 15, Life_Time = 600, M = 549, - Mach_max = 3, + Mach_max = 3.5, Name = "Redacted", Nr_max = 10, OmViz_max = 0, @@ -91,12 +91,12 @@ _G["rockets"]["#Index"] = { wind_time = 0 }, fuze = { - default_arm_delays = { 10 }, + default_arm_delays = { 7 }, default_function_delays = { 0.01 }, default_proximity_radius = 15, is_impact_fuze_nondelay = true, is_proxy_tdd_always_enabled = true, - tdd_vdiff_max = 1500 + tdd_vdiff_max = 2000 }, march = { AEC = 1.18, @@ -156,7 +156,7 @@ _G["rockets"]["#Index"] = { t_b = 0, t_marsh = 17.5, user_name = "GWS-30 Sea Dart", - v_mid = 300, + v_mid = 900, v_min = 0, warhead = "_G/warheads/GWS30.lua", warhead_air = {}, diff --git a/_G/rockets/Sea_Eagle.lua b/_G/rockets/Sea_Eagle.lua index 0614e18a..91850557 100644 --- a/_G/rockets/Sea_Eagle.lua +++ b/_G/rockets/Sea_Eagle.lua @@ -27,7 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = -0.199, Z_back = 0, _unique_resource_name = "weapons.missiles.Sea_Eagle", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, display_name = "Sea Eagle", display_name_short = "Sea E", name = "Sea_Eagle", diff --git a/_G/rockets/X_22.lua b/_G/rockets/X_22.lua index a044e081..6ebfa8c2 100644 --- a/_G/rockets/X_22.lua +++ b/_G/rockets/X_22.lua @@ -27,7 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = -0.2, Z_back = 0, _unique_resource_name = "weapons.missiles.X_22", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, display_name = "Kh-22 (AS-4 Kitchen)", display_name_short = "Kh-22", exhaust = { 0.9, 0.9, 0.9, 0.05 }, diff --git a/_G/rockets/X_25ML.lua b/_G/rockets/X_25ML.lua index 55dbb1cf..993bc102 100644 --- a/_G/rockets/X_25ML.lua +++ b/_G/rockets/X_25ML.lua @@ -1,7 +1,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 8.57, - D_max = 7000, - D_min = 2500, + D_max = 11500, + D_min = 2000, Damage = 115.5, Diam = 275, Escort = 1, @@ -15,13 +15,15 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 4, KillDistance = 0, + LaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 11450, 11450, 11450, 11450, 11450, 11450, 11500, 200, 11400, 11400, 11400, 11400, 11450, 11500, 11500, 300, 11400, 11400, 11400, 11400, 11400, 11450, 11450, 500, 11400, 11400, 11400, 11400, 11400, 11450, 11500, 700, 11300, 11300, 11300, 11300, 11300, 11300, 11400, 1000, 11300, 11300, 11300, 11300, 11300, 11400, 11500, 2000, 11200, 11200, 11200, 11200, 11200, 11300, 11400, 3000, 11100, 11000, 11100, 11000, 11100, 11200, 11200, 4000, 10800, 10800, 10800, 10800, 10900, 11000, 11000, 5000, 10400, 10400, 10500, 10400, 10600, 10600, 10700 }, Life_Time = 60, M = 316, Mach_max = 2.5, + MinLaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 2000, 2000, 2000, 2000, 2000, 2250, 2550, 200, 2000, 2000, 2000, 2000, 2200, 2500, 2850, 300, 2000, 2000, 2000, 2000, 2350, 2700, 3050, 500, 2000, 2000, 2000, 2000, 2350, 3050, 3450, 700, 2000, 2000, 2000, 2000, 2350, 2350, 2400, 1000, 2000, 2000, 2000, 2000, 2350, 2700, 4200, 2000, 2000, 2000, 2000, 2000, 2350, 3700, 4300, 3000, 2000, 2000, 2200, 1800, 2600, 4700, 5400, 4000, 2000, 2800, 2400, 3400, 4500, 5500, 6300, 5000, 2100, 2800, 3600, 2800, 5500, 6500, 7100 }, Name = "Redacted", Nr_max = 12, OmViz_max = 0.12, - Range_max = 8000, + Range_max = 11500, Reflection = 0.08, X_back = -1.092, Y_back = -0.14, @@ -40,28 +42,28 @@ _G["rockets"]["#Index"] = { }, autopilot = { Fi_fix_angle_req = -0.20943951023932, - K_Eloc = 0.001, + K_Eloc = -0.002, K_Eloc_x = 0.0001, - K_Fi = 0.4, - K_LOS_omega = 2.57, + K_Fi = 0.6, + K_LOS_omega = 5, K_fins = 1, K_fins_x = 0.4, K_n1 = 0.02, K_n2 = 0.001, K_roll = 1, - Ki_LOS_omega = 2.97, - Ki_dG = -0.07, - delay_guidance = 1, - delay_roll = 0.4, + Ki_LOS_omega = 2, + Ki_dG = -0.05, + delay_guidance = 0.12, + delay_roll = 0.02, fins_limit = 0.26179938779915, fins_limit_x = 0.33161255787892, have_switching_delay = true, - n_limit = 10, + n_limit = 7, n_req = 0.6, null_roll = 0.78539816339745, op_time = 90 }, - booster = { + boost = { boost_factor = 0, boost_time = 0, custom_smoke_dissipation_factor = 0.2, @@ -145,7 +147,7 @@ _G["rockets"]["#Index"] = { seeker = { FOV = 0.034906585039887, delay = 0, - max_seeker_range = 8000 + max_seeker_range = 12000 }, sigma = { 8, 8, 8 }, t_acc = 3, @@ -157,7 +159,7 @@ _G["rockets"]["#Index"] = { warhead = "_G/warheads/X_25ML.lua", warhead_air = "_G/warheads/X_25ML.lua", wcs_emulator = { - K_loft = 2.5e-05, + K_loft = 0.0025, delay = 0.005, los_roll = 0 }, diff --git a/_G/rockets/X_25MP.lua b/_G/rockets/X_25MP.lua index 000ff9a9..581dcaa4 100644 --- a/_G/rockets/X_25MP.lua +++ b/_G/rockets/X_25MP.lua @@ -1,7 +1,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 8.57, D_max = 27000, - D_min = 3000, + D_min = 3300, Damage = 86, Diam = 275, Escort = 0, @@ -15,10 +15,11 @@ _G["rockets"]["#Index"] = { Head_Form = 1, Head_Type = 3, KillDistance = 5, - LaunchDistData = { 19, 9, 50, 100, 150, 200, 250, 300, 350, 400, 450, 100, 14000, 15000, 17000, 19000, 20000, 22000, 24000, 26000, 29000, 300, 14000, 16000, 17000, 19000, 21000, 23000, 25000, 27000, 30000, 500, 15000, 17000, 18000, 20000, 22000, 24000, 26000, 28000, 30000, 800, 16000, 17000, 19000, 21000, 23000, 25000, 27000, 29000, 31000, 1000, 16000, 18000, 20000, 21000, 23000, 25000, 27000, 30000, 32000, 2000, 18000, 20000, 22000, 23000, 25000, 27000, 30000, 32000, 34000, 3000, 22000, 24000, 25000, 27000, 29000, 31000, 33000, 35000, 38000, 4000, 23000, 25000, 27000, 29000, 31000, 33000, 35000, 38000, 40000, 5000, 25000, 27000, 29000, 31000, 33000, 35000, 38000, 40000, 43000, 6000, 26000, 28000, 31000, 33000, 35000, 37000, 40000, 42000, 45000, 7000, 28000, 30000, 32000, 35000, 37000, 40000, 42000, 45000, 48000, 8000, 29000, 32000, 34000, 37000, 39000, 42000, 45000, 48000, 51000, 9000, 31000, 33000, 36000, 38000, 41000, 44000, 47000, 50000, 53000, 10000, 32000, 35000, 38000, 40000, 43000, 46000, 50000, 53000, 56000, 11000, 34000, 36000, 39000, 42000, 45000, 49000, 52000, 55000, 58000, 12000, 35000, 38000, 41000, 44000, 47000, 51000, 54000, 58000, 61000, 13000, 35000, 39000, 43000, 46000, 49000, 53000, 56000, 60000, 63000, 14000, 36000, 40000, 44000, 48000, 49000, 55000, 58000, 62000, 65000, 15000, 38000, 41000, 46000, 50000, 53000, 57000, 60000, 64000, 68000 }, + LaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 9220, 9220, 9220, 9220, 9220, 27180, 28080, 28890, 200, 15520, 15520, 15520, 15520, 15520, 27330, 28230, 29040, 300, 17040, 17040, 17040, 17040, 17040, 27470, 28370, 29180, 400, 18240, 18240, 18240, 18240, 18240, 27610, 28500, 29300, 500, 19180, 19180, 19180, 19180, 19180, 27740, 28630, 29450, 600, 19980, 19980, 19980, 19980, 19980, 27870, 28760, 29600, 700, 20640, 20640, 20640, 20640, 20640, 27990, 28910, 29750, 800, 21225, 21225, 21225, 21225, 21225, 28100, 29050, 29875, 900, 21725, 21725, 21725, 21725, 21725, 28250, 29175, 30025, 1000, 22950, 24175, 25300, 26325, 27325, 28375, 29300, 30150, 2000, 24350, 25425, 26450, 27450, 28525, 29600, 30575, 31425, 3000, 25250, 26300, 26550, 26550, 26700, 30700, 31450, 31500, 4000, 26050, 27150, 28200, 29250, 30600, 31500, 31550, 31600, 5000, 26700, 27900, 29000, 30100, 30800, 30900, 30900, 31700, 6000, 26750, 27500, 28500, 30250, 30500, 31500, 32250, 32750, 7000, 27750, 28500, 29500, 30750, 31750, 32500, 33500, 34250, 8000, 28500, 29500, 30750, 32000, 33000, 33750, 34750, 35500, 9000, 29750, 30750, 31500, 33000, 34000, 35000, 36000, 37000, 10000, 30500, 31500, 32500, 34000, 35250, 36250, 37250, 38250, 11000, 31000, 32500, 33500, 35000, 36000, 37000, 38000, 39500, 12000, 32000, 33500, 34500, 36000, 37500, 38500, 39500, 40500, 13000, 33000, 34000, 35500, 37500, 38500, 39500, 40500, 41500, 14000, 33500, 35000, 37000, 38500, 39500, 41000, 42000, 43000, 15000, 34500, 36000, 38000, 39500, 41000, 42000, 43000, 44500 }, Life_Time = 300, M = 310, Mach_max = 2.65, + MinLaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 3560, 3560, 3560, 3560, 3560, 5180, 5260, 5330, 200, 4130, 4130, 4130, 4130, 4130, 5190, 5270, 5350, 300, 4270, 4270, 4270, 4270, 4270, 5210, 5290, 5360, 400, 4380, 4380, 4380, 4380, 4380, 5220, 5300, 5370, 500, 4460, 4460, 4460, 4460, 4460, 5230, 5310, 5480, 600, 4530, 4530, 4530, 4530, 4530, 5240, 5340, 5680, 700, 4590, 4590, 4590, 4590, 4590, 5250, 5530, 5870, 800, 4650, 4650, 4650, 4650, 4650, 5275, 5700, 6050, 900, 4700, 4700, 4700, 4700, 4700, 5375, 5875, 6225, 1000, 4800, 4925, 5025, 5100, 5200, 5525, 6025, 6375, 2000, 4925, 5025, 5125, 5200, 6000, 6725, 7300, 7825, 3000, 5000, 5100, 5150, 5150, 6500, 7700, 8400, 8900, 4000, 5100, 5200, 5350, 5600, 7700, 8750, 9450, 9950, 5000, 5200, 5400, 5700, 6200, 8600, 9600, 8900, 11000, 6000, 5250, 5250, 5500, 7000, 9750, 10750, 11500, 12000, 7000, 5250, 5500, 5500, 9000, 10750, 11750, 12500, 13000, 8000, 5500, 5500, 5500, 10000, 11750, 12750, 13500, 14000, 9000, 5500, 5500, 5750, 11250, 12500, 13500, 14500, 15000, 10000, 5500, 5750, 6000, 12250, 13500, 14500, 15500, 16000, 11000, 5500, 6000, 10000, 13500, 14500, 15500, 16500, 17500, 12000, 6000, 6000, 11500, 14000, 15500, 17000, 17500, 18000, 13000, 6000, 6000, 12500, 15000, 16500, 18000, 19000, 19500, 14000, 6000, 7000, 14000, 16000, 18000, 19000, 20000, 21000, 15000, 6500, 8000, 15000, 17000, 19000, 20500, 21500, 22500 }, Name = "Redacted", Nr_max = 12, OmViz_max = 99.9, @@ -41,28 +42,29 @@ _G["rockets"]["#Index"] = { }, autopilot = { Fi_fix_angle_req = -0.20943951023932, - K_Eloc = 0.003, + K_Eloc = -0.003, K_Eloc_x = 0.0001, - K_Fi = 0.7, - K_LOS_omega = 0.18, + K_Fi = 0.6, + K_LOS_omega = 6.2, K_fins = 1, K_fins_x = 0.4, - K_n1 = 0.022, + K_n1 = 0.018, K_n2 = 0.001, K_roll = 1, - Ki_LOS_omega = 2.08, - Ki_dG = -0.05, + Ki_LOS_omega = 2.4, + Ki_dG = -0.02, delay_guidance = 1, delay_roll = 0.4, fins_limit = 0.26179938779915, fins_limit_x = 0.33161255787892, have_switching_delay = true, - n_limit = 10, + min_loft_time = 1.4, + n_limit = 7, n_req = 0.6, null_roll = 0.78539816339745, - op_time = 90 + op_time = 200 }, - booster = { + boost = { boost_factor = 0, boost_time = 0, custom_smoke_dissipation_factor = 0.2, @@ -124,10 +126,10 @@ _G["rockets"]["#Index"] = { gimbal = { delay = 0, lock_time = 0, - max_tracking_rate = 0.10471975511966, - op_time = 90, + max_tracking_rate = 0.1221730476396, + op_time = 200, pitch_max = 0.5235987755983, - tracking_gain = 50, + tracking_gain = 10, yaw_max = 0.5235987755983 }, march = { @@ -145,22 +147,26 @@ _G["rockets"]["#Index"] = { }, model = "X-25MP", name = "X_25MP", - radio_seeker = { - FOV = 0.087266462599716, + scheme = "KH-25MP", + seeker = { + FOV = 2.0943951023932, + abs_err_val = 2, + aim_sigma = 4, aim_y_offset = 2, - blind_ctrl_dist = 2000, + ang_err_val = 0.00013962634015955, blind_rad_val = 0.2, calc_aim_dist = 500000, + delay = 1.5, err_correct_time = 2.5, - err_val = 0.0044, filter_ignore_strings = { "EWR", "ewr" }, keep_aim_time = 4, + lock_manual_target_types_only = 0, + max_w_LOS = 0.34906585039887, op_time = 90, pos_memory_time = 40, - sens_far_dist = 40000, - sens_near_dist = 300 + sens_far_dist = 70000, + sens_near_dist = 100 }, - scheme = "KH-25MP", shape_table_data = { { file = "X-25MP", fire = { 0, 1 }, diff --git a/_G/rockets/X_25MR.lua b/_G/rockets/X_25MR.lua index 7287399f..3ce285a2 100644 --- a/_G/rockets/X_25MR.lua +++ b/_G/rockets/X_25MR.lua @@ -29,14 +29,17 @@ _G["rockets"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/kh25_29_family.lua", _origin = "AircraftWeaponPack", autopilot = { - Kd = 0.006, - Ki = 0.004, - Kp = 0.008, - delay = 0.9, - fins_discreet = 0.001, + Kd = 0.0022, + Ki = 0.0032, + Kp = 0.4, + delay_guidance = 1.4, + delay_roll = 0.4, + fins_limit = 0.34906585039887, + fins_limit_x = 0.34906585039887, max_ctrl_angle = 1, - no_ctrl_center_ang = 5e-05, - op_time = 0 + no_ctrl_center_ang = 1.5e-05, + null_roll = -0.78539816339745, + op_time = 40 }, booster = { boost_factor = 0, @@ -52,7 +55,7 @@ _G["rockets"]["#Index"] = { work_time = 2 }, category = 2, - class_name = "wAmmunitionVikhr", + class_name = "wAmmunitionAtgm", controller = { boost_start = 0, march_start = 2 @@ -61,21 +64,38 @@ _G["rockets"]["#Index"] = { display_name_short = "Kh-25", exhaust = { 0.63, 0.67, 0.75, 0.2 }, fm = { - A = 0.6, - I = 338.8275, - L = 3.7, - Ma = 0.4, - Mw = 1.2, - 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 = 148, + Iz = 148, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + S = 0.059, caliber = 0.275, - cx_coeff = { 1, 0.55, 1, 0.75, 1.2 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, - lockRoll = 1, - mass = 300, - maxAoa = 0.24, + delta_max = 0.26179938779915, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, + mass = 297, + 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 }, march = { boost_factor = 0, @@ -92,7 +112,7 @@ _G["rockets"]["#Index"] = { }, model = "X-25MP", name = "X_25MR", - scheme = "command_guided_missile", + scheme = "KH-25MR", sigma = { 5.6, 6, 5.6 }, spiral_nav = { def_cone_max_dist = 10000, diff --git a/_G/rockets/X_29L.lua b/_G/rockets/X_29L.lua index 08a6749b..915ade67 100644 --- a/_G/rockets/X_29L.lua +++ b/_G/rockets/X_29L.lua @@ -1,7 +1,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 16.37, - D_max = 8000, - D_min = 3000, + D_max = 11500, + D_min = 2500, Damage = 317, Diam = 380, Escort = 1, @@ -15,14 +15,15 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 4, KillDistance = 0, - LaunchDistData = { 13, 13, 50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 500, 200, 6500, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11000, 11500, 12000, 12000, 300, 6500, 7250, 7750, 8250, 9000, 9500, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 400, 6500, 7250, 7750, 8500, 9000, 9500, 10000, 10500, 10750, 11250, 11750, 12000, 12000, 500, 6750, 7250, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 1000, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 12000, 1500, 7500, 8000, 8500, 9000, 9750, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 2000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 2500, 7750, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 3000, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 3500, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 4000, 8500, 9000, 9500, 10000, 10750, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 12000, 4500, 8500, 9000, 9500, 10000, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000, 5000, 8500, 9000, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000 }, + LaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 11450, 11450, 11450, 11450, 11450, 11450, 11450, 200, 11400, 11400, 11400, 11400, 11450, 11450, 11450, 300, 11400, 11400, 11400, 11400, 11400, 11450, 11450, 500, 11400, 11400, 11400, 11400, 11450, 11450, 11450, 700, 11300, 11300, 11300, 11300, 11400, 11400, 11400, 1000, 11300, 11300, 11300, 11400, 11300, 11400, 11400, 2000, 11300, 11300, 11300, 11300, 11300, 11300, 11400, 3000, 11100, 11100, 11200, 11100, 11200, 11200, 11200, 4000, 10900, 10900, 10900, 10900, 10900, 10900, 11000, 5000, 10600, 10500, 10600, 10500, 10600, 10600, 10600 }, Life_Time = 60, M = 648, Mach_max = 1.8, + MinLaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 2500, 2500, 2500, 2500, 2500, 2500, 2500, 200, 2500, 2500, 2500, 2500, 2500, 2500, 2500, 300, 2500, 2500, 2500, 2500, 2500, 2500, 2750, 500, 2500, 2500, 2500, 2500, 2600, 2900, 3150, 700, 2500, 2500, 2500, 2500, 2600, 2800, 3500, 1000, 2500, 2500, 2500, 2500, 2100, 3200, 3700, 2000, 2700, 2800, 2700, 2900, 3300, 4000, 4600, 3000, 3400, 3500, 3900, 3500, 3900, 4800, 5500, 4000, 4700, 4700, 4500, 4100, 4600, 5300, 5800, 5000, 5400, 5000, 5700, 4800, 5300, 5900, 6400 }, Name = "Redacted", Nr_max = 10, OmViz_max = 0.12, - Range_max = 13000, + Range_max = 11500, Reflection = 0.175, X_back = -1.446, Y_back = -0.196, @@ -49,10 +50,12 @@ _G["rockets"]["#Index"] = { K_fins_x = 0.6, K_n1 = 0.032, K_n2 = 0.001, + K_p_loft = 1.6, + K_p_turn = 0.018, K_roll = 1, Ki_LOS_omega = 5.2, Ki_dG = -0.12, - delay_guidance = 0.8, + delay_guidance = 1.4, delay_roll = 0.4, fins_limit = 0.31415926535898, fins_limit_x = 0.43633231299858, @@ -61,7 +64,7 @@ _G["rockets"]["#Index"] = { null_roll = 0.78539816339745, op_time = 40 }, - booster = { + boost = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, impulse = 0, @@ -144,7 +147,7 @@ _G["rockets"]["#Index"] = { seeker = { FOV = 0.034906585039887, delay = 0, - max_seeker_range = 8000 + max_seeker_range = 12000 }, sigma = { 8, 8, 8 }, t_acc = 6, diff --git a/_G/rockets/X_29T.lua b/_G/rockets/X_29T.lua index 1e675106..4285281a 100644 --- a/_G/rockets/X_29T.lua +++ b/_G/rockets/X_29T.lua @@ -1,6 +1,6 @@ _G["rockets"]["#Index"] = { Cx_pil = 16.37, - D_max = 10000, + D_max = 12000, D_min = 3000, Damage = 317, Diam = 380, @@ -15,14 +15,15 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 13, 13, 50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 500, 200, 6500, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11000, 11500, 12000, 12000, 300, 6500, 7250, 7750, 8250, 9000, 9500, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 400, 6500, 7250, 7750, 8500, 9000, 9500, 10000, 10500, 10750, 11250, 11750, 12000, 12000, 500, 6750, 7250, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 1000, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 12000, 1500, 7500, 8000, 8500, 9000, 9750, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 2000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 2500, 7750, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 3000, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 3500, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 4000, 8500, 9000, 9500, 10000, 10750, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 12000, 4500, 8500, 9000, 9500, 10000, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000, 5000, 8500, 9000, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000 }, + LaunchDistData = { 7, 3, 100, 150, 200, 100, 10900, 12500, 12000, 200, 11800, 11800, 12000, 300, 11000, 11600, 12000, 500, 11000, 11800, 12000, 700, 11200, 12000, 12000, 1000, 11600, 12000, 12000, 2000, 12000, 12000, 12000 }, Life_Time = 120, M = 680, Mach_max = 1.4, + MinLaunchDistData = { 10, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 2600, 2700, 2700, 2700, 2700, 2700, 2700, 2700, 200, 2600, 2600, 2700, 2700, 2700, 2700, 2700, 2700, 300, 2600, 2600, 2800, 2800, 2800, 2800, 2800, 3000, 500, 2600, 2600, 2800, 2800, 2800, 2800, 3200, 3200, 700, 2600, 2600, 2800, 2800, 2800, 2800, 3000, 3600, 1000, 2600, 2800, 2800, 5600, 2800, 3000, 3200, 3800, 2000, 3000, 3000, 3000, 3500, 3000, 3500, 4500, 4500, 3000, 3500, 3500, 4500, 4500, 4000, 4500, 4500, 5500, 4000, 4500, 4500, 4500, 5000, 4500, 4500, 5500, 6000, 5000, 5000, 5000, 5000, 5500, 4500, 5500, 6000, 6500 }, Name = "Redacted", Nr_max = 10, OmViz_max = 99.9, - Range_max = 15000, + Range_max = 12000, Reflection = 0.1729, X_back = -1.446, Y_back = -0.202, @@ -41,18 +42,20 @@ _G["rockets"]["#Index"] = { }, autopilot = { Fi_fix_angle_req = -0.20943951023932, - K_Eloc = 0.004, + K_Eloc = 0.003, K_Eloc_x = 0.0001, K_Fi = 0.7, K_LOS_omega = 4.5, K_fins = 1, K_fins_x = 0.6, - K_n1 = 0.033, + K_n1 = 0.032, K_n2 = 0.001, + K_p_loft = 1.6, + K_p_turn = 0.018, K_roll = 1, Ki_LOS_omega = 5.2, Ki_dG = -0.12, - delay_guidance = 0.8, + delay_guidance = 1.4, delay_roll = 0.4, fins_limit = 0.31415926535898, fins_limit_x = 0.43633231299858, @@ -118,11 +121,10 @@ _G["rockets"]["#Index"] = { gimbal = { delay = 0, lock_time = 0, - max_tracking_rate = 0.17453292519943, - mount_roll_angle = -0.78539816339745, + max_tracking_rate = 0.1221730476396, op_time = 40, pitch_max = 0.5235987755983, - tracking_gain = 50, + tracking_gain = 10, yaw_max = 0.5235987755983 }, march = { diff --git a/_G/rockets/X_29TE.lua b/_G/rockets/X_29TE.lua index 2db87f78..fab2ad8d 100644 --- a/_G/rockets/X_29TE.lua +++ b/_G/rockets/X_29TE.lua @@ -28,19 +28,39 @@ _G["rockets"]["#Index"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/kh25_29_family.lua", _origin = "AircraftWeaponPack", + actuator = { + D = 250, + T1 = 0.002, + T2 = 0.006, + Tf = 0.005, + fin_stall = 0, + max_delta = 0.31415926535898, + max_omega = 6.9813170079773, + sim_count = 4 + }, 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.15, - finsLimit = 0.2, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.20943951023932, + K_Eloc = 0.003, + K_Eloc_x = 0.0001, + K_Fi = 0.7, + K_LOS_omega = 4.5, + K_fins = 1, + K_fins_x = 0.6, + K_n1 = 0.032, + K_n2 = 0.001, + K_p_loft = 1.6, + K_p_turn = 0.018, + K_roll = 1, + Ki_LOS_omega = 5.2, + Ki_dG = -0.12, + delay_guidance = 1.4, + delay_roll = 0.4, + fins_limit = 0.31415926535898, + fins_limit_x = 0.43633231299858, + n_limit = 10, + n_req = 0.6, + null_roll = 0.78539816339745, + op_time = 40 }, boost = { custom_smoke_dissipation_factor = 0.2, @@ -49,7 +69,7 @@ _G["rockets"]["#Index"] = { nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, - smoke_transparency = 0.1, + smoke_transparency = 0.9, tail_width = 0.4, work_time = 0 }, @@ -63,23 +83,47 @@ _G["rockets"]["#Index"] = { display_name_short = "Kh-29", exhaust = { 0.63, 0.71, 0.78, 0.5 }, fm = { - A = 0.36, - I = 848.3828125, - 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 = 16.5, + Iy = 430, + Iz = 430, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = 678, - 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 = 1000 + 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 = { custom_smoke_dissipation_factor = 0.2, @@ -89,13 +133,13 @@ _G["rockets"]["#Index"] = { nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, - smoke_transparency = 0.1, + smoke_transparency = 0.9, tail_width = 0.4, work_time = 4.7 }, model = "X-29T", name = "X_29TE", - scheme = "tv_homing_gyrost_missile", + scheme = "KH-29T", seeker = { FOV = 1.0471975511966, aim_sigma = 0.5, @@ -106,9 +150,6 @@ _G["rockets"]["#Index"] = { send_off_data = 0 }, sigma = { 8, 8, 8 }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 - }, t_acc = 16, t_b = 0.8, t_marsh = 150, @@ -117,6 +158,11 @@ _G["rockets"]["#Index"] = { v_min = 170, warhead = "_G/warheads/X_29TE.lua", warhead_air = "_G/warheads/X_29TE.lua", + wcs_emulator = { + K_loft = 2.5e-05, + delay = 0.005, + los_roll = -0.78539816339745 + }, wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, ws_type =
} \ No newline at end of file diff --git a/_G/rockets/X_31A.lua b/_G/rockets/X_31A.lua index 80f9c986..f140b739 100644 --- a/_G/rockets/X_31A.lua +++ b/_G/rockets/X_31A.lua @@ -28,7 +28,7 @@ _G["rockets"]["#Index"] = { X_back = -1.341, Y_back = -0.178, Z_back = 0, - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, display_name = "Kh-31A", display_name_short = "Kh-31", exhaust1 = { 1, 1, 1, 1 }, diff --git a/_G/rockets/X_41.lua b/_G/rockets/X_41.lua index a93e0d5b..52e0651e 100644 --- a/_G/rockets/X_41.lua +++ b/_G/rockets/X_41.lua @@ -27,7 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = -0.376, Z_back = 0, _unique_resource_name = "weapons.missiles.X_41", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, display_name = "Kh-41 (SS-N-22-Sunburn)", display_name_short = "Kh-41", exhaust1 = { 1, 1, 1, 1 }, diff --git a/_G/rockets/X_59M.lua b/_G/rockets/X_59M.lua index 0abbe18f..b3496f74 100644 --- a/_G/rockets/X_59M.lua +++ b/_G/rockets/X_59M.lua @@ -31,7 +31,7 @@ _G["rockets"]["#Index"] = { Z_back_acc = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.4, Kd = 0, diff --git a/_G/rockets/X_65.lua b/_G/rockets/X_65.lua index e75d8b30..e753d8d8 100644 --- a/_G/rockets/X_65.lua +++ b/_G/rockets/X_65.lua @@ -28,7 +28,7 @@ _G["rockets"]["#Index"] = { X_back = -2.356, Y_back = -0.618, Z_back = 0, - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, display_name = "Kh-65", display_name_short = "Kh-65", name = "X_65", diff --git a/_G/rockets/YJ-83K.lua b/_G/rockets/YJ-83K.lua deleted file mode 100644 index a5762725..00000000 --- a/_G/rockets/YJ-83K.lua +++ /dev/null @@ -1,253 +0,0 @@ -_G["rockets"]["#Index"] = { - Cx_pil = 8, - D_max = 220000, - D_min = 2000, - Damage = 825, - Diam = 360, - Engine_Type = 5, - Escort = 0, - Fi_excort = 3.14152, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.25, - H_max = 15000, - H_min = -1, - H_min_t = 0, - Head_Form = 1, - Head_Type = 5, - KillDistance = 0, - LaunchDistData = { 12, 7, 100, 125, 150, 175, 200, 250, 300, 500, 150000, 155000, 160000, 165000, 170000, 175000, 180000, 600, 152000, 157000, 162000, 167000, 172000, 177000, 182000, 700, 154000, 159000, 164000, 169000, 174000, 179000, 184000, 800, 156000, 161000, 166000, 171000, 176000, 181000, 186000, 900, 158000, 163000, 168000, 173000, 178000, 183000, 188000, 1000, 160000, 165000, 170000, 175000, 180000, 185000, 190000, 1200, 163000, 168000, 173000, 178000, 183000, 188000, 193000, 2200, 170000, 175000, 180000, 185000, 189000, 194000, 199000, 3200, 176000, 181000, 186000, 191000, 194000, 199000, 204000, 4200, 181000, 186000, 191000, 196000, 199000, 203000, 208000, 5200, 185000, 190000, 195000, 199000, 203000, 207000, 212000, 7500, 190000, 195000, 200000, 204000, 208000, 212000, 217000 }, - Life_Time = 1850, - M = 715, - Mach_max = 1.3, - Name = "Redacted", - Nr_max = 15, - OmViz_max = 99.9, - Range_max = 220000, - Reflection = 0.09, - Stage_ = 1, - X_back = -2.566, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_c802ak.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Cruise missiles" }, - autopilot = { - K = 1.6, - Kd = 0, - Kdx = 0.001, - Ki = 20, - Ks = 0.9, - Ksd = 0, - Ksi = 0, - Kw = 3.5, - Kx = 0.04, - PN_dist_data = { 2000, 0, 500, 0 }, - altim_vel_k = 4, - conv_input = 0, - default_glide_height = 1524, - delay = 1, - dont_climb_on_cruise_height = 1, - fins_limit = 0.87266462599716, - fins_limit_x = 0.43633231299858, - glide_height = 20, - glide_height_abs_error = 1.5, - glide_height_eq_error = 0.02, - hor_err_limit = 0.5, - inertial_km_error = 0.15, - integr_val_limit = 0.5, - max_climb_ang_hdiff = 200, - max_climb_angle = 0.17453292519943, - max_climb_h = 3000, - max_climb_vel = 200, - max_dive_ang_hdiff = -500, - max_dive_angle = -0.43633231299858, - min_climb_h = 10000, - min_climb_h_factor = 0.5, - min_climb_vel = 120, - min_climb_vel_factor = 0, - min_glide_height = 15, - op_time = 9999, - pre_maneuver_glide_height = 12, - rotated_WLOS_input = 0, - skim_glide_height = 8, - use_start_bar_height = 1, - vel_proj_div = 6, - w_limit = 0.087266462599716 - }, - boost = { - boost_factor = 0, - 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 = "wAmmunitionAntiShip", - controller = { - boost_start = 0, - march_start = 5 - }, - display_name = "YJ-83K", - display_name_short = "YJ-83K", - engine_control = { - K = 265, - Kd = 0.01, - Ki = 0.001, - default_speed = 300, - speed_delta = 5 - }, - final_autopilot = { - K = 5.4, - K_loft_err = 1, - Kd = 0, - Ki = 0, - Kix = 0, - Ks = 5, - Kw = 1, - Kx = 0, - PN_dist_data = { 2000, 1, 500, 1 }, - add_err_val = 0, - add_err_vert = 0, - add_out_val = 0.1, - add_out_vert = 1, - conv_input = 0, - delay = 1, - fins_limit = 0.87266462599716, - loft_active_by_default = 0, - loft_angle = 0.13962634015955, - loft_angle_vert = 1, - loft_trig_angle = 0.24434609527921, - op_time = 9999, - rotated_WLOS_input = 0, - w_limit = 0.26179938779915 - }, - fm = { - A = 0.5, - I = 1577.23190625, - Kw_x = 0.05, - L = 5.145, - Ma = 0.6, - Ma_x = 3, - Ma_z = 3, - Mw = 1.116, - Sw = 0.7, - caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, - maxAoa = 0.3, - wind_sigma = 0, - wind_time = 1000 - }, - manualWeaponFlag = 2, - march = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 200, - impulse = 700, - max_thrust = 6000, - min_fuel_rate = 0.005, - min_thrust = 0, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.566, 0, 0 } }, - smoke_color = { 0, 0, 0 }, - smoke_transparency = 0.2, - start_burn_effect = 0, - start_effect_delay = { 0, 0.3, 0.8 }, - start_effect_size = { 0.09, 0.104, 0.11 }, - start_effect_smoke = { 0.01, 0.4, 0.01 }, - start_effect_time = { 0.7, 1, 0.1 }, - start_effect_x_dist = { 1.1, 0.9, 0 }, - start_effect_x_pow = { 1, 1, 1 }, - start_effect_x_shift = { 0.15, 0.15, 0.2 }, - tail_width = 0.5, - thrust_Tau = 0.0017, - work_time = 9999 - }, - mass = 715, - model = "yj83k", - name = "YJ-83K", - scheme = "Harpoon", - seeker = { - FOV = 1.0471975511966, - add_y = 3, - delay = 0, - flag_dist = 5000, - max_small_target_rcs = 29999.999, - max_target_speed = 33, - max_target_speed_rnd_coeff = 10, - max_w_LOS = 0.06, - min_detectable_rcs = 50, - min_large_target_rcs = 60000, - op_time = 9999, - primary_target_filter = 1, - sens_far_dist = 16000, - sens_near_dist = 10, - sens_ref_dist = 32000, - sens_ref_rcs = 10000, - ship_l_error_k = 0.33, - ship_track_by_default = 1 - }, - shape_table_data = { { - file = "yj83k", - fire = { 0, 1 }, - index = "Redacted", - life = 0.6, - name = "YJ-83K", - username = "YJ-83K" - } }, - sigma = { 8, 8, 8 }, - t_acc = 0, - t_b = 5, - t_marsh = 1800, - triggers_control = { - can_increase_tg_dist = 1, - check_self_destruct_dist_with_no_target = 1, - final_maneuver_tg_dist = 4000, - final_maneuver_trig_v_lim = 3, - pre_maneuver_glide_height = 20, - self_destruct_tg_dist = 4000, - send_final_maneuver_by_default = 0, - sensor_tg_dist = 8000, - straight_nav_tg_dist = 2000, - target_upd_jump_dist = 20000, - update_pos_from_input = 0, - use_horiz_dist = 1 - }, - user_name = "YJ-83K", - v_mid = 372, - v_min = 170, - warhead = { - caliber = 360, - concrete_factors = { 3, 1, 1 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 165, - mass = 165, - obj_factors = { 3, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - warhead_air = { - caliber = 360, - concrete_factors = { 3, 1, 1 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 165, - mass = 165, - obj_factors = { 3, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, - ws_type =
-} \ No newline at end of file diff --git a/_G/warheads/C_5.lua b/_G/warheads/C_5.lua index 84ba422a..c2a141e4 100644 --- a/_G/warheads/C_5.lua +++ b/_G/warheads/C_5.lua @@ -1,5 +1,4 @@ _G["warheads"]["C_5"] = { - caliber = 65, concrete_factors = { 1, 0.5, 0.1 }, concrete_obj_factor = 0, cumulative_factor = 3, diff --git a/_G/warheads/C_8.lua b/_G/warheads/C_8.lua index 45d558bf..883de9e3 100644 --- a/_G/warheads/C_8.lua +++ b/_G/warheads/C_8.lua @@ -1 +1,13 @@ -_G["warheads"]["C_8"] = "_G/warheads/S_8KOM.lua" \ No newline at end of file +_G["warheads"]["C_8"] = { + caliber = 80, + concrete_factors = { 1.6, 1.6, 1.6 }, + 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.6, 1.6 }, + other_factors = { 1.6, 1.6, 1.6 }, + piercing_mass = 0.72 +} \ No newline at end of file diff --git a/_G/warheads/GR_66_AC.lua b/_G/warheads/GR_66_AC.lua new file mode 100644 index 00000000..5833646e --- /dev/null +++ b/_G/warheads/GR_66_AC.lua @@ -0,0 +1,12 @@ +_G["warheads"]["GR_66_AC"] = { + caliber = 66, + concrete_factors = { 1.6, 1.6, 1 }, + concrete_obj_factor = 1.6, + cumulative_factor = 3, + cumulative_thickness = 0.3, + expl_mass = 0.8, + mass = 1.2, + obj_factors = { 1.6, 1 }, + other_factors = { 1.6, 1.6, 1 }, + piercing_mass = 0.24 +} \ No newline at end of file diff --git a/_G/warheads/GR_66_EG.lua b/_G/warheads/GR_66_EG.lua new file mode 100644 index 00000000..657b8876 --- /dev/null +++ b/_G/warheads/GR_66_EG.lua @@ -0,0 +1,12 @@ +_G["warheads"]["GR_66_EG"] = { + caliber = 66, + concrete_factors = { 1.6, 1.6, 1.6 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 0.8, + mass = 1.2, + obj_factors = { 1.6, 1.6 }, + other_factors = { 1.6, 1.6, 1.6 }, + piercing_mass = 0.24 +} \ No newline at end of file diff --git a/_G/warheads/S_8KOM.lua b/_G/warheads/S_8KOM.lua index c3dc9de9..0d0c2352 100644 --- a/_G/warheads/S_8KOM.lua +++ b/_G/warheads/S_8KOM.lua @@ -1,13 +1 @@ -_G["warheads"]["S_8KOM"] = { - caliber = 80, - concrete_factors = { 1.6, 1.6, 1.6 }, - 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.6, 1.6 }, - other_factors = { 1.6, 1.6, 1.6 }, - piercing_mass = 0.72 -} \ No newline at end of file +_G["warheads"]["S_8KOM"] = "_G/warheads/C_8.lua" \ No newline at end of file diff --git a/_G/weapons_table/weapons/bombs/BELOUGA.lua b/_G/weapons_table/weapons/bombs/BELOUGA.lua deleted file mode 100644 index 7f0ad622..00000000 --- a/_G/weapons_table/weapons/bombs/BELOUGA.lua +++ /dev/null @@ -1,281 +0,0 @@ -_G["weapons_table"]["weapons"]["bombs"]["BELOUGA"] = { - I = 101.2986, - L = 2.34, - _file = "./CoreMods/aircraft/C-101/Weapons.lua", - _origin = "C-101 Aviojet by AvioDev", - _unique_resource_name = "weapons.bombs.BELOUGA", - caliber = 0.36, - client = { - Ag = -1.23, - Cx = 0.000413, - VyHold = -100, - _file = "./CoreMods/aircraft/C-101/Weapons.lua", - _origin = "C-101 Aviojet by AvioDev", - arming_delay = { - delay_time = 0.8, - enabled = true - }, - arming_vane = { - enabled = false, - velK = 1 - }, - category = 1, - class_name = "wAmmunition", - control = { - open_delay = 1.3 - }, - explMass = 94, - fm = { - I = 101.2986, - L = 2.34, - Ma = 0.197848, - Mw = 1.987409, - caliber = 0.36, - cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, - mass = 290, - release_rnd = 0.3, - release_rnd_x = 1, - wind_sigma = 100, - wind_time = 1000 - }, - hMax = 5000, - hMin = 60.96, - launcher = { - cluster = { - char_time = 0, - client = { - cluster = { - I = 0.005784, - L = 0.343, - Ma = 0.049268, - Mw = 0.21102, - caliber = 0.065, - count = 151, - cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, - effect_count = 20, - impulse_sigma = 5, - mass = 1.2, - model_name = "PTAB-2_5KO", - moment_sigma = 0.0001, - wind_sigma = 5 - }, - scheme = "schemes/cluster/cluster.sch", - warhead = { - caliber = 65, - concrete_factors = { 1, 0.5, 0.1 }, - concrete_obj_factor = 0, - cumulative_factor = 3, - cumulative_thickness = 0.1, - expl_mass = 0.37, - fantom = 1, - mass = 1.08, - obj_factors = { 1, 1 }, - other_factors = { 1, 0.5, 0.5 }, - piercing_mass = 0.216 - } - }, - display_name = "BLG-66", - mass = 0, - model = "", - name = "BLG-66", - server = { - cluster = { - I = 0.005784, - L = 0.343, - Ma = 0.049268, - Mw = 0.21102, - caliber = 0.065, - count = 151, - cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, - effect_count = 20, - impulse_sigma = 5, - mass = 1.2, - model_name = "PTAB-2_5KO", - moment_sigma = 0.0001, - wind_sigma = 5 - }, - scheme = "schemes/cluster/cluster.sch", - warhead = { - caliber = 65, - concrete_factors = { 1, 0.5, 0.1 }, - concrete_obj_factor = 0, - cumulative_factor = 3, - cumulative_thickness = 0.1, - expl_mass = 0.37, - fantom = 0, - mass = 1.08, - obj_factors = { 1, 1 }, - other_factors = { 1, 0.5, 0.5 }, - piercing_mass = 0.216 - } - }, - sounderName = "Weapons/ClusterBomblets", - type_name = "cluster", - ws_type = { 4, 5, 38, "Redacted" } - }, - server = 0 - }, - mass = 290, - model = "BELOUGA", - name = "BELOUGA", - scheme = "schemes/bombs/bomb-cassette.sch", - shape_table_data = { { - file = "BELOUGA", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "BELOUGA", - username = "Belouga" - } }, - targeting_data = { - data = { { 1, 20.2, 0 }, { 10, 20.387832, 4.9e-05 }, { 20, 20.41108, -0.000119 }, { 30, 20.417762, -0.000146 }, { 40, 20.418872, -0.000155 }, { 50, 20.422678, -0.000196 }, { 60, 20.422795, -0.000193 }, { 70, 20.424225, -0.000193 }, { 80, 20.423192, -0.000183 }, { 90, 20.425867, -0.000199 }, { 100, 20.430273, -0.00018 }, { 200, 20.62297, -5.3e-05 }, { 300, 20.857516, -4.7e-05 }, { 400, 21.057872, -0.000108 }, { 500, 21.223882, -0.000184 }, { 600, 21.362917, -0.000257 }, { 700, 21.481392, -0.000324 }, { 800, 21.583711, -0.000385 }, { 900, 21.673304, -0.000438 }, { 1000, 21.752745, -0.000486 }, { 1100, 21.823816, -0.000529 }, { 1200, 21.887984, -0.000567 }, { 1300, 21.946335, -0.000601 }, { 1400, 21.999764, -0.000632 }, { 1500, 22.048955, -0.000659 }, { 1600, 22.094484, -0.000684 }, { 1700, 22.136835, -0.000706 }, { 1800, 22.176353, -0.000726 }, { 1900, 22.213413, -0.000743 }, { 2000, 22.248243, -0.000759 }, { 3000, 22.514201, -0.000834 }, { 4000, 22.696, -0.000852 }, { 5000, 22.8368, -0.000867 }, { 6000, 22.954552, -0.0009 }, { 7000, 23.058133, -0.000956 }, { 8000, 23.152369, -0.00103 }, { 9000, 23.239969, -0.001118 }, { 10000, 23.322436, -0.001221 } }, - v0 = 200 - }, - type = 5, - user_name = "Belouga", - wsTypeOfWeapon = { 4, 5, 38, "Redacted" } - }, - cx = { 1, 0.39, 0.6, 0.168, 1.31 }, - display_name = "Belouga", - display_name_short = "Belouga", - mass = 290, - model = "BELOUGA", - name = "BELOUGA", - server = { - Ag = -1.23, - Cx = 0.000413, - VyHold = -100, - _file = "./CoreMods/aircraft/C-101/Weapons.lua", - _origin = "C-101 Aviojet by AvioDev", - arming_delay = { - delay_time = 0.8, - enabled = true - }, - arming_vane = { - enabled = false, - velK = 1 - }, - category = 1, - class_name = "wAmmunition", - control = { - open_delay = 1.3 - }, - explMass = 94, - fm = { - I = 101.2986, - L = 2.34, - Ma = 0.197848, - Mw = 1.987409, - caliber = 0.36, - cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, - mass = 290, - release_rnd = 0.3, - release_rnd_x = 1, - wind_sigma = 100, - wind_time = 1000 - }, - hMax = 5000, - hMin = 60.96, - launcher = { - cluster = { - char_time = 0, - client = { - cluster = { - I = 0.005784, - L = 0.343, - Ma = 0.049268, - Mw = 0.21102, - caliber = 0.065, - count = 151, - cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, - effect_count = 20, - impulse_sigma = 5, - mass = 1.2, - model_name = "PTAB-2_5KO", - moment_sigma = 0.0001, - wind_sigma = 5 - }, - scheme = "schemes/cluster/cluster.sch", - warhead = { - caliber = 65, - concrete_factors = { 1, 0.5, 0.1 }, - concrete_obj_factor = 0, - cumulative_factor = 3, - cumulative_thickness = 0.1, - expl_mass = 0.37, - fantom = 1, - mass = 1.08, - obj_factors = { 1, 1 }, - other_factors = { 1, 0.5, 0.5 }, - piercing_mass = 0.216 - } - }, - display_name = "BLG-66", - mass = 0, - model = "", - name = "BLG-66", - server = { - cluster = { - I = 0.005784, - L = 0.343, - Ma = 0.049268, - Mw = 0.21102, - caliber = 0.065, - count = 151, - cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, - effect_count = 20, - impulse_sigma = 5, - mass = 1.2, - model_name = "PTAB-2_5KO", - moment_sigma = 0.0001, - wind_sigma = 5 - }, - scheme = "schemes/cluster/cluster.sch", - warhead = { - caliber = 65, - concrete_factors = { 1, 0.5, 0.1 }, - concrete_obj_factor = 0, - cumulative_factor = 3, - cumulative_thickness = 0.1, - expl_mass = 0.37, - fantom = 0, - mass = 1.08, - obj_factors = { 1, 1 }, - other_factors = { 1, 0.5, 0.5 }, - piercing_mass = 0.216 - } - }, - sounderName = "Weapons/ClusterBomblets", - type_name = "cluster", - ws_type = { 4, 5, 38, "Redacted" } - }, - server = 1 - }, - mass = 290, - model = "BELOUGA", - name = "BELOUGA", - scheme = "schemes/bombs/bomb-cassette.sch", - shape_table_data = { { - file = "BELOUGA", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "BELOUGA", - username = "Belouga" - } }, - targeting_data = { - data = { { 1, 20.2, 0 }, { 10, 20.387832, 4.9e-05 }, { 20, 20.41108, -0.000119 }, { 30, 20.417762, -0.000146 }, { 40, 20.418872, -0.000155 }, { 50, 20.422678, -0.000196 }, { 60, 20.422795, -0.000193 }, { 70, 20.424225, -0.000193 }, { 80, 20.423192, -0.000183 }, { 90, 20.425867, -0.000199 }, { 100, 20.430273, -0.00018 }, { 200, 20.62297, -5.3e-05 }, { 300, 20.857516, -4.7e-05 }, { 400, 21.057872, -0.000108 }, { 500, 21.223882, -0.000184 }, { 600, 21.362917, -0.000257 }, { 700, 21.481392, -0.000324 }, { 800, 21.583711, -0.000385 }, { 900, 21.673304, -0.000438 }, { 1000, 21.752745, -0.000486 }, { 1100, 21.823816, -0.000529 }, { 1200, 21.887984, -0.000567 }, { 1300, 21.946335, -0.000601 }, { 1400, 21.999764, -0.000632 }, { 1500, 22.048955, -0.000659 }, { 1600, 22.094484, -0.000684 }, { 1700, 22.136835, -0.000706 }, { 1800, 22.176353, -0.000726 }, { 1900, 22.213413, -0.000743 }, { 2000, 22.248243, -0.000759 }, { 3000, 22.514201, -0.000834 }, { 4000, 22.696, -0.000852 }, { 5000, 22.8368, -0.000867 }, { 6000, 22.954552, -0.0009 }, { 7000, 23.058133, -0.000956 }, { 8000, 23.152369, -0.00103 }, { 9000, 23.239969, -0.001118 }, { 10000, 23.322436, -0.001221 } }, - v0 = 200 - }, - type = 5, - user_name = "Belouga", - wsTypeOfWeapon = { 4, 5, 38, "Redacted" } - }, - sounderName = "Weapons/Bomb", - targeting_data = { - data = { { 1, 20.2, 0 }, { 10, 20.387832, 4.9e-05 }, { 20, 20.41108, -0.000119 }, { 30, 20.417762, -0.000146 }, { 40, 20.418872, -0.000155 }, { 50, 20.422678, -0.000196 }, { 60, 20.422795, -0.000193 }, { 70, 20.424225, -0.000193 }, { 80, 20.423192, -0.000183 }, { 90, 20.425867, -0.000199 }, { 100, 20.430273, -0.00018 }, { 200, 20.62297, -5.3e-05 }, { 300, 20.857516, -4.7e-05 }, { 400, 21.057872, -0.000108 }, { 500, 21.223882, -0.000184 }, { 600, 21.362917, -0.000257 }, { 700, 21.481392, -0.000324 }, { 800, 21.583711, -0.000385 }, { 900, 21.673304, -0.000438 }, { 1000, 21.752745, -0.000486 }, { 1100, 21.823816, -0.000529 }, { 1200, 21.887984, -0.000567 }, { 1300, 21.946335, -0.000601 }, { 1400, 21.999764, -0.000632 }, { 1500, 22.048955, -0.000659 }, { 1600, 22.094484, -0.000684 }, { 1700, 22.136835, -0.000706 }, { 1800, 22.176353, -0.000726 }, { 1900, 22.213413, -0.000743 }, { 2000, 22.248243, -0.000759 }, { 3000, 22.514201, -0.000834 }, { 4000, 22.696, -0.000852 }, { 5000, 22.8368, -0.000867 }, { 6000, 22.954552, -0.0009 }, { 7000, 23.058133, -0.000956 }, { 8000, 23.152369, -0.00103 }, { 9000, 23.239969, -0.001118 }, { 10000, 23.322436, -0.001221 } }, - v0 = 200 - }, - type_name = "bomb", - ws_type = { 4, 5, 38, "Redacted" } -} \ No newline at end of file diff --git a/_G/weapons_table/weapons/bombs/BLG66.lua b/_G/weapons_table/weapons/bombs/BLG66.lua index 446bde37..71c9e344 100644 --- a/_G/weapons_table/weapons/bombs/BLG66.lua +++ b/_G/weapons_table/weapons/bombs/BLG66.lua @@ -1,6 +1,6 @@ _G["weapons_table"]["weapons"]["bombs"]["BLG66"] = { - I = 281.84, - L = 3.33, + I = 272.25, + L = 3.3, Reflection = 0.03, _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", _origin = "AircraftWeaponPack", @@ -24,25 +24,25 @@ _G["weapons_table"]["weapons"]["bombs"]["BLG66"] = { category = 1, class_name = "wAmmunition", control = { - open_delay = 1.3 + open_delay = 1.26 }, display_name_short = "BLG-66", - explMass = 94, + explMass = 2, fm = { - I = 281.84, - L = 3.33, + I = 272.25, + L = 3.3, Ma = 0.23, Mw = 2.33, caliber = 0.36, cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, - mass = 305, + mass = 300, release_rnd = 0.3, release_rnd_x = 1, wind_sigma = 15, wind_time = 1000 }, - hMax = 5000, - hMin = 60.96, + hMax = 250, + hMin = 85, launcher = { blocks = { "cluster" }, cluster = { @@ -51,178 +51,208 @@ _G["weapons_table"]["weapons"]["bombs"]["BLG66"] = { char_time = 0, client = { bomblets = { - I = 0.09, - L = 0.151, - Ma = 0.03, - Mw = 0.3, + I = 0.00484, + L = 0.22, + Ma = 0.3, + Mw = 3, caliber = 0.066, - chute_Cx = 0, - chute_cut_time = 0, - chute_diam = 0, - chute_open_time = 0, - chute_rnd_coeff = 0, + chute_Cx = 1, + chute_Ma = 2, + chute_Mw = 20, + chute_cut_time = 9999, + chute_diam = 0.4, + chute_open_time = 0.05, + chute_rnd_coeff = 0.1, + chute_rnd_cont_uniform_distr = true, + conn_num = 19, + conn_order = -1, + connectors_model_name = "BLG-66", count = 151, - cx_coeff = { 0, 0.4, 0.7, 0.6, 1.4 }, - effect_count = 40, - explosion_center = { { 0.616, -0.17, 0 }, { 0.47, -0.17, 0 }, { 0.327, -0.17, 0 }, { 0.185, -0.17, 0 }, { -0.006, -0.17, 0 }, { -0.152, -0.17, 0 }, { -0.43, -0.17, 0 }, { -0.575, -0.17, 0 }, { -0.718, -0.17, 0 }, { -0.86, -0.17, 0 } }, - explosion_impulse_coeff = 4, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 30, explosion_style = 0, + first_dir_ang_offsets = { 2.3561944901923, 1.9634954084936 }, impulse_sigma = 1, - mass = 1.3, - model_name = "RBK_250_PTAB_25M_bomb", + init_imp_scalar = 60, + mass = 1.2, + model_name = "GR66AC", moment_sigma = 2, op_time = 400, - release_rnd_coeff = 0, - spawn_options = { { 0, 0, 15 }, { 1, 1, 15 }, { 2, 2, 16 }, { 3, 3, 15 }, { 4, 4, 15 }, { 5, 5, 15 }, { 6, 6, 15 }, { 7, 7, 15 }, { 8, 8, 15 }, { 9, 9, 15 } }, - wind_sigma = 20 + radial_offset = 0.18, + rel_dir_num = 8, + release_omega_0 = true, + release_rnd_coeff = 0.1, + spawn_options = { { 0, 0, 8 }, { 1, 1, 8 }, { 2, 2, 8 }, { 3, 3, 8 }, { 4, 4, 8 }, { 5, 5, 8 }, { 6, 6, 8 }, { 7, 7, 8 }, { 8, 8, 8 }, { 9, 9, 8 }, { 10, 10, 8 }, { 11, 11, 8 }, { 12, 12, 7 }, { 13, 13, 8 }, { 14, 14, 8 }, { 15, 15, 8 }, { 16, 16, 8 }, { 17, 17, 8 }, { 18, 18, 8 } }, + wind_sigma = 20, + xoy_angle = 2.3561944901923 }, dispenser = { - I = 281.84, - L = 3.33, + I = 272.25, + L = 3.3, Ma = 0.23, Mw = 2.33, caliber = 0.36, - chute_Cx = 1, + chute_Cx = 3, chute_cut_time = 0.7, - chute_diam = 2, + chute_diam = 1.4, chute_open_time = 0.1, chute_rnd_coeff = 0, count = 1, - cx_coeff = { 0, 0.9, 0.9, 1, 2 }, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, effect_count = 1, impulse_sigma = 1, - mass = 305, - model_name = "M2000C_BLG66", + mass = 300, + model_name = "BLG-66", moment_sigma = 1, - op_spawns = 10, - op_time = 300, - spawn_height = {}, - spawn_time = { 0.1, 0.18, 0.26, 0.34, 0.42, 0.5, 0.58, 0.64, 0.72, 0.8 }, - spawn_weight_loss = { 19.5, 19.5, 20.8, 19.5, 19.5, 19.5, 19.5, 19.5, 19.5, 19.5 }, + op_spawns = 19, + op_time = 20, + set_changing_args = { 28, 1, 0, 0.34, 1 }, + set_start_args = { 1 }, + spawn_args_change = { { 0, 4, 0.05 }, { 1, 4, 0.1 }, { 2, 4, 0.15 }, { 3, 4, 0.2 }, { 4, 4, 0.25 }, { 5, 4, 0.3 }, { 6, 4, 0.35 }, { 7, 4, 0.4 }, { 8, 4, 0.45 }, { 9, 4, 0.5 }, { 10, 4, 0.55 }, { 11, 4, 0.6 }, { 12, 4, 0.65 }, { 13, 4, 0.7 }, { 14, 4, 0.75 }, { 15, 4, 0.8 }, { 16, 4, 0.85 }, { 17, 4, 0.9 }, { 18, 4, 1 } }, + spawn_interval = 0.06, + spawn_time = {}, + spawn_weight_loss = { 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 8.4, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6 }, use_effects = 1, wind_sigma = 20 }, empty_dispenser = { - I = 101.65, - L = 3.33, - Ma = 0.03, - Mw = 0.3, + I = 107.811, + L = 3.3, + Ma = 0.23, + Mw = 2.33, caliber = 0.36, connectors_model_name = "", count = 1, - cx_coeff = { 1, 1, 1, 1, 2 }, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, effect_count = 1, impulse_sigma = 1, - mass = 108.7, - model_name = "M2000C_BLG66", + mass = 118.8, + model_name = "BLG-66", moment_sigma = 1, op_time = 300, - spawn_options = { { 9, 9, 1 } }, + set_changing_args = { 0, -0.1, -1, 0.01, 0, 28, 1, 0, 0.34, 1 }, + set_start_args = { 1, 4 }, + spawn_options = { { 18, 18, 1 } }, wind_sigma = 5 }, - scheme = "schemes/cluster/disp_bomblets_empty_disp.sch", + scheme = "schemes/cluster/disp_bomblets_rad_rel_empty_disp.sch", warhead = { - caliber = 68, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, + caliber = 66, + concrete_factors = { 1.6, 1.6, 1 }, + concrete_obj_factor = 1.6, cumulative_factor = 3, - cumulative_thickness = 0.4, - expl_mass = 0.65, + cumulative_thickness = 0.3, + expl_mass = 0.8, fantom = 1, - mass = 2.8, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0.56 + mass = 1.2, + obj_factors = { 1.6, 1 }, + other_factors = { 1.6, 1.6, 1 }, + piercing_mass = 0.24 } }, - display_name = "BLG-66", + display_name = "BLG-66 AC", mass = 0, model = "", - name = "BLG-66", + name = "BLG-66 AC", server = { bomblets = { - I = 0.09, - L = 0.151, - Ma = 0.03, - Mw = 0.3, + I = 0.00484, + L = 0.22, + Ma = 0.3, + Mw = 3, caliber = 0.066, - chute_Cx = 0, - chute_cut_time = 0, - chute_diam = 0, - chute_open_time = 0, - chute_rnd_coeff = 0, + chute_Cx = 1, + chute_Ma = 2, + chute_Mw = 20, + chute_cut_time = 9999, + chute_diam = 0.4, + chute_open_time = 0.05, + chute_rnd_coeff = 0.1, + chute_rnd_cont_uniform_distr = true, + conn_num = 19, + conn_order = -1, + connectors_model_name = "BLG-66", count = 151, - cx_coeff = { 0, 0.4, 0.7, 0.6, 1.4 }, - effect_count = 40, - explosion_center = { { 0.616, -0.17, 0 }, { 0.47, -0.17, 0 }, { 0.327, -0.17, 0 }, { 0.185, -0.17, 0 }, { -0.006, -0.17, 0 }, { -0.152, -0.17, 0 }, { -0.43, -0.17, 0 }, { -0.575, -0.17, 0 }, { -0.718, -0.17, 0 }, { -0.86, -0.17, 0 } }, - explosion_impulse_coeff = 4, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 30, explosion_style = 0, + first_dir_ang_offsets = { 2.3561944901923, 1.9634954084936 }, impulse_sigma = 1, - mass = 1.3, - model_name = "RBK_250_PTAB_25M_bomb", + init_imp_scalar = 60, + mass = 1.2, + model_name = "GR66AC", moment_sigma = 2, op_time = 400, - release_rnd_coeff = 0, - spawn_options = { { 0, 0, 15 }, { 1, 1, 15 }, { 2, 2, 16 }, { 3, 3, 15 }, { 4, 4, 15 }, { 5, 5, 15 }, { 6, 6, 15 }, { 7, 7, 15 }, { 8, 8, 15 }, { 9, 9, 15 } }, - wind_sigma = 20 + radial_offset = 0.18, + rel_dir_num = 8, + release_omega_0 = true, + release_rnd_coeff = 0.1, + spawn_options = { { 0, 0, 8 }, { 1, 1, 8 }, { 2, 2, 8 }, { 3, 3, 8 }, { 4, 4, 8 }, { 5, 5, 8 }, { 6, 6, 8 }, { 7, 7, 8 }, { 8, 8, 8 }, { 9, 9, 8 }, { 10, 10, 8 }, { 11, 11, 8 }, { 12, 12, 7 }, { 13, 13, 8 }, { 14, 14, 8 }, { 15, 15, 8 }, { 16, 16, 8 }, { 17, 17, 8 }, { 18, 18, 8 } }, + wind_sigma = 20, + xoy_angle = 2.3561944901923 }, dispenser = { - I = 281.84, - L = 3.33, + I = 272.25, + L = 3.3, Ma = 0.23, Mw = 2.33, caliber = 0.36, - chute_Cx = 1, + chute_Cx = 3, chute_cut_time = 0.7, - chute_diam = 2, + chute_diam = 1.4, chute_open_time = 0.1, chute_rnd_coeff = 0, count = 1, - cx_coeff = { 0, 0.9, 0.9, 1, 2 }, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, effect_count = 1, impulse_sigma = 1, - mass = 305, - model_name = "M2000C_BLG66", + mass = 300, + model_name = "BLG-66", moment_sigma = 1, - op_spawns = 10, - op_time = 300, - spawn_height = {}, - spawn_time = { 0.1, 0.18, 0.26, 0.34, 0.42, 0.5, 0.58, 0.64, 0.72, 0.8 }, - spawn_weight_loss = { 19.5, 19.5, 20.8, 19.5, 19.5, 19.5, 19.5, 19.5, 19.5, 19.5 }, + op_spawns = 19, + op_time = 20, + set_changing_args = { 28, 1, 0, 0.34, 1 }, + set_start_args = { 1 }, + spawn_args_change = { { 0, 4, 0.05 }, { 1, 4, 0.1 }, { 2, 4, 0.15 }, { 3, 4, 0.2 }, { 4, 4, 0.25 }, { 5, 4, 0.3 }, { 6, 4, 0.35 }, { 7, 4, 0.4 }, { 8, 4, 0.45 }, { 9, 4, 0.5 }, { 10, 4, 0.55 }, { 11, 4, 0.6 }, { 12, 4, 0.65 }, { 13, 4, 0.7 }, { 14, 4, 0.75 }, { 15, 4, 0.8 }, { 16, 4, 0.85 }, { 17, 4, 0.9 }, { 18, 4, 1 } }, + spawn_interval = 0.06, + spawn_time = {}, + spawn_weight_loss = { 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 8.4, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6 }, use_effects = 1, wind_sigma = 20 }, empty_dispenser = { - I = 101.65, - L = 3.33, - Ma = 0.03, - Mw = 0.3, + I = 107.811, + L = 3.3, + Ma = 0.23, + Mw = 2.33, caliber = 0.36, connectors_model_name = "", count = 1, - cx_coeff = { 1, 1, 1, 1, 2 }, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, effect_count = 1, impulse_sigma = 1, - mass = 108.7, - model_name = "M2000C_BLG66", + mass = 118.8, + model_name = "BLG-66", moment_sigma = 1, op_time = 300, - spawn_options = { { 9, 9, 1 } }, + set_changing_args = { 0, -0.1, -1, 0.01, 0, 28, 1, 0, 0.34, 1 }, + set_start_args = { 1, 4 }, + spawn_options = { { 18, 18, 1 } }, wind_sigma = 5 }, - scheme = "schemes/cluster/disp_bomblets_empty_disp.sch", + scheme = "schemes/cluster/disp_bomblets_rad_rel_empty_disp.sch", warhead = { - caliber = 68, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, + caliber = 66, + concrete_factors = { 1.6, 1.6, 1 }, + concrete_obj_factor = 1.6, cumulative_factor = 3, - cumulative_thickness = 0.4, - expl_mass = 0.65, + cumulative_thickness = 0.3, + expl_mass = 0.8, fantom = 0, - mass = 2.8, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0.56 + mass = 1.2, + obj_factors = { 1.6, 1 }, + other_factors = { 1.6, 1.6, 1 }, + piercing_mass = 0.24 } }, sounderName = "Weapons/ClusterBomblets", @@ -231,21 +261,19 @@ _G["weapons_table"]["weapons"]["bombs"]["BLG66"] = { }, server = 0 }, - mass = 305, - model = "M2000C_BLG66", + mass = 300, + model = "BLG-66", name = "BLG66", scheme = "schemes/bombs/bomb-cassette.sch", shape_table_data = { { - file = "M2000C_BLG66", - fire = { 0, 1 }, + file = "BLG-66", index = "Redacted", - life = 1, name = "BLG66", username = "BLG-66 Belouga AC" } }, targeting_data = { - bomblet_char_time = 27.5, - char_time = 20.43 + bomblet_char_time = 62.5, + char_time = 21 }, type = 5, user_name = "BLG-66 Belouga AC", @@ -254,8 +282,8 @@ _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", + mass = 300, + model = "BLG-66", name = "BLG66", server = { Ag = -1.23, @@ -275,25 +303,25 @@ _G["weapons_table"]["weapons"]["bombs"]["BLG66"] = { category = 1, class_name = "wAmmunition", control = { - open_delay = 1.3 + open_delay = 1.26 }, display_name_short = "BLG-66", - explMass = 94, + explMass = 2, fm = { - I = 281.84, - L = 3.33, + I = 272.25, + L = 3.3, Ma = 0.23, Mw = 2.33, caliber = 0.36, cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, - mass = 305, + mass = 300, release_rnd = 0.3, release_rnd_x = 1, wind_sigma = 15, wind_time = 1000 }, - hMax = 5000, - hMin = 60.96, + hMax = 250, + hMin = 85, launcher = { blocks = { "cluster" }, cluster = { @@ -302,178 +330,208 @@ _G["weapons_table"]["weapons"]["bombs"]["BLG66"] = { char_time = 0, client = { bomblets = { - I = 0.09, - L = 0.151, - Ma = 0.03, - Mw = 0.3, + I = 0.00484, + L = 0.22, + Ma = 0.3, + Mw = 3, caliber = 0.066, - chute_Cx = 0, - chute_cut_time = 0, - chute_diam = 0, - chute_open_time = 0, - chute_rnd_coeff = 0, + chute_Cx = 1, + chute_Ma = 2, + chute_Mw = 20, + chute_cut_time = 9999, + chute_diam = 0.4, + chute_open_time = 0.05, + chute_rnd_coeff = 0.1, + chute_rnd_cont_uniform_distr = true, + conn_num = 19, + conn_order = -1, + connectors_model_name = "BLG-66", count = 151, - cx_coeff = { 0, 0.4, 0.7, 0.6, 1.4 }, - effect_count = 40, - explosion_center = { { 0.616, -0.17, 0 }, { 0.47, -0.17, 0 }, { 0.327, -0.17, 0 }, { 0.185, -0.17, 0 }, { -0.006, -0.17, 0 }, { -0.152, -0.17, 0 }, { -0.43, -0.17, 0 }, { -0.575, -0.17, 0 }, { -0.718, -0.17, 0 }, { -0.86, -0.17, 0 } }, - explosion_impulse_coeff = 4, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 30, explosion_style = 0, + first_dir_ang_offsets = { 2.3561944901923, 1.9634954084936 }, impulse_sigma = 1, - mass = 1.3, - model_name = "RBK_250_PTAB_25M_bomb", + init_imp_scalar = 60, + mass = 1.2, + model_name = "GR66AC", moment_sigma = 2, op_time = 400, - release_rnd_coeff = 0, - spawn_options = { { 0, 0, 15 }, { 1, 1, 15 }, { 2, 2, 16 }, { 3, 3, 15 }, { 4, 4, 15 }, { 5, 5, 15 }, { 6, 6, 15 }, { 7, 7, 15 }, { 8, 8, 15 }, { 9, 9, 15 } }, - wind_sigma = 20 + radial_offset = 0.18, + rel_dir_num = 8, + release_omega_0 = true, + release_rnd_coeff = 0.1, + spawn_options = { { 0, 0, 8 }, { 1, 1, 8 }, { 2, 2, 8 }, { 3, 3, 8 }, { 4, 4, 8 }, { 5, 5, 8 }, { 6, 6, 8 }, { 7, 7, 8 }, { 8, 8, 8 }, { 9, 9, 8 }, { 10, 10, 8 }, { 11, 11, 8 }, { 12, 12, 7 }, { 13, 13, 8 }, { 14, 14, 8 }, { 15, 15, 8 }, { 16, 16, 8 }, { 17, 17, 8 }, { 18, 18, 8 } }, + wind_sigma = 20, + xoy_angle = 2.3561944901923 }, dispenser = { - I = 281.84, - L = 3.33, + I = 272.25, + L = 3.3, Ma = 0.23, Mw = 2.33, caliber = 0.36, - chute_Cx = 1, + chute_Cx = 3, chute_cut_time = 0.7, - chute_diam = 2, + chute_diam = 1.4, chute_open_time = 0.1, chute_rnd_coeff = 0, count = 1, - cx_coeff = { 0, 0.9, 0.9, 1, 2 }, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, effect_count = 1, impulse_sigma = 1, - mass = 305, - model_name = "M2000C_BLG66", + mass = 300, + model_name = "BLG-66", moment_sigma = 1, - op_spawns = 10, - op_time = 300, - spawn_height = {}, - spawn_time = { 0.1, 0.18, 0.26, 0.34, 0.42, 0.5, 0.58, 0.64, 0.72, 0.8 }, - spawn_weight_loss = { 19.5, 19.5, 20.8, 19.5, 19.5, 19.5, 19.5, 19.5, 19.5, 19.5 }, + op_spawns = 19, + op_time = 20, + set_changing_args = { 28, 1, 0, 0.34, 1 }, + set_start_args = { 1 }, + spawn_args_change = { { 0, 4, 0.05 }, { 1, 4, 0.1 }, { 2, 4, 0.15 }, { 3, 4, 0.2 }, { 4, 4, 0.25 }, { 5, 4, 0.3 }, { 6, 4, 0.35 }, { 7, 4, 0.4 }, { 8, 4, 0.45 }, { 9, 4, 0.5 }, { 10, 4, 0.55 }, { 11, 4, 0.6 }, { 12, 4, 0.65 }, { 13, 4, 0.7 }, { 14, 4, 0.75 }, { 15, 4, 0.8 }, { 16, 4, 0.85 }, { 17, 4, 0.9 }, { 18, 4, 1 } }, + spawn_interval = 0.06, + spawn_time = {}, + spawn_weight_loss = { 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 8.4, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6 }, use_effects = 1, wind_sigma = 20 }, empty_dispenser = { - I = 101.65, - L = 3.33, - Ma = 0.03, - Mw = 0.3, + I = 107.811, + L = 3.3, + Ma = 0.23, + Mw = 2.33, caliber = 0.36, connectors_model_name = "", count = 1, - cx_coeff = { 1, 1, 1, 1, 2 }, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, effect_count = 1, impulse_sigma = 1, - mass = 108.7, - model_name = "M2000C_BLG66", + mass = 118.8, + model_name = "BLG-66", moment_sigma = 1, op_time = 300, - spawn_options = { { 9, 9, 1 } }, + set_changing_args = { 0, -0.1, -1, 0.01, 0, 28, 1, 0, 0.34, 1 }, + set_start_args = { 1, 4 }, + spawn_options = { { 18, 18, 1 } }, wind_sigma = 5 }, - scheme = "schemes/cluster/disp_bomblets_empty_disp.sch", + scheme = "schemes/cluster/disp_bomblets_rad_rel_empty_disp.sch", warhead = { - caliber = 68, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, + caliber = 66, + concrete_factors = { 1.6, 1.6, 1 }, + concrete_obj_factor = 1.6, cumulative_factor = 3, - cumulative_thickness = 0.4, - expl_mass = 0.65, + cumulative_thickness = 0.3, + expl_mass = 0.8, fantom = 1, - mass = 2.8, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0.56 + mass = 1.2, + obj_factors = { 1.6, 1 }, + other_factors = { 1.6, 1.6, 1 }, + piercing_mass = 0.24 } }, - display_name = "BLG-66", + display_name = "BLG-66 AC", mass = 0, model = "", - name = "BLG-66", + name = "BLG-66 AC", server = { bomblets = { - I = 0.09, - L = 0.151, - Ma = 0.03, - Mw = 0.3, + I = 0.00484, + L = 0.22, + Ma = 0.3, + Mw = 3, caliber = 0.066, - chute_Cx = 0, - chute_cut_time = 0, - chute_diam = 0, - chute_open_time = 0, - chute_rnd_coeff = 0, + chute_Cx = 1, + chute_Ma = 2, + chute_Mw = 20, + chute_cut_time = 9999, + chute_diam = 0.4, + chute_open_time = 0.05, + chute_rnd_coeff = 0.1, + chute_rnd_cont_uniform_distr = true, + conn_num = 19, + conn_order = -1, + connectors_model_name = "BLG-66", count = 151, - cx_coeff = { 0, 0.4, 0.7, 0.6, 1.4 }, - effect_count = 40, - explosion_center = { { 0.616, -0.17, 0 }, { 0.47, -0.17, 0 }, { 0.327, -0.17, 0 }, { 0.185, -0.17, 0 }, { -0.006, -0.17, 0 }, { -0.152, -0.17, 0 }, { -0.43, -0.17, 0 }, { -0.575, -0.17, 0 }, { -0.718, -0.17, 0 }, { -0.86, -0.17, 0 } }, - explosion_impulse_coeff = 4, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 30, explosion_style = 0, + first_dir_ang_offsets = { 2.3561944901923, 1.9634954084936 }, impulse_sigma = 1, - mass = 1.3, - model_name = "RBK_250_PTAB_25M_bomb", + init_imp_scalar = 60, + mass = 1.2, + model_name = "GR66AC", moment_sigma = 2, op_time = 400, - release_rnd_coeff = 0, - spawn_options = { { 0, 0, 15 }, { 1, 1, 15 }, { 2, 2, 16 }, { 3, 3, 15 }, { 4, 4, 15 }, { 5, 5, 15 }, { 6, 6, 15 }, { 7, 7, 15 }, { 8, 8, 15 }, { 9, 9, 15 } }, - wind_sigma = 20 + radial_offset = 0.18, + rel_dir_num = 8, + release_omega_0 = true, + release_rnd_coeff = 0.1, + spawn_options = { { 0, 0, 8 }, { 1, 1, 8 }, { 2, 2, 8 }, { 3, 3, 8 }, { 4, 4, 8 }, { 5, 5, 8 }, { 6, 6, 8 }, { 7, 7, 8 }, { 8, 8, 8 }, { 9, 9, 8 }, { 10, 10, 8 }, { 11, 11, 8 }, { 12, 12, 7 }, { 13, 13, 8 }, { 14, 14, 8 }, { 15, 15, 8 }, { 16, 16, 8 }, { 17, 17, 8 }, { 18, 18, 8 } }, + wind_sigma = 20, + xoy_angle = 2.3561944901923 }, dispenser = { - I = 281.84, - L = 3.33, + I = 272.25, + L = 3.3, Ma = 0.23, Mw = 2.33, caliber = 0.36, - chute_Cx = 1, + chute_Cx = 3, chute_cut_time = 0.7, - chute_diam = 2, + chute_diam = 1.4, chute_open_time = 0.1, chute_rnd_coeff = 0, count = 1, - cx_coeff = { 0, 0.9, 0.9, 1, 2 }, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, effect_count = 1, impulse_sigma = 1, - mass = 305, - model_name = "M2000C_BLG66", + mass = 300, + model_name = "BLG-66", moment_sigma = 1, - op_spawns = 10, - op_time = 300, - spawn_height = {}, - spawn_time = { 0.1, 0.18, 0.26, 0.34, 0.42, 0.5, 0.58, 0.64, 0.72, 0.8 }, - spawn_weight_loss = { 19.5, 19.5, 20.8, 19.5, 19.5, 19.5, 19.5, 19.5, 19.5, 19.5 }, + op_spawns = 19, + op_time = 20, + set_changing_args = { 28, 1, 0, 0.34, 1 }, + set_start_args = { 1 }, + spawn_args_change = { { 0, 4, 0.05 }, { 1, 4, 0.1 }, { 2, 4, 0.15 }, { 3, 4, 0.2 }, { 4, 4, 0.25 }, { 5, 4, 0.3 }, { 6, 4, 0.35 }, { 7, 4, 0.4 }, { 8, 4, 0.45 }, { 9, 4, 0.5 }, { 10, 4, 0.55 }, { 11, 4, 0.6 }, { 12, 4, 0.65 }, { 13, 4, 0.7 }, { 14, 4, 0.75 }, { 15, 4, 0.8 }, { 16, 4, 0.85 }, { 17, 4, 0.9 }, { 18, 4, 1 } }, + spawn_interval = 0.06, + spawn_time = {}, + spawn_weight_loss = { 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 8.4, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6 }, use_effects = 1, wind_sigma = 20 }, empty_dispenser = { - I = 101.65, - L = 3.33, - Ma = 0.03, - Mw = 0.3, + I = 107.811, + L = 3.3, + Ma = 0.23, + Mw = 2.33, caliber = 0.36, connectors_model_name = "", count = 1, - cx_coeff = { 1, 1, 1, 1, 2 }, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, effect_count = 1, impulse_sigma = 1, - mass = 108.7, - model_name = "M2000C_BLG66", + mass = 118.8, + model_name = "BLG-66", moment_sigma = 1, op_time = 300, - spawn_options = { { 9, 9, 1 } }, + set_changing_args = { 0, -0.1, -1, 0.01, 0, 28, 1, 0, 0.34, 1 }, + set_start_args = { 1, 4 }, + spawn_options = { { 18, 18, 1 } }, wind_sigma = 5 }, - scheme = "schemes/cluster/disp_bomblets_empty_disp.sch", + scheme = "schemes/cluster/disp_bomblets_rad_rel_empty_disp.sch", warhead = { - caliber = 68, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, + caliber = 66, + concrete_factors = { 1.6, 1.6, 1 }, + concrete_obj_factor = 1.6, cumulative_factor = 3, - cumulative_thickness = 0.4, - expl_mass = 0.65, + cumulative_thickness = 0.3, + expl_mass = 0.8, fantom = 0, - mass = 2.8, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0.56 + mass = 1.2, + obj_factors = { 1.6, 1 }, + other_factors = { 1.6, 1.6, 1 }, + piercing_mass = 0.24 } }, sounderName = "Weapons/ClusterBomblets", @@ -482,21 +540,19 @@ _G["weapons_table"]["weapons"]["bombs"]["BLG66"] = { }, server = 1 }, - mass = 305, - model = "M2000C_BLG66", + mass = 300, + model = "BLG-66", name = "BLG66", scheme = "schemes/bombs/bomb-cassette.sch", shape_table_data = { { - file = "M2000C_BLG66", - fire = { 0, 1 }, + file = "BLG-66", index = "Redacted", - life = 1, name = "BLG66", username = "BLG-66 Belouga AC" } }, targeting_data = { - bomblet_char_time = 27.5, - char_time = 20.43 + bomblet_char_time = 62.5, + char_time = 21 }, type = 5, user_name = "BLG-66 Belouga AC", @@ -504,8 +560,8 @@ _G["weapons_table"]["weapons"]["bombs"]["BLG66"] = { }, sounderName = "Weapons/Bomb", targeting_data = { - bomblet_char_time = 27.5, - char_time = 20.43 + bomblet_char_time = 62.5, + char_time = 21 }, type_name = "bomb", ws_type = { 4, 5, 38, "Redacted" } diff --git a/_G/weapons_table/weapons/bombs/BLG66_EG.lua b/_G/weapons_table/weapons/bombs/BLG66_EG.lua new file mode 100644 index 00000000..a38c1f33 --- /dev/null +++ b/_G/weapons_table/weapons/bombs/BLG66_EG.lua @@ -0,0 +1,568 @@ +_G["weapons_table"]["weapons"]["bombs"]["BLG66_EG"] = { + I = 272.25, + L = 3.3, + Reflection = 0.03, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.bombs.BLG66_EG", + caliber = 0.36, + client = { + Ag = -1.23, + Cx = 0.000413, + Reflection = 0.03, + VyHold = -100, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", + _origin = "AircraftWeaponPack", + arming_delay = { + delay_time = 0.8, + enabled = true + }, + arming_vane = { + enabled = false, + velK = 1 + }, + category = 1, + class_name = "wAmmunition", + control = { + open_delay = 1.26 + }, + display_name_short = "BLG-66", + explMass = 2, + fm = { + I = 272.25, + L = 3.3, + Ma = 0.23, + Mw = 2.33, + caliber = 0.36, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + mass = 300, + release_rnd = 0.3, + release_rnd_x = 1, + wind_sigma = 15, + wind_time = 1000 + }, + hMax = 250, + hMin = 85, + launcher = { + blocks = { "cluster" }, + cluster = { + _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", + _origin = "AircraftWeaponPack", + char_time = 0, + client = { + bomblets = { + I = 0.00484, + L = 0.22, + Ma = 0.3, + Mw = 3, + caliber = 0.066, + chute_Cx = 1, + chute_Ma = 2, + chute_Mw = 20, + chute_cut_time = 9999, + chute_diam = 0.4, + chute_open_time = 0.05, + chute_rnd_coeff = 0.1, + chute_rnd_cont_uniform_distr = true, + conn_num = 19, + conn_order = -1, + connectors_model_name = "BLG-66", + count = 151, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 30, + explosion_style = 0, + first_dir_ang_offsets = { 2.3561944901923, 1.9634954084936 }, + impulse_sigma = 1, + init_imp_scalar = 60, + mass = 1.2, + model_name = "GR66EG", + moment_sigma = 2, + op_time = 400, + radial_offset = 0.18, + rel_dir_num = 8, + release_omega_0 = true, + release_rnd_coeff = 0.1, + spawn_options = { { 0, 0, 8 }, { 1, 1, 8 }, { 2, 2, 8 }, { 3, 3, 8 }, { 4, 4, 8 }, { 5, 5, 8 }, { 6, 6, 8 }, { 7, 7, 8 }, { 8, 8, 8 }, { 9, 9, 8 }, { 10, 10, 8 }, { 11, 11, 8 }, { 12, 12, 7 }, { 13, 13, 8 }, { 14, 14, 8 }, { 15, 15, 8 }, { 16, 16, 8 }, { 17, 17, 8 }, { 18, 18, 8 } }, + wind_sigma = 20, + xoy_angle = 2.3561944901923 + }, + dispenser = { + I = 272.25, + L = 3.3, + Ma = 0.23, + Mw = 2.33, + caliber = 0.36, + chute_Cx = 3, + chute_cut_time = 0.7, + chute_diam = 1.4, + chute_open_time = 0.1, + chute_rnd_coeff = 0, + count = 1, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 1, + impulse_sigma = 1, + mass = 300, + model_name = "BLG-66", + moment_sigma = 1, + op_spawns = 19, + op_time = 20, + set_changing_args = { 28, 1, 0, 0.34, 1 }, + set_start_args = { 1 }, + spawn_args_change = { { 0, 4, 0.05 }, { 1, 4, 0.1 }, { 2, 4, 0.15 }, { 3, 4, 0.2 }, { 4, 4, 0.25 }, { 5, 4, 0.3 }, { 6, 4, 0.35 }, { 7, 4, 0.4 }, { 8, 4, 0.45 }, { 9, 4, 0.5 }, { 10, 4, 0.55 }, { 11, 4, 0.6 }, { 12, 4, 0.65 }, { 13, 4, 0.7 }, { 14, 4, 0.75 }, { 15, 4, 0.8 }, { 16, 4, 0.85 }, { 17, 4, 0.9 }, { 18, 4, 1 } }, + spawn_interval = 0.06, + spawn_time = {}, + spawn_weight_loss = { 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 8.4, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6 }, + use_effects = 1, + wind_sigma = 20 + }, + empty_dispenser = { + I = 107.811, + L = 3.3, + Ma = 0.23, + Mw = 2.33, + caliber = 0.36, + connectors_model_name = "", + count = 1, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 1, + impulse_sigma = 1, + mass = 118.8, + model_name = "BLG-66", + moment_sigma = 1, + op_time = 300, + set_changing_args = { 0, -0.1, -1, 0.01, 0, 28, 1, 0, 0.34, 1 }, + set_start_args = { 1, 4 }, + spawn_options = { { 18, 18, 1 } }, + wind_sigma = 5 + }, + scheme = "schemes/cluster/disp_bomblets_rad_rel_empty_disp.sch", + warhead = { + caliber = 66, + concrete_factors = { 1.6, 1.6, 1.6 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 0.8, + fantom = 1, + mass = 1.2, + obj_factors = { 1.6, 1.6 }, + other_factors = { 1.6, 1.6, 1.6 }, + piercing_mass = 0.24 + } + }, + display_name = "BLG-66 EG", + mass = 0, + model = "", + name = "BLG-66 EG", + server = { + bomblets = { + I = 0.00484, + L = 0.22, + Ma = 0.3, + Mw = 3, + caliber = 0.066, + chute_Cx = 1, + chute_Ma = 2, + chute_Mw = 20, + chute_cut_time = 9999, + chute_diam = 0.4, + chute_open_time = 0.05, + chute_rnd_coeff = 0.1, + chute_rnd_cont_uniform_distr = true, + conn_num = 19, + conn_order = -1, + connectors_model_name = "BLG-66", + count = 151, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 30, + explosion_style = 0, + first_dir_ang_offsets = { 2.3561944901923, 1.9634954084936 }, + impulse_sigma = 1, + init_imp_scalar = 60, + mass = 1.2, + model_name = "GR66EG", + moment_sigma = 2, + op_time = 400, + radial_offset = 0.18, + rel_dir_num = 8, + release_omega_0 = true, + release_rnd_coeff = 0.1, + spawn_options = { { 0, 0, 8 }, { 1, 1, 8 }, { 2, 2, 8 }, { 3, 3, 8 }, { 4, 4, 8 }, { 5, 5, 8 }, { 6, 6, 8 }, { 7, 7, 8 }, { 8, 8, 8 }, { 9, 9, 8 }, { 10, 10, 8 }, { 11, 11, 8 }, { 12, 12, 7 }, { 13, 13, 8 }, { 14, 14, 8 }, { 15, 15, 8 }, { 16, 16, 8 }, { 17, 17, 8 }, { 18, 18, 8 } }, + wind_sigma = 20, + xoy_angle = 2.3561944901923 + }, + dispenser = { + I = 272.25, + L = 3.3, + Ma = 0.23, + Mw = 2.33, + caliber = 0.36, + chute_Cx = 3, + chute_cut_time = 0.7, + chute_diam = 1.4, + chute_open_time = 0.1, + chute_rnd_coeff = 0, + count = 1, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 1, + impulse_sigma = 1, + mass = 300, + model_name = "BLG-66", + moment_sigma = 1, + op_spawns = 19, + op_time = 20, + set_changing_args = { 28, 1, 0, 0.34, 1 }, + set_start_args = { 1 }, + spawn_args_change = { { 0, 4, 0.05 }, { 1, 4, 0.1 }, { 2, 4, 0.15 }, { 3, 4, 0.2 }, { 4, 4, 0.25 }, { 5, 4, 0.3 }, { 6, 4, 0.35 }, { 7, 4, 0.4 }, { 8, 4, 0.45 }, { 9, 4, 0.5 }, { 10, 4, 0.55 }, { 11, 4, 0.6 }, { 12, 4, 0.65 }, { 13, 4, 0.7 }, { 14, 4, 0.75 }, { 15, 4, 0.8 }, { 16, 4, 0.85 }, { 17, 4, 0.9 }, { 18, 4, 1 } }, + spawn_interval = 0.06, + spawn_time = {}, + spawn_weight_loss = { 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 8.4, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6 }, + use_effects = 1, + wind_sigma = 20 + }, + empty_dispenser = { + I = 107.811, + L = 3.3, + Ma = 0.23, + Mw = 2.33, + caliber = 0.36, + connectors_model_name = "", + count = 1, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 1, + impulse_sigma = 1, + mass = 118.8, + model_name = "BLG-66", + moment_sigma = 1, + op_time = 300, + set_changing_args = { 0, -0.1, -1, 0.01, 0, 28, 1, 0, 0.34, 1 }, + set_start_args = { 1, 4 }, + spawn_options = { { 18, 18, 1 } }, + wind_sigma = 5 + }, + scheme = "schemes/cluster/disp_bomblets_rad_rel_empty_disp.sch", + warhead = { + caliber = 66, + concrete_factors = { 1.6, 1.6, 1.6 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 0.8, + fantom = 0, + mass = 1.2, + obj_factors = { 1.6, 1.6 }, + other_factors = { 1.6, 1.6, 1.6 }, + piercing_mass = 0.24 + } + }, + sounderName = "Weapons/ClusterBomblets", + type_name = "cluster", + ws_type = { 4, 5, 38, "Redacted" } + }, + server = 0 + }, + mass = 300, + model = "BLG-66", + name = "BLG66_EG", + scheme = "schemes/bombs/bomb-cassette.sch", + shape_table_data = { { + file = "BLG-66", + index = "Redacted", + name = "BLG66_EG", + username = "BLG-66 Belouga EG" + } }, + targeting_data = { + bomblet_char_time = 62.5, + char_time = 21 + }, + type = 5, + user_name = "BLG-66 Belouga EG", + wsTypeOfWeapon = { 4, 5, 38, "Redacted" } + }, + cx = { 1, 0.39, 0.6, 0.168, 1.31 }, + display_name = "BLG-66 Belouga EG", + display_name_short = "BLG-66", + mass = 300, + model = "BLG-66", + name = "BLG66_EG", + server = { + Ag = -1.23, + Cx = 0.000413, + Reflection = 0.03, + VyHold = -100, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", + _origin = "AircraftWeaponPack", + arming_delay = { + delay_time = 0.8, + enabled = true + }, + arming_vane = { + enabled = false, + velK = 1 + }, + category = 1, + class_name = "wAmmunition", + control = { + open_delay = 1.26 + }, + display_name_short = "BLG-66", + explMass = 2, + fm = { + I = 272.25, + L = 3.3, + Ma = 0.23, + Mw = 2.33, + caliber = 0.36, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + mass = 300, + release_rnd = 0.3, + release_rnd_x = 1, + wind_sigma = 15, + wind_time = 1000 + }, + hMax = 250, + hMin = 85, + launcher = { + blocks = { "cluster" }, + cluster = { + _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", + _origin = "AircraftWeaponPack", + char_time = 0, + client = { + bomblets = { + I = 0.00484, + L = 0.22, + Ma = 0.3, + Mw = 3, + caliber = 0.066, + chute_Cx = 1, + chute_Ma = 2, + chute_Mw = 20, + chute_cut_time = 9999, + chute_diam = 0.4, + chute_open_time = 0.05, + chute_rnd_coeff = 0.1, + chute_rnd_cont_uniform_distr = true, + conn_num = 19, + conn_order = -1, + connectors_model_name = "BLG-66", + count = 151, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 30, + explosion_style = 0, + first_dir_ang_offsets = { 2.3561944901923, 1.9634954084936 }, + impulse_sigma = 1, + init_imp_scalar = 60, + mass = 1.2, + model_name = "GR66EG", + moment_sigma = 2, + op_time = 400, + radial_offset = 0.18, + rel_dir_num = 8, + release_omega_0 = true, + release_rnd_coeff = 0.1, + spawn_options = { { 0, 0, 8 }, { 1, 1, 8 }, { 2, 2, 8 }, { 3, 3, 8 }, { 4, 4, 8 }, { 5, 5, 8 }, { 6, 6, 8 }, { 7, 7, 8 }, { 8, 8, 8 }, { 9, 9, 8 }, { 10, 10, 8 }, { 11, 11, 8 }, { 12, 12, 7 }, { 13, 13, 8 }, { 14, 14, 8 }, { 15, 15, 8 }, { 16, 16, 8 }, { 17, 17, 8 }, { 18, 18, 8 } }, + wind_sigma = 20, + xoy_angle = 2.3561944901923 + }, + dispenser = { + I = 272.25, + L = 3.3, + Ma = 0.23, + Mw = 2.33, + caliber = 0.36, + chute_Cx = 3, + chute_cut_time = 0.7, + chute_diam = 1.4, + chute_open_time = 0.1, + chute_rnd_coeff = 0, + count = 1, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 1, + impulse_sigma = 1, + mass = 300, + model_name = "BLG-66", + moment_sigma = 1, + op_spawns = 19, + op_time = 20, + set_changing_args = { 28, 1, 0, 0.34, 1 }, + set_start_args = { 1 }, + spawn_args_change = { { 0, 4, 0.05 }, { 1, 4, 0.1 }, { 2, 4, 0.15 }, { 3, 4, 0.2 }, { 4, 4, 0.25 }, { 5, 4, 0.3 }, { 6, 4, 0.35 }, { 7, 4, 0.4 }, { 8, 4, 0.45 }, { 9, 4, 0.5 }, { 10, 4, 0.55 }, { 11, 4, 0.6 }, { 12, 4, 0.65 }, { 13, 4, 0.7 }, { 14, 4, 0.75 }, { 15, 4, 0.8 }, { 16, 4, 0.85 }, { 17, 4, 0.9 }, { 18, 4, 1 } }, + spawn_interval = 0.06, + spawn_time = {}, + spawn_weight_loss = { 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 8.4, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6 }, + use_effects = 1, + wind_sigma = 20 + }, + empty_dispenser = { + I = 107.811, + L = 3.3, + Ma = 0.23, + Mw = 2.33, + caliber = 0.36, + connectors_model_name = "", + count = 1, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 1, + impulse_sigma = 1, + mass = 118.8, + model_name = "BLG-66", + moment_sigma = 1, + op_time = 300, + set_changing_args = { 0, -0.1, -1, 0.01, 0, 28, 1, 0, 0.34, 1 }, + set_start_args = { 1, 4 }, + spawn_options = { { 18, 18, 1 } }, + wind_sigma = 5 + }, + scheme = "schemes/cluster/disp_bomblets_rad_rel_empty_disp.sch", + warhead = { + caliber = 66, + concrete_factors = { 1.6, 1.6, 1.6 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 0.8, + fantom = 1, + mass = 1.2, + obj_factors = { 1.6, 1.6 }, + other_factors = { 1.6, 1.6, 1.6 }, + piercing_mass = 0.24 + } + }, + display_name = "BLG-66 EG", + mass = 0, + model = "", + name = "BLG-66 EG", + server = { + bomblets = { + I = 0.00484, + L = 0.22, + Ma = 0.3, + Mw = 3, + caliber = 0.066, + chute_Cx = 1, + chute_Ma = 2, + chute_Mw = 20, + chute_cut_time = 9999, + chute_diam = 0.4, + chute_open_time = 0.05, + chute_rnd_coeff = 0.1, + chute_rnd_cont_uniform_distr = true, + conn_num = 19, + conn_order = -1, + connectors_model_name = "BLG-66", + count = 151, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 30, + explosion_style = 0, + first_dir_ang_offsets = { 2.3561944901923, 1.9634954084936 }, + impulse_sigma = 1, + init_imp_scalar = 60, + mass = 1.2, + model_name = "GR66EG", + moment_sigma = 2, + op_time = 400, + radial_offset = 0.18, + rel_dir_num = 8, + release_omega_0 = true, + release_rnd_coeff = 0.1, + spawn_options = { { 0, 0, 8 }, { 1, 1, 8 }, { 2, 2, 8 }, { 3, 3, 8 }, { 4, 4, 8 }, { 5, 5, 8 }, { 6, 6, 8 }, { 7, 7, 8 }, { 8, 8, 8 }, { 9, 9, 8 }, { 10, 10, 8 }, { 11, 11, 8 }, { 12, 12, 7 }, { 13, 13, 8 }, { 14, 14, 8 }, { 15, 15, 8 }, { 16, 16, 8 }, { 17, 17, 8 }, { 18, 18, 8 } }, + wind_sigma = 20, + xoy_angle = 2.3561944901923 + }, + dispenser = { + I = 272.25, + L = 3.3, + Ma = 0.23, + Mw = 2.33, + caliber = 0.36, + chute_Cx = 3, + chute_cut_time = 0.7, + chute_diam = 1.4, + chute_open_time = 0.1, + chute_rnd_coeff = 0, + count = 1, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 1, + impulse_sigma = 1, + mass = 300, + model_name = "BLG-66", + moment_sigma = 1, + op_spawns = 19, + op_time = 20, + set_changing_args = { 28, 1, 0, 0.34, 1 }, + set_start_args = { 1 }, + spawn_args_change = { { 0, 4, 0.05 }, { 1, 4, 0.1 }, { 2, 4, 0.15 }, { 3, 4, 0.2 }, { 4, 4, 0.25 }, { 5, 4, 0.3 }, { 6, 4, 0.35 }, { 7, 4, 0.4 }, { 8, 4, 0.45 }, { 9, 4, 0.5 }, { 10, 4, 0.55 }, { 11, 4, 0.6 }, { 12, 4, 0.65 }, { 13, 4, 0.7 }, { 14, 4, 0.75 }, { 15, 4, 0.8 }, { 16, 4, 0.85 }, { 17, 4, 0.9 }, { 18, 4, 1 } }, + spawn_interval = 0.06, + spawn_time = {}, + spawn_weight_loss = { 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6, 8.4, 9.6, 9.6, 9.6, 9.6, 9.6, 9.6 }, + use_effects = 1, + wind_sigma = 20 + }, + empty_dispenser = { + I = 107.811, + L = 3.3, + Ma = 0.23, + Mw = 2.33, + caliber = 0.36, + connectors_model_name = "", + count = 1, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + effect_count = 1, + impulse_sigma = 1, + mass = 118.8, + model_name = "BLG-66", + moment_sigma = 1, + op_time = 300, + set_changing_args = { 0, -0.1, -1, 0.01, 0, 28, 1, 0, 0.34, 1 }, + set_start_args = { 1, 4 }, + spawn_options = { { 18, 18, 1 } }, + wind_sigma = 5 + }, + scheme = "schemes/cluster/disp_bomblets_rad_rel_empty_disp.sch", + warhead = { + caliber = 66, + concrete_factors = { 1.6, 1.6, 1.6 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 0.8, + fantom = 0, + mass = 1.2, + obj_factors = { 1.6, 1.6 }, + other_factors = { 1.6, 1.6, 1.6 }, + piercing_mass = 0.24 + } + }, + sounderName = "Weapons/ClusterBomblets", + type_name = "cluster", + ws_type = { 4, 5, 38, "Redacted" } + }, + server = 1 + }, + mass = 300, + model = "BLG-66", + name = "BLG66_EG", + scheme = "schemes/bombs/bomb-cassette.sch", + shape_table_data = { { + file = "BLG-66", + index = "Redacted", + name = "BLG66_EG", + username = "BLG-66 Belouga EG" + } }, + targeting_data = { + bomblet_char_time = 62.5, + char_time = 21 + }, + type = 5, + user_name = "BLG-66 Belouga EG", + wsTypeOfWeapon = { 4, 5, 38, "Redacted" } + }, + sounderName = "Weapons/Bomb", + targeting_data = { + bomblet_char_time = 62.5, + char_time = 21 + }, + type_name = "bomb", + ws_type = { 4, 5, 38, "Redacted" } +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/bombs/LS-6-100.lua b/_G/weapons_table/weapons/bombs/LS-6-100.lua deleted file mode 100644 index aeb1e608..00000000 --- a/_G/weapons_table/weapons/bombs/LS-6-100.lua +++ /dev/null @@ -1,236 +0,0 @@ -_G["weapons_table"]["weapons"]["bombs"]["LS-6-100"] = { - I = 26.5, - L = 0.032, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/jdam_ls6.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - _unique_resource_name = "weapons.bombs.LS-6-100", - caliber = 0.16, - client = { - Ag = -1.23, - AspectDistData = { 15, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 2, 9, 14, 23, 20, 20, 20, 24, 13, 10, 500, 2, 10, 15, 24, 37, 23, 19, 24, 13, 14, 700, 4, 10, 16, 24, 38, 29, 32, 32, 20, 18, 1000, 6, 10, 17, 26, 38, 26, 33, 34, 36, 38, 2000, 8, 10, 24, 29, 38, 20, 28, 34, 45, 45, 3000, 10, 20, 24, 32, 40, 15, 22, 34, 45, 45, 4000, 12, 20, 24, 33, 40, 15, 45, 36, 45, 45, 5000, 14, 20, 36, 40, 40, 40, 45, 36, 45, 45, 6000, 16, 18, 40, 40, 42, 45, 45, 36, 45, 45, 7000, 18, 38, 45, 35, 45, 45, 45, 45, 45, 45, 8000, 20, 22, 35, 35, 45, 45, 45, 45, 45, 35, 9000, 20, 22, 28, 28, 43, 45, 45, 45, 45, 35, 10000, 20, 22, 28, 33, 42, 45, 45, 45, 45, 35, 11000, 20, 22, 28, 34, 36, 38, 45, 45, 45, 45, 12000, 16, 21, 27, 33, 36, 38, 45, 45, 45, 45 }, - Cx = 0.00043, - LaunchDistData = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 1090, 1890, 3760, 6310, 7350, 5760, 16090, 16910, 16850, 22820, 500, 1240, 1960, 3830, 6140, 8520, 13590, 13990, 13620, 22740, 22790, 700, 1000, 2120, 3960, 6680, 9620, 15840, 15840, 16160, 22840, 22840, 1000, 1860, 2380, 4380, 6920, 10020, 16100, 20560, 21900, 21920, 26160, 2000, 2400, 4850, 4950, 7850, 11300, 20200, 22850, 22900, 22900, 26750, 3000, 4550, 5950, 8550, 8600, 12200, 22900, 26650, 26700, 26750, 26750, 4000, 3850, 7050, 9350, 9400, 13150, 25750, 25800, 25850, 25900, 30350, 5000, 7300, 7400, 11900, 18700, 18800, 28500, 30200, 30300, 30300, 30400, 6000, 5600, 7300, 13000, 21100, 20000, 32000, 32000, 32000, 32100, 32200, 7000, 6800, 8700, 15400, 15400, 15400, 30500, 30500, 30500, 30700, 47600, 8000, 8000, 14200, 18600, 23200, 27200, 36200, 36200, 36200, 36400, 51200, 9000, 9200, 16400, 20800, 24200, 31800, 34200, 34200, 34200, 34200, 55000, 10000, 15600, 18000, 23200, 26400, 32800, 40200, 42800, 42800, 42800, 59000, 11000, 16500, 21000, 25500, 28500, 33500, 41000, 48000, 53500, 58000, 62500, 12000, 20000, 23000, 26000, 30500, 34500, 42500, 49500, 56000, 61000, 66500, 13000, 27000, 24500, 29000, 33000, 37000, 43000, 51000, 58000, 64500, 70000, 14000, 21000, 32000, 35500, 36500, 39000, 44000, 52000, 60000, 67500, 73500, 15000, 23000, 33000, 39000, 40000, 42000, 46500, 53000, 61500, 69500, 77000 }, - MaxTOF = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 11.4, 14.2, 24.8, 33.7, 27.6, 17.8, 65.9, 53.1, 49, 84.5, 500, 13, 15.8, 26, 28.6, 34.1, 48.8, 50.7, 39.8, 90.1, 63.7, 700, 11.3, 16.5, 24.6, 36.9, 46.1, 74.1, 62.7, 49.2, 72.7, 69.6, 1000, 19.3, 19.5, 29.1, 36.7, 49.4, 77.6, 88.3, 86.4, 84.8, 83.6, 2000, 26.3, 38.2, 30.7, 42.1, 55.9, 91, 91.7, 89.5, 84.3, 88.3, 3000, 40.2, 46.1, 59.7, 47.4, 57.6, 99.1, 108, 103.4, 116.7, 92.6, 4000, 38.1, 53.3, 60.6, 52.8, 62, 109.4, 99.7, 117.7, 91.9, 98.1, 5000, 57.2, 54.7, 78.1, 104, 100.2, 120.2, 117.1, 120.2, 136.6, 100, 6000, 53.6, 54.8, 83.2, 104.8, 103.7, 142.7, 122, 124.1, 142, 103, 7000, 60.8, 69, 93.8, 80.1, 73.1, 120.8, 119.1, 138.3, 102.3, 158.1, 8000, 67.7, 102.8, 109, 110.5, 134.5, 134.1, 143.5, 154.1, 156.8, 158.9, 9000, 74, 97.7, 119, 115.3, 131.1, 137.7, 135.6, 153.9, 109.5, 168.9, 10000, 107.1, 103.7, 126.3, 132, 134.8, 150.8, 151.4, 179.9, 173.6, 179.7, 11000, 110.7, 118.7, 133.9, 138.8, 136.9, 151.1, 166.9, 177.4, 182.1, 187.2, 12000, 123.1, 127.6, 136.9, 142.4, 132.3, 158.5, 170.2, 184.1, 188.9, 197.4, 13000, 128.2, 136, 143, 148.8, 159.8, 158.9, 174.9, 188, 199, 204.7, 14000, 135.4, 163.9, 155.1, 160, 161.7, 165, 177.7, 193.5, 206.8, 212.5, 15000, 145, 173.8, 163.8, 166.4, 170, 180.5, 182.6, 197.6, 209.5, 221.3 }, - MidTOF = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 11.1, 10, 13, 16.5, 15.9, 11.7, 41.6, 45.5, 38.3, 55.6, 500, 12.7, 10.8, 13.6, 16.2, 18.4, 26.1, 37.4, 22.1, 50.6, 49.1, 700, 11.2, 12.7, 14.4, 17.7, 20.8, 30.9, 28, 36.2, 6.2, 34.4, 1000, 16.7, 14.4, 16.5, 18.4, 22.1, 31.9, 37.7, 37.1, 34.9, 40.3, 2000, 20.7, 31.5, 20.2, 22.8, 25.6, 42.3, 43.2, 41.1, 37.4, 45.5, 3000, 36.3, 27.2, 33.9, 25.3, 28, 48.1, 51.9, 46.9, 44.1, 42, 4000, 36.8, 41.7, 37.6, 28.6, 30.2, 53.9, 46.6, 44.7, 42.5, 54.5, 5000, 45.9, 34.2, 52.4, 75.1, 42.3, 58.1, 54.7, 51.5, 49.5, 47.2, 6000, 44, 36.4, 55.5, 92.5, 44.1, 66.5, 55.6, 52.7, 51, 48.8, 7000, 47, 52.2, 56, 43.6, 36.5, 58.3, 51.3, 46.1, 47.3, 73.9, 8000, 49.6, 64, 65.1, 76.9, 62.9, 73.9, 61.5, 55.1, 52.9, 76.8, 9000, 54.5, 68.9, 79.2, 69, 91.4, 65.6, 56.2, 52.1, 47.7, 79.4, 10000, 69.3, 71.3, 83.3, 89, 83.9, 86.5, 71.5, 64.7, 58.6, 83.5, 11000, 70.1, 78.1, 86.4, 90.9, 82.6, 80.8, 82, 84.5, 81.6, 86.5, 12000, 78, 80.8, 84.6, 92.4, 83.3, 83.3, 82.1, 85.6, 84.7, 89.4, 13000, 102.7, 82.6, 89.3, 95.2, 95.3, 81.4, 83.9, 88.2, 88.8, 90.2, 14000, 78, 105.5, 105.4, 99.6, 95.5, 83.8, 84, 89.3, 91.2, 94, 15000, 81.5, 103.2, 112, 103.3, 100, 90.2, 85.3, 90.5, 91.4, 101 }, - MinLaunchDistData = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 1020, 1020, 1290, 1560, 1800, 2050, 2200, 2400, 2600, 2750, 500, 1180, 1110, 1400, 1650, 1970, 2510, 2400, 2500, 2750, 2900, 700, 1100, 1260, 1580, 1840, 2200, 2840, 3140, 9160, 4060, 4380, 1000, 1040, 1400, 1760, 2040, 2420, 3100, 3680, 4040, 4420, 5000, 2000, 1250, 1900, 2050, 2450, 2800, 3700, 4400, 5550, 5350, 6150, 3000, 2550, 2150, 2150, 2500, 2850, 3800, 4700, 5400, 5950, 6700, 4000, 2550, 2250, 1900, 2350, 2700, 3750, 4400, 5400, 6150, 7450, 5000, 1400, 1900, 1500, 2300, 2900, 3400, 4000, 5400, 6400, 7500, 6000, 1800, 1300, 1600, 2200, 2400, 3200, 3300, 4600, 6200, 7500, 7000, 1200, 1300, 1700, 1700, 1700, 2400, 2400, 2400, 5600, 8000, 8000, 1200, 1600, 1800, 2000, 2200, 2600, 2600, 2600, 4200, 7800, 9000, 1400, 1800, 1800, 2000, 2400, 2600, 2600, 2600, 2600, 7600, 10000, 1800, 1800, 2000, 2200, 2400, 3800, 3000, 3000, 3000, 7600, 11000, 1500, 2000, 2000, 2000, 2500, 3000, 3000, 3500, 3500, 7500, 12000, 1500, 2000, 2000, 2000, 2500, 3000, 3000, 3500, 4000, 7500, 13000, 2000, 2000, 2500, 2500, 2500, 3000, 3500, 3500, 4000, 6500, 14000, 2000, 2500, 2500, 2500, 2500, 3000, 3500, 3500, 4000, 7500, 15000, 2000, 2500, 2500, 2500, 3000, 3000, 3500, 4000, 4000, 10500 }, - MinTOF = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 10.9, 7.6, 7, 6.7, 6.3, 6.2, 5.9, 5.8, 5.7, 5.5, 500, 12.6, 8.5, 7.8, 7.3, 7, 7.6, 6.5, 6.2, 6.1, 6.5, 700, 13, 10.1, 9.2, 8.5, 8.1, 8.7, 8.5, 24.6, 9.1, 9, 1000, 13.4, 12.1, 11, 10, 9.5, 9.9, 10.2, 10.1, 10.1, 10.5, 2000, 20, 18.8, 16.3, 14.7, 13.5, 13.3, 13.4, 14.7, 13.2, 13.7, 3000, 31.7, 24.5, 21.1, 19, 17.3, 16.3, 16.1, 15.9, 15.7, 15.9, 4000, 36.7, 30.8, 25.5, 23.2, 21.4, 19.5, 18.4, 18, 17.8, 18.5, 5000, 36.2, 36.2, 30.3, 26.9, 24.6, 22.9, 21.4, 20.4, 20.2, 20.2, 6000, 46.1, 41.5, 34.2, 30.5, 29.1, 26.4, 25.4, 23.2, 22.3, 22.1, 7000, 50.4, 47.2, 37.5, 35, 34.7, 31.8, 30.5, 30.7, 24.7, 24.5, 8000, 52.6, 54.2, 41.4, 37.9, 36.3, 34.6, 33, 32.3, 29, 26.4, 9000, 54.3, 58.5, 45.4, 41.4, 38.8, 38.1, 36.6, 35.5, 36.5, 28.8, 10000, 53.4, 60.8, 49.8, 44.4, 42.4, 38.2, 38.8, 38, 38.5, 31.6, 11000, 56, 62.5, 53.9, 48.9, 45.4, 43.4, 41.9, 40.3, 40.6, 34.6, 12000, 57.9, 62.5, 57.7, 52.1, 48.7, 46.8, 45.3, 43.7, 42.9, 37.8, 13000, 59, 64, 60.5, 54, 52.3, 50.8, 47.4, 47, 46.8, 43.3, 14000, 60.8, 64.4, 64.3, 57.3, 56.4, 54.4, 50.3, 49.9, 51, 45.4, 15000, 62.6, 66, 67.6, 61.1, 58.2, 57.9, 53.8, 52.8, 55.5, 44.7 }, - VyHold = -100, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/jdam_ls6.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - arming_delay = { - delay_time = 0.8, - enabled = true - }, - arming_vane = { - enabled = false, - velK = 1 - }, - autopilot = { - KD0 = 0.00067045454545455, - KDI = 176, - KLM = 0.0023465909090909, - Ka = 2.1428571428571, - Kd = 139.28571428571, - Knav = 3, - Krx = 4, - Kx = 0.1, - Tc = 0.1, - Tf = 0.05, - delay = 1, - fins_limit = 0.5235987755983, - fins_limit_x = 0.087266462599716, - gload_limit = 3, - null_roll = -0.78539816339745, - op_time = 9000 - }, - category = 1, - class_name = "wAmmunitionLaserHoming", - fm = { - A = 0.6, - I = 26.5, - I_x = 0.282, - L = 0.032, - Ma = 6.3, - Ma_x = 9.5, - Mw = 3, - Mw_x = 3.5, - Sw = 0.295, - caliber = 0.16, - cx_coeff = { 1, 0.45, 0.8, 0.15, 1.55 }, - dCydA = { 0.04, 0.022 }, - finsTau = 0.1, - fins_gain = 100, - ideal_fins = 1, - mass = 88, - maxAoa = 0.43633231299858, - model_roll = -0.78539816339745, - release_rnd = 0.3, - release_rnd_x = 1, - wind_sigma = 0, - wind_time = 0 - }, - hMax = 15000, - hMin = 400, - laser_seeker = { - FOV = 0.61086523819802, - delay = 2, - max_seeker_range = 4500 - }, - mass = 88, - model = "ls-6-100", - name = "LS-6-100", - scheme = "schemes/bombs/bomb_jdam_laser.sch", - seeker = { - CEP = 5, - coalition = 2, - coalition_rnd_coeff = 5 - }, - shape_table_data = { { - file = "ls-6-100", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "LS-6-100", - username = "LS-6-100" - } }, - targeting_data = { - char_time = 20.5 - }, - type = 4, - user_name = "LS-6-100", - warhead = { - caliber = 160, - concrete_factors = { 3, 1, 1 }, - concrete_obj_factor = 2, - cumulative_factor = 3, - cumulative_thickness = 0, - expl_mass = 40, - fantom = 1, - mass = 40, - obj_factors = { 3, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - wsTypeOfWeapon = { 4, 5, 36, "Redacted" } - }, - 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", - server = { - Ag = -1.23, - AspectDistData = { 15, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 2, 9, 14, 23, 20, 20, 20, 24, 13, 10, 500, 2, 10, 15, 24, 37, 23, 19, 24, 13, 14, 700, 4, 10, 16, 24, 38, 29, 32, 32, 20, 18, 1000, 6, 10, 17, 26, 38, 26, 33, 34, 36, 38, 2000, 8, 10, 24, 29, 38, 20, 28, 34, 45, 45, 3000, 10, 20, 24, 32, 40, 15, 22, 34, 45, 45, 4000, 12, 20, 24, 33, 40, 15, 45, 36, 45, 45, 5000, 14, 20, 36, 40, 40, 40, 45, 36, 45, 45, 6000, 16, 18, 40, 40, 42, 45, 45, 36, 45, 45, 7000, 18, 38, 45, 35, 45, 45, 45, 45, 45, 45, 8000, 20, 22, 35, 35, 45, 45, 45, 45, 45, 35, 9000, 20, 22, 28, 28, 43, 45, 45, 45, 45, 35, 10000, 20, 22, 28, 33, 42, 45, 45, 45, 45, 35, 11000, 20, 22, 28, 34, 36, 38, 45, 45, 45, 45, 12000, 16, 21, 27, 33, 36, 38, 45, 45, 45, 45 }, - Cx = 0.00043, - LaunchDistData = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 1090, 1890, 3760, 6310, 7350, 5760, 16090, 16910, 16850, 22820, 500, 1240, 1960, 3830, 6140, 8520, 13590, 13990, 13620, 22740, 22790, 700, 1000, 2120, 3960, 6680, 9620, 15840, 15840, 16160, 22840, 22840, 1000, 1860, 2380, 4380, 6920, 10020, 16100, 20560, 21900, 21920, 26160, 2000, 2400, 4850, 4950, 7850, 11300, 20200, 22850, 22900, 22900, 26750, 3000, 4550, 5950, 8550, 8600, 12200, 22900, 26650, 26700, 26750, 26750, 4000, 3850, 7050, 9350, 9400, 13150, 25750, 25800, 25850, 25900, 30350, 5000, 7300, 7400, 11900, 18700, 18800, 28500, 30200, 30300, 30300, 30400, 6000, 5600, 7300, 13000, 21100, 20000, 32000, 32000, 32000, 32100, 32200, 7000, 6800, 8700, 15400, 15400, 15400, 30500, 30500, 30500, 30700, 47600, 8000, 8000, 14200, 18600, 23200, 27200, 36200, 36200, 36200, 36400, 51200, 9000, 9200, 16400, 20800, 24200, 31800, 34200, 34200, 34200, 34200, 55000, 10000, 15600, 18000, 23200, 26400, 32800, 40200, 42800, 42800, 42800, 59000, 11000, 16500, 21000, 25500, 28500, 33500, 41000, 48000, 53500, 58000, 62500, 12000, 20000, 23000, 26000, 30500, 34500, 42500, 49500, 56000, 61000, 66500, 13000, 27000, 24500, 29000, 33000, 37000, 43000, 51000, 58000, 64500, 70000, 14000, 21000, 32000, 35500, 36500, 39000, 44000, 52000, 60000, 67500, 73500, 15000, 23000, 33000, 39000, 40000, 42000, 46500, 53000, 61500, 69500, 77000 }, - MaxTOF = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 11.4, 14.2, 24.8, 33.7, 27.6, 17.8, 65.9, 53.1, 49, 84.5, 500, 13, 15.8, 26, 28.6, 34.1, 48.8, 50.7, 39.8, 90.1, 63.7, 700, 11.3, 16.5, 24.6, 36.9, 46.1, 74.1, 62.7, 49.2, 72.7, 69.6, 1000, 19.3, 19.5, 29.1, 36.7, 49.4, 77.6, 88.3, 86.4, 84.8, 83.6, 2000, 26.3, 38.2, 30.7, 42.1, 55.9, 91, 91.7, 89.5, 84.3, 88.3, 3000, 40.2, 46.1, 59.7, 47.4, 57.6, 99.1, 108, 103.4, 116.7, 92.6, 4000, 38.1, 53.3, 60.6, 52.8, 62, 109.4, 99.7, 117.7, 91.9, 98.1, 5000, 57.2, 54.7, 78.1, 104, 100.2, 120.2, 117.1, 120.2, 136.6, 100, 6000, 53.6, 54.8, 83.2, 104.8, 103.7, 142.7, 122, 124.1, 142, 103, 7000, 60.8, 69, 93.8, 80.1, 73.1, 120.8, 119.1, 138.3, 102.3, 158.1, 8000, 67.7, 102.8, 109, 110.5, 134.5, 134.1, 143.5, 154.1, 156.8, 158.9, 9000, 74, 97.7, 119, 115.3, 131.1, 137.7, 135.6, 153.9, 109.5, 168.9, 10000, 107.1, 103.7, 126.3, 132, 134.8, 150.8, 151.4, 179.9, 173.6, 179.7, 11000, 110.7, 118.7, 133.9, 138.8, 136.9, 151.1, 166.9, 177.4, 182.1, 187.2, 12000, 123.1, 127.6, 136.9, 142.4, 132.3, 158.5, 170.2, 184.1, 188.9, 197.4, 13000, 128.2, 136, 143, 148.8, 159.8, 158.9, 174.9, 188, 199, 204.7, 14000, 135.4, 163.9, 155.1, 160, 161.7, 165, 177.7, 193.5, 206.8, 212.5, 15000, 145, 173.8, 163.8, 166.4, 170, 180.5, 182.6, 197.6, 209.5, 221.3 }, - MidTOF = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 11.1, 10, 13, 16.5, 15.9, 11.7, 41.6, 45.5, 38.3, 55.6, 500, 12.7, 10.8, 13.6, 16.2, 18.4, 26.1, 37.4, 22.1, 50.6, 49.1, 700, 11.2, 12.7, 14.4, 17.7, 20.8, 30.9, 28, 36.2, 6.2, 34.4, 1000, 16.7, 14.4, 16.5, 18.4, 22.1, 31.9, 37.7, 37.1, 34.9, 40.3, 2000, 20.7, 31.5, 20.2, 22.8, 25.6, 42.3, 43.2, 41.1, 37.4, 45.5, 3000, 36.3, 27.2, 33.9, 25.3, 28, 48.1, 51.9, 46.9, 44.1, 42, 4000, 36.8, 41.7, 37.6, 28.6, 30.2, 53.9, 46.6, 44.7, 42.5, 54.5, 5000, 45.9, 34.2, 52.4, 75.1, 42.3, 58.1, 54.7, 51.5, 49.5, 47.2, 6000, 44, 36.4, 55.5, 92.5, 44.1, 66.5, 55.6, 52.7, 51, 48.8, 7000, 47, 52.2, 56, 43.6, 36.5, 58.3, 51.3, 46.1, 47.3, 73.9, 8000, 49.6, 64, 65.1, 76.9, 62.9, 73.9, 61.5, 55.1, 52.9, 76.8, 9000, 54.5, 68.9, 79.2, 69, 91.4, 65.6, 56.2, 52.1, 47.7, 79.4, 10000, 69.3, 71.3, 83.3, 89, 83.9, 86.5, 71.5, 64.7, 58.6, 83.5, 11000, 70.1, 78.1, 86.4, 90.9, 82.6, 80.8, 82, 84.5, 81.6, 86.5, 12000, 78, 80.8, 84.6, 92.4, 83.3, 83.3, 82.1, 85.6, 84.7, 89.4, 13000, 102.7, 82.6, 89.3, 95.2, 95.3, 81.4, 83.9, 88.2, 88.8, 90.2, 14000, 78, 105.5, 105.4, 99.6, 95.5, 83.8, 84, 89.3, 91.2, 94, 15000, 81.5, 103.2, 112, 103.3, 100, 90.2, 85.3, 90.5, 91.4, 101 }, - MinLaunchDistData = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 1020, 1020, 1290, 1560, 1800, 2050, 2200, 2400, 2600, 2750, 500, 1180, 1110, 1400, 1650, 1970, 2510, 2400, 2500, 2750, 2900, 700, 1100, 1260, 1580, 1840, 2200, 2840, 3140, 9160, 4060, 4380, 1000, 1040, 1400, 1760, 2040, 2420, 3100, 3680, 4040, 4420, 5000, 2000, 1250, 1900, 2050, 2450, 2800, 3700, 4400, 5550, 5350, 6150, 3000, 2550, 2150, 2150, 2500, 2850, 3800, 4700, 5400, 5950, 6700, 4000, 2550, 2250, 1900, 2350, 2700, 3750, 4400, 5400, 6150, 7450, 5000, 1400, 1900, 1500, 2300, 2900, 3400, 4000, 5400, 6400, 7500, 6000, 1800, 1300, 1600, 2200, 2400, 3200, 3300, 4600, 6200, 7500, 7000, 1200, 1300, 1700, 1700, 1700, 2400, 2400, 2400, 5600, 8000, 8000, 1200, 1600, 1800, 2000, 2200, 2600, 2600, 2600, 4200, 7800, 9000, 1400, 1800, 1800, 2000, 2400, 2600, 2600, 2600, 2600, 7600, 10000, 1800, 1800, 2000, 2200, 2400, 3800, 3000, 3000, 3000, 7600, 11000, 1500, 2000, 2000, 2000, 2500, 3000, 3000, 3500, 3500, 7500, 12000, 1500, 2000, 2000, 2000, 2500, 3000, 3000, 3500, 4000, 7500, 13000, 2000, 2000, 2500, 2500, 2500, 3000, 3500, 3500, 4000, 6500, 14000, 2000, 2500, 2500, 2500, 2500, 3000, 3500, 3500, 4000, 7500, 15000, 2000, 2500, 2500, 2500, 3000, 3000, 3500, 4000, 4000, 10500 }, - MinTOF = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 400, 10.9, 7.6, 7, 6.7, 6.3, 6.2, 5.9, 5.8, 5.7, 5.5, 500, 12.6, 8.5, 7.8, 7.3, 7, 7.6, 6.5, 6.2, 6.1, 6.5, 700, 13, 10.1, 9.2, 8.5, 8.1, 8.7, 8.5, 24.6, 9.1, 9, 1000, 13.4, 12.1, 11, 10, 9.5, 9.9, 10.2, 10.1, 10.1, 10.5, 2000, 20, 18.8, 16.3, 14.7, 13.5, 13.3, 13.4, 14.7, 13.2, 13.7, 3000, 31.7, 24.5, 21.1, 19, 17.3, 16.3, 16.1, 15.9, 15.7, 15.9, 4000, 36.7, 30.8, 25.5, 23.2, 21.4, 19.5, 18.4, 18, 17.8, 18.5, 5000, 36.2, 36.2, 30.3, 26.9, 24.6, 22.9, 21.4, 20.4, 20.2, 20.2, 6000, 46.1, 41.5, 34.2, 30.5, 29.1, 26.4, 25.4, 23.2, 22.3, 22.1, 7000, 50.4, 47.2, 37.5, 35, 34.7, 31.8, 30.5, 30.7, 24.7, 24.5, 8000, 52.6, 54.2, 41.4, 37.9, 36.3, 34.6, 33, 32.3, 29, 26.4, 9000, 54.3, 58.5, 45.4, 41.4, 38.8, 38.1, 36.6, 35.5, 36.5, 28.8, 10000, 53.4, 60.8, 49.8, 44.4, 42.4, 38.2, 38.8, 38, 38.5, 31.6, 11000, 56, 62.5, 53.9, 48.9, 45.4, 43.4, 41.9, 40.3, 40.6, 34.6, 12000, 57.9, 62.5, 57.7, 52.1, 48.7, 46.8, 45.3, 43.7, 42.9, 37.8, 13000, 59, 64, 60.5, 54, 52.3, 50.8, 47.4, 47, 46.8, 43.3, 14000, 60.8, 64.4, 64.3, 57.3, 56.4, 54.4, 50.3, 49.9, 51, 45.4, 15000, 62.6, 66, 67.6, 61.1, 58.2, 57.9, 53.8, 52.8, 55.5, 44.7 }, - VyHold = -100, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/jdam_ls6.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - arming_delay = { - delay_time = 0.8, - enabled = true - }, - arming_vane = { - enabled = false, - velK = 1 - }, - autopilot = { - KD0 = 0.00067045454545455, - KDI = 176, - KLM = 0.0023465909090909, - Ka = 2.1428571428571, - Kd = 139.28571428571, - Knav = 3, - Krx = 4, - Kx = 0.1, - Tc = 0.1, - Tf = 0.05, - delay = 1, - fins_limit = 0.5235987755983, - fins_limit_x = 0.087266462599716, - gload_limit = 3, - null_roll = -0.78539816339745, - op_time = 9000 - }, - category = 1, - class_name = "wAmmunitionLaserHoming", - fm = { - A = 0.6, - I = 26.5, - I_x = 0.282, - L = 0.032, - Ma = 6.3, - Ma_x = 9.5, - Mw = 3, - Mw_x = 3.5, - Sw = 0.295, - caliber = 0.16, - cx_coeff = { 1, 0.45, 0.8, 0.15, 1.55 }, - dCydA = { 0.04, 0.022 }, - finsTau = 0.1, - fins_gain = 100, - ideal_fins = 1, - mass = 88, - maxAoa = 0.43633231299858, - model_roll = -0.78539816339745, - release_rnd = 0.3, - release_rnd_x = 1, - wind_sigma = 0, - wind_time = 0 - }, - hMax = 15000, - hMin = 400, - laser_seeker = { - FOV = 0.61086523819802, - delay = 2, - max_seeker_range = 4500 - }, - mass = 88, - model = "ls-6-100", - name = "LS-6-100", - scheme = "schemes/bombs/bomb_jdam_laser.sch", - seeker = { - CEP = 5, - coalition = 2, - coalition_rnd_coeff = 5 - }, - shape_table_data = { { - file = "ls-6-100", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "LS-6-100", - username = "LS-6-100" - } }, - targeting_data = { - char_time = 20.5 - }, - type = 4, - user_name = "LS-6-100", - warhead = { - caliber = 160, - concrete_factors = { 3, 1, 1 }, - concrete_obj_factor = 2, - cumulative_factor = 3, - cumulative_thickness = 0, - expl_mass = 40, - fantom = 0, - mass = 40, - obj_factors = { 3, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - wsTypeOfWeapon = { 4, 5, 36, "Redacted" } - }, - sounderName = "Weapons/Bomb", - targeting_data = { - char_time = 20.5 - }, - type_name = "bomb", - ws_type = { 4, 5, 36, "Redacted" } -} \ No newline at end of file diff --git a/_G/weapons_table/weapons/bombs/LUU_2B.lua b/_G/weapons_table/weapons/bombs/LUU_2B.lua index e113b9cb..d2b2cdfc 100644 --- a/_G/weapons_table/weapons/bombs/LUU_2B.lua +++ b/_G/weapons_table/weapons/bombs/LUU_2B.lua @@ -70,7 +70,7 @@ _G["weapons_table"]["weapons"]["bombs"]["LUU_2B"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "LUU_2B" + username = "LUU-2B Flare" } }, targeting_data = { char_time = 20.5 @@ -150,7 +150,7 @@ _G["weapons_table"]["weapons"]["bombs"]["LUU_2B"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "LUU_2B" + username = "LUU-2B Flare" } }, targeting_data = { char_time = 20.5 diff --git a/_G/weapons_table/weapons/bombs/M257_FLARE.lua b/_G/weapons_table/weapons/bombs/M257_FLARE.lua index 51cb1da9..1bec267c 100644 --- a/_G/weapons_table/weapons/bombs/M257_FLARE.lua +++ b/_G/weapons_table/weapons/bombs/M257_FLARE.lua @@ -70,7 +70,7 @@ _G["weapons_table"]["weapons"]["bombs"]["M257_FLARE"] = { shape_table_data = { { file = "Hydra_M257_Parashute", index = "Redacted", - username = "M257_FLARE" + username = "M257 Flare" } }, targeting_data = { char_time = 20.5 @@ -150,7 +150,7 @@ _G["weapons_table"]["weapons"]["bombs"]["M257_FLARE"] = { shape_table_data = { { file = "Hydra_M257_Parashute", index = "Redacted", - username = "M257_FLARE" + username = "M257 Flare" } }, targeting_data = { char_time = 20.5 diff --git a/_G/weapons_table/weapons/bombs/SAB_100MN.lua b/_G/weapons_table/weapons/bombs/SAB_100MN.lua index 171f7798..368c3b1d 100644 --- a/_G/weapons_table/weapons/bombs/SAB_100MN.lua +++ b/_G/weapons_table/weapons/bombs/SAB_100MN.lua @@ -117,7 +117,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100MN"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_100_FLARE" + username = "SAB-100 Flare" } }, targeting_data = { char_time = 20.5 @@ -199,7 +199,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100MN"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_100_FLARE" + username = "SAB-100 Flare" } }, targeting_data = { char_time = 20.5 @@ -225,7 +225,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100MN"] = { shape_table_data = { { file = "sab-100", index = "Redacted", - username = "SAB_100MN" + username = "SAB-100MN" } }, targeting_data = { char_time = 24.3 @@ -351,7 +351,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100MN"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_100_FLARE" + username = "SAB-100 Flare" } }, targeting_data = { char_time = 20.5 @@ -433,7 +433,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100MN"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_100_FLARE" + username = "SAB-100 Flare" } }, targeting_data = { char_time = 20.5 @@ -459,7 +459,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100MN"] = { shape_table_data = { { file = "sab-100", index = "Redacted", - username = "SAB_100MN" + username = "SAB-100MN" } }, targeting_data = { char_time = 24.3 diff --git a/_G/weapons_table/weapons/bombs/SAB_100_FLARE.lua b/_G/weapons_table/weapons/bombs/SAB_100_FLARE.lua index 2f5077e9..e742f28d 100644 --- a/_G/weapons_table/weapons/bombs/SAB_100_FLARE.lua +++ b/_G/weapons_table/weapons/bombs/SAB_100_FLARE.lua @@ -73,7 +73,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100_FLARE"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_100_FLARE" + username = "SAB-100 Flare" } }, targeting_data = { char_time = 20.5 @@ -155,7 +155,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100_FLARE"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_100_FLARE" + username = "SAB-100 Flare" } }, targeting_data = { char_time = 20.5 diff --git a/_G/weapons_table/weapons/bombs/SAB_250_200.lua b/_G/weapons_table/weapons/bombs/SAB_250_200.lua index dd1d33dd..9a51632b 100644 --- a/_G/weapons_table/weapons/bombs/SAB_250_200.lua +++ b/_G/weapons_table/weapons/bombs/SAB_250_200.lua @@ -117,7 +117,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_200"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_250_FLARE" + username = "SAB-250 Flare" } }, targeting_data = { char_time = 20.5 @@ -199,7 +199,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_200"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_250_FLARE" + username = "SAB-250 Flare" } }, targeting_data = { char_time = 20.5 @@ -225,7 +225,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_200"] = { shape_table_data = { { file = "sab-100", index = "Redacted", - username = "SAB_250_200" + username = "SAB-250-200" } }, targeting_data = { char_time = 24 @@ -351,7 +351,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_200"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_250_FLARE" + username = "SAB-250 Flare" } }, targeting_data = { char_time = 20.5 @@ -433,7 +433,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_200"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_250_FLARE" + username = "SAB-250 Flare" } }, targeting_data = { char_time = 20.5 @@ -459,7 +459,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_200"] = { shape_table_data = { { file = "sab-100", index = "Redacted", - username = "SAB_250_200" + username = "SAB-250-200" } }, targeting_data = { char_time = 24 diff --git a/_G/weapons_table/weapons/bombs/SAB_250_FLARE.lua b/_G/weapons_table/weapons/bombs/SAB_250_FLARE.lua index e39f090b..684e311d 100644 --- a/_G/weapons_table/weapons/bombs/SAB_250_FLARE.lua +++ b/_G/weapons_table/weapons/bombs/SAB_250_FLARE.lua @@ -73,7 +73,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_FLARE"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_250_FLARE" + username = "SAB-250 Flare" } }, targeting_data = { char_time = 20.5 @@ -155,7 +155,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_FLARE"] = { shape_table_data = { { file = "luu-2", index = "Redacted", - username = "SAB_250_FLARE" + username = "SAB-250 Flare" } }, targeting_data = { char_time = 20.5 diff --git a/_G/weapons_table/weapons/bombs/S_8OM_FLARE.lua b/_G/weapons_table/weapons/bombs/S_8OM_FLARE.lua index 7ef7814e..e73fdbd3 100644 --- a/_G/weapons_table/weapons/bombs/S_8OM_FLARE.lua +++ b/_G/weapons_table/weapons/bombs/S_8OM_FLARE.lua @@ -69,7 +69,7 @@ _G["weapons_table"]["weapons"]["bombs"]["S_8OM_FLARE"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 @@ -148,7 +148,7 @@ _G["weapons_table"]["weapons"]["bombs"]["S_8OM_FLARE"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 diff --git a/_G/weapons_table/weapons/missiles/ADM_141A.lua b/_G/weapons_table/weapons/missiles/ADM_141A.lua index c16d1f1f..428c5e7f 100644 --- a/_G/weapons_table/weapons/missiles/ADM_141A.lua +++ b/_G/weapons_table/weapons/missiles/ADM_141A.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141A"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.ADM_141A", - add_attributes = { "Cruise missiles", "Planes" }, + add_attributes = { "Cruise missiles", "Planes", "Air" }, caliber = 0.343, client = { Cx_pil = 8, @@ -33,7 +33,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141A"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Planes" }, + add_attributes = { "Cruise missiles", "Planes", "Air" }, autopilot = { Kdv = 0.92, Kiv = 1e-05, @@ -187,7 +187,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141A"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Planes" }, + add_attributes = { "Cruise missiles", "Planes", "Air" }, autopilot = { Kdv = 0.92, Kiv = 1e-05, diff --git a/_G/weapons_table/weapons/missiles/ADM_141B.lua b/_G/weapons_table/weapons/missiles/ADM_141B.lua index 47d4e4fb..dd977adf 100644 --- a/_G/weapons_table/weapons/missiles/ADM_141B.lua +++ b/_G/weapons_table/weapons/missiles/ADM_141B.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141B"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.ADM_141B", - add_attributes = { "Cruise missiles", "Planes" }, + add_attributes = { "Cruise missiles", "Planes", "Air" }, caliber = 0.34, client = { Cx_pil = 8, @@ -33,7 +33,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141B"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Planes" }, + add_attributes = { "Cruise missiles", "Planes", "Air" }, autopilot = { Kdv = 0.12, Kiv = 1e-05, @@ -182,7 +182,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141B"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Planes" }, + add_attributes = { "Cruise missiles", "Planes", "Air" }, autopilot = { Kdv = 0.12, Kiv = 1e-05, diff --git a/_G/weapons_table/weapons/missiles/AGM_84A.lua b/_G/weapons_table/weapons/missiles/AGM_84A.lua index af516fce..e687b0b8 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84A.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84A.lua @@ -1,7 +1,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84A"] = { Reflection = 0.1, _unique_resource_name = "weapons.missiles.AGM_84A", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.343, client = { autopilot = { diff --git a/_G/weapons_table/weapons/missiles/AGM_84D.lua b/_G/weapons_table/weapons/missiles/AGM_84D.lua index 7d1dbe9a..df623212 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84D.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84D.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84D"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.AGM_84D", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.343, client = { Cx_pil = 8, @@ -35,7 +35,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84D"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.6, Kd = 0, @@ -290,7 +290,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84D"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.6, Kd = 0, diff --git a/_G/weapons_table/weapons/missiles/AGM_84E.lua b/_G/weapons_table/weapons/missiles/AGM_84E.lua index 1b4fd808..60460dc4 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84E.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84E.lua @@ -1,7 +1,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84E"] = { Reflection = 0.1, _unique_resource_name = "weapons.missiles.AGM_84E", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.343, client = { autopilot = { diff --git a/_G/weapons_table/weapons/missiles/AGM_84H.lua b/_G/weapons_table/weapons/missiles/AGM_84H.lua index 1aeb71a9..2a1f7b24 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84H.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84H.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.AGM_84H", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.343, client = { Cx_pil = 8, @@ -33,7 +33,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, @@ -263,7 +263,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, diff --git a/_G/weapons_table/weapons/missiles/AGM_84S.lua b/_G/weapons_table/weapons/missiles/AGM_84S.lua index 280c315a..9661c8da 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84S.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84S.lua @@ -1,7 +1,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { Reflection = 0.1, _unique_resource_name = "weapons.missiles.AGM_84S", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.343, client = { autopilot = { diff --git a/_G/weapons_table/weapons/missiles/AGM_86.lua b/_G/weapons_table/weapons/missiles/AGM_86.lua index 153de750..13f0d57b 100644 --- a/_G/weapons_table/weapons/missiles/AGM_86.lua +++ b/_G/weapons_table/weapons/missiles/AGM_86.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.AGM_86", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, caliber = 0.697, client = { Cx_pil = 8, @@ -35,7 +35,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, @@ -262,7 +262,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, diff --git a/_G/weapons_table/weapons/missiles/AGM_86C.lua b/_G/weapons_table/weapons/missiles/AGM_86C.lua index 030e5e4d..07b3195c 100644 --- a/_G/weapons_table/weapons/missiles/AGM_86C.lua +++ b/_G/weapons_table/weapons/missiles/AGM_86C.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86C"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.AGM_86C", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, caliber = 0.697, client = { Cx_pil = 8, @@ -35,7 +35,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86C"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, @@ -266,7 +266,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86C"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, diff --git a/_G/weapons_table/weapons/missiles/AGM_88.lua b/_G/weapons_table/weapons/missiles/AGM_88.lua index cac3064d..c6a08802 100644 --- a/_G/weapons_table/weapons/missiles/AGM_88.lua +++ b/_G/weapons_table/weapons/missiles/AGM_88.lua @@ -46,8 +46,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { nozzle_exit_area = 0.01368, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2.1, 0, 0 } }, - smoke_color = { 0.9, 0.9, 0.9 }, - smoke_transparency = 0.1, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_opacity_type = 1, + smoke_transparency = 0.2, tail_width = 0.4, work_time = 3.4 }, @@ -101,6 +102,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2.1, 0, 0 } }, smoke_color = { 0.8, 0.8, 0.8 }, + smoke_opacity_type = 1, smoke_transparency = 0.1, tail_width = 0.3, work_time = 12.5 @@ -207,8 +209,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { nozzle_exit_area = 0.01368, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2.1, 0, 0 } }, - smoke_color = { 0.9, 0.9, 0.9 }, - smoke_transparency = 0.1, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_opacity_type = 1, + smoke_transparency = 0.2, tail_width = 0.4, work_time = 3.4 }, @@ -262,6 +265,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2.1, 0, 0 } }, smoke_color = { 0.8, 0.8, 0.8 }, + smoke_opacity_type = 1, smoke_transparency = 0.1, tail_width = 0.3, work_time = 12.5 diff --git a/_G/weapons_table/weapons/missiles/BGM_109B.lua b/_G/weapons_table/weapons/missiles/BGM_109B.lua index f53d421c..1122b8c7 100644 --- a/_G/weapons_table/weapons/missiles/BGM_109B.lua +++ b/_G/weapons_table/weapons/missiles/BGM_109B.lua @@ -1,7 +1,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BGM_109B"] = { Reflection = 0.16, _unique_resource_name = "weapons.missiles.BGM_109B", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.52, client = { boost = { diff --git a/_G/weapons_table/weapons/missiles/C-701IR.lua b/_G/weapons_table/weapons/missiles/C-701IR.lua deleted file mode 100644 index c1476bbd..00000000 --- a/_G/weapons_table/weapons/missiles/C-701IR.lua +++ /dev/null @@ -1,326 +0,0 @@ -_G["weapons_table"]["weapons"]["missiles"]["C-701IR"] = { - Reflection = 0.05, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_c701.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - _unique_resource_name = "weapons.missiles.C-701IR", - caliber = 0.18, - client = { - Cx_pil = 1.7, - D_max = 30000, - D_min = 500, - Diam = 180, - Engine_Type = 1, - Engine_Type_ = 1, - 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, 8400, 11000, 12000, 13000, 13000, 2000, 14000, 15500, 17000, 18000, 18000, 5000, 22000, 23000, 23500, 24500, 26800, 10000, 25600, 26800, 28000, 28700, 29800 }, - Life_Time = 110, - M = 100, - Mach_max = 0.95, - MinLaunchDistData = { 4, 5, 100, 165, 230, 300, 400, 50, 1000, 1200, 1400, 1600, 3000, 2000, 2000, 2300, 2500, 2700, 3000, 5000, 3000, 3000, 3000, 3000, 4000, 10000, 6000, 6000, 6000, 6000, 6000 }, - Nr_max = 16, - OmViz_max = 99.9, - Range_max = 30000, - Reflection = 0.05, - X_back = -1.22, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_c701.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - 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 = 0 - }, - boost = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 12, - impulse = 125, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.22, 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", - controller = { - boost_start = 0.01, - march_start = 0.1 - }, - display_name_short = "C-701IR", - exhaust = { 1, 1, 1, 1 }, - fm = { - A = 0.36, - I = 52.375408333333, - I_x = 45, - L = 2.507, - Ma = 0.68, - Ma_x = 0.005, - Mw = 1.116, - Mw_x = 0.1, - Sw = 0.55, - caliber = 0.18, - cx_coeff = { 1, 0.3, 0.38, 0.236, 1.31 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, - mass = 100, - maxAoa = 0.3, - 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.22, 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-701IR", - scheme = "schemes/missiles/tv_homing_gyrost_missile.sch", - seeker = { - FOV = 1.0471975511966, - aim_sigma = 0.5, - delay = 0, - max_w_LOS = 0.5, - max_w_LOS_surf = 0.016, - op_time = 40, - send_off_data = 0 - }, - shape_table_data = { { - file = "c701t", - fire = { 0, 1 }, - index = "Redacted", - life = 0.4, - name = "C-701IR", - username = "C-701IR" - } }, - sigma = { 5, 5, 5 }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 - }, - t_acc = 0, - t_b = 0, - t_marsh = 6, - user_name = "C-701IR", - v_mid = 150, - 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 = 0 - }, - 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 = 0 - }, - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } - }, - display_name = "C-701IR", - display_name_short = "C-701IR", - mass = 100, - model = "c701t", - name = "C-701IR", - server = { - Cx_pil = 1.7, - D_max = 30000, - D_min = 500, - Diam = 180, - Engine_Type = 1, - Engine_Type_ = 1, - 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, 8400, 11000, 12000, 13000, 13000, 2000, 14000, 15500, 17000, 18000, 18000, 5000, 22000, 23000, 23500, 24500, 26800, 10000, 25600, 26800, 28000, 28700, 29800 }, - Life_Time = 110, - M = 100, - Mach_max = 0.95, - MinLaunchDistData = { 4, 5, 100, 165, 230, 300, 400, 50, 1000, 1200, 1400, 1600, 3000, 2000, 2000, 2300, 2500, 2700, 3000, 5000, 3000, 3000, 3000, 3000, 4000, 10000, 6000, 6000, 6000, 6000, 6000 }, - Nr_max = 16, - OmViz_max = 99.9, - Range_max = 30000, - Reflection = 0.05, - X_back = -1.22, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_c701.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - 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 = 0 - }, - boost = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 12, - impulse = 125, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.22, 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", - controller = { - boost_start = 0.01, - march_start = 0.1 - }, - display_name_short = "C-701IR", - exhaust = { 1, 1, 1, 1 }, - fm = { - A = 0.36, - I = 52.375408333333, - I_x = 45, - L = 2.507, - Ma = 0.68, - Ma_x = 0.005, - Mw = 1.116, - Mw_x = 0.1, - Sw = 0.55, - caliber = 0.18, - cx_coeff = { 1, 0.3, 0.38, 0.236, 1.31 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, - mass = 100, - maxAoa = 0.3, - 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.22, 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-701IR", - scheme = "schemes/missiles/tv_homing_gyrost_missile.sch", - seeker = { - FOV = 1.0471975511966, - aim_sigma = 0.5, - delay = 0, - max_w_LOS = 0.5, - max_w_LOS_surf = 0.016, - op_time = 40, - send_off_data = 0 - }, - shape_table_data = { { - file = "c701t", - fire = { 0, 1 }, - index = "Redacted", - life = 0.4, - name = "C-701IR", - username = "C-701IR" - } }, - sigma = { 5, 5, 5 }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 - }, - t_acc = 0, - t_b = 0, - t_marsh = 6, - user_name = "C-701IR", - v_mid = 150, - 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 = 0 - }, - 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 = 0 - }, - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } - }, - sounderName = "Weapons/Missile", - targeting_data = { - fm_type = -1 - }, - type_name = "missile", - ws_type = { 4, 4, 8, "Redacted" } -} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/CM-802AKG_AI.lua b/_G/weapons_table/weapons/missiles/CM-802AKG_AI.lua deleted file mode 100644 index e77959cf..00000000 --- a/_G/weapons_table/weapons/missiles/CM-802AKG_AI.lua +++ /dev/null @@ -1,459 +0,0 @@ -_G["weapons_table"]["weapons"]["missiles"]["CM-802AKG_AI"] = { - Reflection = 0.09, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_cm802akg.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - _unique_resource_name = "weapons.missiles.CM-802AKG_AI", - add_attributes = { "Cruise missiles" }, - caliber = 0.36, - client = { - Cx_pil = 1, - D_max = 220000, - D_min = 2000, - Diam = 343, - Engine_Type = 5, - Escort = 0, - Fi_excort = 3.14152, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.25, - H_max = 10000, - H_min = -1, - H_min_t = 0, - Head_Form = 0, - Head_Type = 5, - KillDistance = 0, - LaunchDistData = { 12, 7, 100, 125, 150, 175, 200, 250, 300, 500, 150000, 155000, 160000, 165000, 170000, 175000, 180000, 600, 152000, 157000, 162000, 167000, 172000, 177000, 182000, 700, 154000, 159000, 164000, 169000, 174000, 179000, 184000, 800, 156000, 161000, 166000, 171000, 176000, 181000, 186000, 900, 158000, 163000, 168000, 173000, 178000, 183000, 188000, 1000, 160000, 165000, 170000, 175000, 180000, 185000, 190000, 1200, 163000, 168000, 173000, 178000, 183000, 188000, 193000, 2200, 170000, 175000, 180000, 185000, 189000, 194000, 199000, 3200, 176000, 181000, 186000, 191000, 194000, 199000, 204000, 4200, 181000, 186000, 191000, 196000, 199000, 203000, 208000, 5200, 185000, 190000, 195000, 199000, 203000, 207000, 212000, 7500, 190000, 195000, 200000, 204000, 208000, 212000, 217000 }, - Life_Time = 660, - M = 715, - Mach_max = 1.3, - 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 }, - Nr_max = 15, - OmViz_max = 99.9, - Range_max = 220000, - Reflection = 0.09, - Stage_ = 1, - X_back = -2.566, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_cm802akg.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - 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 - }, - booster_animation = { - start_val = 0 - }, - category = 2, - class_name = "wAmmunitionAntiShip", - control_block = { - can_update_target_pos = 1, - default_cruise_height = 200, - obj_sensor = 0, - seeker_activation_dist = 20000, - 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 = 5 - }, - 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 = 50, - delay = 1, - eng_max_thrust = 3000, - eng_min_thrust = -100, - estimated_N_max = 6, - finsLimit = 0.8, - max_roll = 0.8, - max_start_y_vel = 35, - 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, - J_Diff_K = 0.4, - J_FinAngle_K = 0.32, - J_Int_K = 0, - J_Power_K = 1.5, - J_Trigger_Vert = 1, - K = 60, - 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 = 0 - }, - fm = { - A = 0.08, - I = 1577.23190625, - Kw_x = 0.01, - L = 5.145, - Ma = 0.6, - Ma_x = 3, - Ma_z = 3, - Mw = 1.116, - Sw = 0.75, - addDeplSw = 0.6, - caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, - maxAoa = 0.3, - no_wings_A_mlt = 7, - wind_sigma = 0, - wind_time = 1000, - wingsDeplDelay = 1, - wingsDeplProcTime = 5 - }, - march = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 180, - impulse = 660, - max_thrust = 5000, - min_fuel_rate = 0.005, - min_thrust = -100, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.566, 0, 0 } }, - smoke_color = { 0, 0, 0 }, - smoke_transparency = 0.2, - start_burn_effect = 0, - start_effect_delay = { 0, 0.3, 0.8 }, - start_effect_size = { 0.09, 0.104, 0.11 }, - start_effect_smoke = { 0.01, 0.4, 0.01 }, - start_effect_time = { 0.7, 1, 0.1 }, - start_effect_x_dist = { 1.1, 0.9, 0 }, - start_effect_x_pow = { 1, 1, 1 }, - start_effect_x_shift = { 0.15, 0.15, 0.2 }, - tail_width = 0.5, - thrust_Tau = 0.0017, - work_time = 9999 - }, - mass = 715, - model = "cm802akg", - name = "CM-802AKG_AI", - play_booster_animation = { - val = 0 - }, - scheme = "schemes/missiles/sat_cruise_missile.sch", - seeker = { - can_update_target_pos = 1, - coalition = 2, - coalition_rnd_coeff = 5 - }, - shape_table_data = { { - file = "cm802akg", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "CM-802AKG_AI", - username = "CM-802AKG_AI" - } }, - sigma = { 8, 8, 8 }, - t_acc = 0, - t_b = 5, - t_marsh = 1000, - user_name = "CM802AKG (DIS) for AI", - v_mid = 372, - v_min = 270, - warhead = { - caliber = 360, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 100, - fantom = 1, - mass = 165, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - warhead_air = { - caliber = 360, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 100, - fantom = 1, - mass = 165, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - 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", - server = { - Cx_pil = 1, - D_max = 220000, - D_min = 2000, - Diam = 343, - Engine_Type = 5, - Escort = 0, - Fi_excort = 3.14152, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.25, - H_max = 10000, - H_min = -1, - H_min_t = 0, - Head_Form = 0, - Head_Type = 5, - KillDistance = 0, - LaunchDistData = { 12, 7, 100, 125, 150, 175, 200, 250, 300, 500, 150000, 155000, 160000, 165000, 170000, 175000, 180000, 600, 152000, 157000, 162000, 167000, 172000, 177000, 182000, 700, 154000, 159000, 164000, 169000, 174000, 179000, 184000, 800, 156000, 161000, 166000, 171000, 176000, 181000, 186000, 900, 158000, 163000, 168000, 173000, 178000, 183000, 188000, 1000, 160000, 165000, 170000, 175000, 180000, 185000, 190000, 1200, 163000, 168000, 173000, 178000, 183000, 188000, 193000, 2200, 170000, 175000, 180000, 185000, 189000, 194000, 199000, 3200, 176000, 181000, 186000, 191000, 194000, 199000, 204000, 4200, 181000, 186000, 191000, 196000, 199000, 203000, 208000, 5200, 185000, 190000, 195000, 199000, 203000, 207000, 212000, 7500, 190000, 195000, 200000, 204000, 208000, 212000, 217000 }, - Life_Time = 660, - M = 715, - Mach_max = 1.3, - 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 }, - Nr_max = 15, - OmViz_max = 99.9, - Range_max = 220000, - Reflection = 0.09, - Stage_ = 1, - X_back = -2.566, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_cm802akg.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - 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 - }, - booster_animation = { - start_val = 0 - }, - category = 2, - class_name = "wAmmunitionAntiShip", - control_block = { - can_update_target_pos = 1, - default_cruise_height = 200, - obj_sensor = 0, - seeker_activation_dist = 20000, - 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 = 5 - }, - 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 = 50, - delay = 1, - eng_max_thrust = 3000, - eng_min_thrust = -100, - estimated_N_max = 6, - finsLimit = 0.8, - max_roll = 0.8, - max_start_y_vel = 35, - 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, - J_Diff_K = 0.4, - J_FinAngle_K = 0.32, - J_Int_K = 0, - J_Power_K = 1.5, - J_Trigger_Vert = 1, - K = 60, - 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 = 0 - }, - fm = { - A = 0.08, - I = 1577.23190625, - Kw_x = 0.01, - L = 5.145, - Ma = 0.6, - Ma_x = 3, - Ma_z = 3, - Mw = 1.116, - Sw = 0.75, - addDeplSw = 0.6, - caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, - maxAoa = 0.3, - no_wings_A_mlt = 7, - wind_sigma = 0, - wind_time = 1000, - wingsDeplDelay = 1, - wingsDeplProcTime = 5 - }, - march = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 180, - impulse = 660, - max_thrust = 5000, - min_fuel_rate = 0.005, - min_thrust = -100, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.566, 0, 0 } }, - smoke_color = { 0, 0, 0 }, - smoke_transparency = 0.2, - start_burn_effect = 0, - start_effect_delay = { 0, 0.3, 0.8 }, - start_effect_size = { 0.09, 0.104, 0.11 }, - start_effect_smoke = { 0.01, 0.4, 0.01 }, - start_effect_time = { 0.7, 1, 0.1 }, - start_effect_x_dist = { 1.1, 0.9, 0 }, - start_effect_x_pow = { 1, 1, 1 }, - start_effect_x_shift = { 0.15, 0.15, 0.2 }, - tail_width = 0.5, - thrust_Tau = 0.0017, - work_time = 9999 - }, - mass = 715, - model = "cm802akg", - name = "CM-802AKG_AI", - play_booster_animation = { - val = 0 - }, - scheme = "schemes/missiles/sat_cruise_missile.sch", - seeker = { - can_update_target_pos = 1, - coalition = 2, - coalition_rnd_coeff = 5 - }, - shape_table_data = { { - file = "cm802akg", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "CM-802AKG_AI", - username = "CM-802AKG_AI" - } }, - sigma = { 8, 8, 8 }, - t_acc = 0, - t_b = 5, - t_marsh = 1000, - user_name = "CM802AKG (DIS) for AI", - v_mid = 372, - v_min = 270, - warhead = { - caliber = 360, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 100, - fantom = 0, - mass = 165, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - warhead_air = { - caliber = 360, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 100, - fantom = 0, - mass = 165, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } - }, - sounderName = "Weapons/Missile", - targeting_data = { - fm_type = -1 - }, - type_name = "missile", - ws_type = { 4, 4, 8, "Redacted" } -} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/CM_802AKG.lua b/_G/weapons_table/weapons/missiles/CM_802AKG.lua index c844d359..455cc677 100644 --- a/_G/weapons_table/weapons/missiles/CM_802AKG.lua +++ b/_G/weapons_table/weapons/missiles/CM_802AKG.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.CM_802AKG", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.36, client = { Cx_pil = 8, @@ -36,7 +36,7 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1, Kd = 0, @@ -289,7 +289,7 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1, Kd = 0, diff --git a/_G/weapons_table/weapons/missiles/C_802AK.lua b/_G/weapons_table/weapons/missiles/C_802AK.lua index ab176955..e4ecbc50 100644 --- a/_G/weapons_table/weapons/missiles/C_802AK.lua +++ b/_G/weapons_table/weapons/missiles/C_802AK.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.C_802AK", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.36, client = { Cx_pil = 8, @@ -35,7 +35,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.6, Kd = 0, @@ -289,7 +289,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.6, Kd = 0, diff --git a/_G/weapons_table/weapons/missiles/KD-63B.lua b/_G/weapons_table/weapons/missiles/KD-63B.lua deleted file mode 100644 index 5ee5f9ae..00000000 --- a/_G/weapons_table/weapons/missiles/KD-63B.lua +++ /dev/null @@ -1,511 +0,0 @@ -_G["weapons_table"]["weapons"]["missiles"]["KD-63B"] = { - 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-63B", - add_attributes = { "Cruise missiles" }, - caliber = 0.76, - client = { - Cx_pil = 6, - D_max = 200000, - D_min = 20000, - Damage_correction_coeff = 1, - Diam = 760, - Escort = 0, - Fi_excort = 1.05, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.5, - H_max = 10000, - H_min = 500, - H_min_t = 0, - Head_Form = 0, - Head_Type = 5, - KillDistance = 0, - LaunchDistData = { 13, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 0, 0, 183100, 186950, 189075, 191400, 192850, 194625, 200, 0, 0, 183350, 187225, 188925, 191250, 193125, 194825, 300, 0, 0, 183600, 187025, 189300, 191525, 193325, 194950, 500, 0, 179575, 183675, 187650, 189950, 192000, 193675, 195275, 700, 0, 180200, 184550, 188150, 190350, 192200, 193850, 195450, 1000, 0, 181000, 185750, 188700, 190700, 192450, 194050, 195700, 2000, 180700, 185100, 188200, 190500, 192450, 194050, 195500, 197050, 3000, 183500, 187200, 190000, 192200, 194200, 195800, 197200, 198700, 4000, 185400, 188800, 191700, 193900, 195800, 197600, 198900, 200500, 5000, 186800, 190300, 193000, 195300, 197400, 199300, 200700, 202300, 6000, 187750, 191500, 194250, 196500, 198750, 200750, 202250, 204000, 8000, 190500, 194000, 196500, 199000, 201500, 203500, 205500, 207500, 10000, 193000, 195500, 199000, 201000, 203500, 206000, 208500, 211500 }, - Life_Time = 1850, - M = 2000, - Mach_max = 0.9, - MinLaunchDistData = { 13, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 0, 0, 23850, 22950, 23200, 22975, 16675, 17525, 200, 0, 0, 23350, 22375, 16000, 16600, 17075, 17500, 300, 0, 0, 22725, 15475, 16175, 16525, 17100, 17250, 500, 0, 23900, 15125, 15800, 16275, 16850, 17300, 17800, 700, 0, 22850, 15250, 15850, 16400, 16900, 17350, 17700, 1000, 0, 14650, 15450, 15950, 16500, 16950, 17350, 17850, 2000, 14250, 15250, 16050, 16700, 17250, 17650, 18100, 18650, 3000, 14500, 15600, 16300, 17100, 17900, 18500, 19000, 19500, 4000, 14100, 15500, 16500, 17300, 18300, 18900, 19500, 20000, 5000, 14000, 15100, 16300, 17300, 18400, 19100, 19700, 20400, 6000, 14250, 15000, 16250, 17250, 18500, 19250, 19750, 21000, 8000, 14500, 14500, 16000, 17500, 18500, 19000, 20000, 21500, 10000, 14500, 15000, 15000, 15000, 15500, 19500, 15500, 22500 }, - Nr_max = 18, - OmViz_max = 99.9, - Range_max = 200000, - Reflection = 0.121, - X_back = -3.79, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_kd63.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Cruise missiles" }, - autopilot = { - K = 1, - Kd = 0, - Kdx = 0.001, - Ki = 10, - Ks = 1, - Ksd = 0, - Ksi = 0, - Kw = 2.4, - Kx = 0.04, - PN_dist_data = { 2000, 0, 500, 0 }, - altim_vel_k = 4, - conv_input = 0, - default_glide_height = 600, - delay = 0.5, - dont_climb_on_cruise_height = 0, - fins_limit = 1.4, - fins_limit_x = 0.5, - glide_height = 600, - glide_height_eq_error = 0.03, - hor_err_limit = 0.5, - inertial_km_error = 10, - integr_val_limit = 0.5, - max_climb_ang_hdiff = 180, - max_climb_angle = 0.17453292519943, - max_dive_ang_hdiff = -500, - max_dive_angle = -0.5235987755983, - op_time = 9999, - pre_maneuver_glide_height = 600, - rotated_WLOS_input = 0, - 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.043633231299858, - w_limit_data = { 100, 0.034906585039887, 185, 0.10471975511966 } - }, - 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 = "wAmmunitionAntiShip", - control_block = { - default_cruise_height = 600 - }, - controller = { - boost_start = 0, - march_start = 0 - }, - display_name_short = "KD-63B", - engine_control = { - K = 240, - Kd = 1, - Ki = 0.01, - default_speed = 250, - speed_delta = 5 - }, - final_autopilot = { - K = 5, - K_loft_err = 1, - Kd = 0, - Ki = 0, - Kix = 0, - Ks = 20, - Kw = 1, - Kx = 0, - PN_dist_data = { 2000, 1, 500, 1 }, - add_err_val = 0, - add_err_vert = 0, - add_out_val = 0.1, - add_out_vert = 1, - conv_input = 0, - delay = 0, - fins_limit = 1.4, - loft_active_by_default = 0, - loft_angle = 0.10471975511966, - loft_angle_vert = 1, - loft_trig_angle = 0.17453292519943, - op_time = 9999, - rotated_WLOS_input = 0, - w_limit = 0.17453292519943 - }, - fm = { - A = 0.5, - I = 8166.6666666667, - L = 7, - Ma = 0.68, - Ma_x = 3, - Ma_z = 3, - Mw = 1.116, - Mw_x = 2.6, - Sw = 0.7, - addDeplSw = 0.6, - caliber = 0.76, - cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 2000, - maxAoa = 0.3, - no_wings_A_mlt = 7, - wind_sigma = 0, - wind_time = 1000, - wingsDeplDelay = 1, - wingsDeplProcTime = 5 - }, - ins = { - aim_sigma = 350, - check_AI = 1, - error_coeff = 0.03 - }, - march = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 500, - impulse = 3000, - max_thrust = 20000, - min_fuel_rate = 0.005, - min_thrust = -100, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -3.79, 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.0018, - work_time = 9999 - }, - mass = 2000, - model = "kd63b", - name = "KD-63B", - scheme = "schemes/missiles/AGM-84E.sch", - seeker = { - FOV = 1.0471975511966, - activate_on_update = 1, - delay = 0, - max_lock_dist = 30000, - max_target_speed = 33, - max_target_speed_rnd_coeff = 10, - op_time = 800 - }, - shape_table_data = { { - file = "kd63b", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "KD-63B", - username = "KD-63B" - } }, - sigma = { 8, 8, 8 }, - t_acc = 0, - t_b = 5, - t_marsh = 1800, - triggers_control = { - action_wait_timer = 5, - default_destruct_tg_dist = 3000, - default_final_maneuver_tg_dist = 7000, - default_sensor_tg_dist = 11000, - default_straight_nav_tg_dist = 7000, - final_maneuver_trig_angle = 0.83775804095728, - final_maneuver_trig_v_lim = 3, - min_cruise_height = 600, - min_cruise_height_trigger_mlt = 7.1818181818182, - min_cruise_height_trigger_sum = 11000, - pre_maneuver_glide_height = 600, - trigger_by_path = 1, - use_horiz_dist = 1 - }, - user_name = "KD-63B", - v_mid = 272, - v_min = 170, - warhead = { - caliber = 760, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 300, - fantom = 1, - mass = 500, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - warhead_air = { - caliber = 760, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 300, - fantom = 1, - mass = 500, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } - }, - display_name = "KD-63B", - display_name_short = "KD-63B", - mass = 2000, - model = "kd63b", - name = "KD-63B", - server = { - Cx_pil = 6, - D_max = 200000, - D_min = 20000, - Damage_correction_coeff = 1, - Diam = 760, - Escort = 0, - Fi_excort = 1.05, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.5, - H_max = 10000, - H_min = 500, - H_min_t = 0, - Head_Form = 0, - Head_Type = 5, - KillDistance = 0, - LaunchDistData = { 13, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 0, 0, 183100, 186950, 189075, 191400, 192850, 194625, 200, 0, 0, 183350, 187225, 188925, 191250, 193125, 194825, 300, 0, 0, 183600, 187025, 189300, 191525, 193325, 194950, 500, 0, 179575, 183675, 187650, 189950, 192000, 193675, 195275, 700, 0, 180200, 184550, 188150, 190350, 192200, 193850, 195450, 1000, 0, 181000, 185750, 188700, 190700, 192450, 194050, 195700, 2000, 180700, 185100, 188200, 190500, 192450, 194050, 195500, 197050, 3000, 183500, 187200, 190000, 192200, 194200, 195800, 197200, 198700, 4000, 185400, 188800, 191700, 193900, 195800, 197600, 198900, 200500, 5000, 186800, 190300, 193000, 195300, 197400, 199300, 200700, 202300, 6000, 187750, 191500, 194250, 196500, 198750, 200750, 202250, 204000, 8000, 190500, 194000, 196500, 199000, 201500, 203500, 205500, 207500, 10000, 193000, 195500, 199000, 201000, 203500, 206000, 208500, 211500 }, - Life_Time = 1850, - M = 2000, - Mach_max = 0.9, - MinLaunchDistData = { 13, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 0, 0, 23850, 22950, 23200, 22975, 16675, 17525, 200, 0, 0, 23350, 22375, 16000, 16600, 17075, 17500, 300, 0, 0, 22725, 15475, 16175, 16525, 17100, 17250, 500, 0, 23900, 15125, 15800, 16275, 16850, 17300, 17800, 700, 0, 22850, 15250, 15850, 16400, 16900, 17350, 17700, 1000, 0, 14650, 15450, 15950, 16500, 16950, 17350, 17850, 2000, 14250, 15250, 16050, 16700, 17250, 17650, 18100, 18650, 3000, 14500, 15600, 16300, 17100, 17900, 18500, 19000, 19500, 4000, 14100, 15500, 16500, 17300, 18300, 18900, 19500, 20000, 5000, 14000, 15100, 16300, 17300, 18400, 19100, 19700, 20400, 6000, 14250, 15000, 16250, 17250, 18500, 19250, 19750, 21000, 8000, 14500, 14500, 16000, 17500, 18500, 19000, 20000, 21500, 10000, 14500, 15000, 15000, 15000, 15500, 19500, 15500, 22500 }, - Nr_max = 18, - OmViz_max = 99.9, - Range_max = 200000, - Reflection = 0.121, - X_back = -3.79, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_kd63.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Cruise missiles" }, - autopilot = { - K = 1, - Kd = 0, - Kdx = 0.001, - Ki = 10, - Ks = 1, - Ksd = 0, - Ksi = 0, - Kw = 2.4, - Kx = 0.04, - PN_dist_data = { 2000, 0, 500, 0 }, - altim_vel_k = 4, - conv_input = 0, - default_glide_height = 600, - delay = 0.5, - dont_climb_on_cruise_height = 0, - fins_limit = 1.4, - fins_limit_x = 0.5, - glide_height = 600, - glide_height_eq_error = 0.03, - hor_err_limit = 0.5, - inertial_km_error = 10, - integr_val_limit = 0.5, - max_climb_ang_hdiff = 180, - max_climb_angle = 0.17453292519943, - max_dive_ang_hdiff = -500, - max_dive_angle = -0.5235987755983, - op_time = 9999, - pre_maneuver_glide_height = 600, - rotated_WLOS_input = 0, - 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.043633231299858, - w_limit_data = { 100, 0.034906585039887, 185, 0.10471975511966 } - }, - 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 = "wAmmunitionAntiShip", - control_block = { - default_cruise_height = 600 - }, - controller = { - boost_start = 0, - march_start = 0 - }, - display_name_short = "KD-63B", - engine_control = { - K = 240, - Kd = 1, - Ki = 0.01, - default_speed = 250, - speed_delta = 5 - }, - final_autopilot = { - K = 5, - K_loft_err = 1, - Kd = 0, - Ki = 0, - Kix = 0, - Ks = 20, - Kw = 1, - Kx = 0, - PN_dist_data = { 2000, 1, 500, 1 }, - add_err_val = 0, - add_err_vert = 0, - add_out_val = 0.1, - add_out_vert = 1, - conv_input = 0, - delay = 0, - fins_limit = 1.4, - loft_active_by_default = 0, - loft_angle = 0.10471975511966, - loft_angle_vert = 1, - loft_trig_angle = 0.17453292519943, - op_time = 9999, - rotated_WLOS_input = 0, - w_limit = 0.17453292519943 - }, - fm = { - A = 0.5, - I = 8166.6666666667, - L = 7, - Ma = 0.68, - Ma_x = 3, - Ma_z = 3, - Mw = 1.116, - Mw_x = 2.6, - Sw = 0.7, - addDeplSw = 0.6, - caliber = 0.76, - cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 2000, - maxAoa = 0.3, - no_wings_A_mlt = 7, - wind_sigma = 0, - wind_time = 1000, - wingsDeplDelay = 1, - wingsDeplProcTime = 5 - }, - ins = { - aim_sigma = 350, - check_AI = 1, - error_coeff = 0.03 - }, - march = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 500, - impulse = 3000, - max_thrust = 20000, - min_fuel_rate = 0.005, - min_thrust = -100, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -3.79, 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.0018, - work_time = 9999 - }, - mass = 2000, - model = "kd63b", - name = "KD-63B", - scheme = "schemes/missiles/AGM-84E.sch", - seeker = { - FOV = 1.0471975511966, - activate_on_update = 1, - delay = 0, - max_lock_dist = 30000, - max_target_speed = 33, - max_target_speed_rnd_coeff = 10, - op_time = 800 - }, - shape_table_data = { { - file = "kd63b", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "KD-63B", - username = "KD-63B" - } }, - sigma = { 8, 8, 8 }, - t_acc = 0, - t_b = 5, - t_marsh = 1800, - triggers_control = { - action_wait_timer = 5, - default_destruct_tg_dist = 3000, - default_final_maneuver_tg_dist = 7000, - default_sensor_tg_dist = 11000, - default_straight_nav_tg_dist = 7000, - final_maneuver_trig_angle = 0.83775804095728, - final_maneuver_trig_v_lim = 3, - min_cruise_height = 600, - min_cruise_height_trigger_mlt = 7.1818181818182, - min_cruise_height_trigger_sum = 11000, - pre_maneuver_glide_height = 600, - trigger_by_path = 1, - use_horiz_dist = 1 - }, - user_name = "KD-63B", - v_mid = 272, - v_min = 170, - warhead = { - caliber = 760, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 300, - fantom = 0, - mass = 500, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - warhead_air = { - caliber = 760, - concrete_factors = { 3, 1, 5 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 300, - fantom = 0, - mass = 500, - obj_factors = { 2, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } - }, - sounderName = "Weapons/Missile", - targeting_data = { - fm_type = -1 - }, - type_name = "missile", - ws_type = { 4, 4, 8, "Redacted" } -} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/KD_20.lua b/_G/weapons_table/weapons/missiles/KD_20.lua index 9b76c834..4b214f24 100644 --- a/_G/weapons_table/weapons/missiles/KD_20.lua +++ b/_G/weapons_table/weapons/missiles/KD_20.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD_20"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.KD_20", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, caliber = 0.6, client = { Cx_pil = 8, @@ -35,7 +35,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD_20"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, @@ -262,7 +262,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD_20"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Air" }, boost = { boost_factor = 0, boost_time = 0, diff --git a/_G/weapons_table/weapons/missiles/KD_63.lua b/_G/weapons_table/weapons/missiles/KD_63.lua index 24dd70d3..b8e5f60a 100644 --- a/_G/weapons_table/weapons/missiles/KD_63.lua +++ b/_G/weapons_table/weapons/missiles/KD_63.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD_63"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.KD_63", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.76, client = { Cx_pil = 6, @@ -36,7 +36,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD_63"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1, Kd = 0, @@ -289,7 +289,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD_63"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1, Kd = 0, diff --git a/_G/weapons_table/weapons/missiles/KD_63B.lua b/_G/weapons_table/weapons/missiles/KD_63B.lua index 26645b49..18dc24ae 100644 --- a/_G/weapons_table/weapons/missiles/KD_63B.lua +++ b/_G/weapons_table/weapons/missiles/KD_63B.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD_63B"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.KD_63B", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.76, client = { Cx_pil = 6, @@ -36,7 +36,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD_63B"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1, Kd = 0, @@ -289,7 +289,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD_63B"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1, Kd = 0, diff --git a/_G/weapons_table/weapons/missiles/Kh25MP_PRGS1VP.lua b/_G/weapons_table/weapons/missiles/Kh25MP_PRGS1VP.lua index ab02b725..ab0ac833 100644 --- a/_G/weapons_table/weapons/missiles/Kh25MP_PRGS1VP.lua +++ b/_G/weapons_table/weapons/missiles/Kh25MP_PRGS1VP.lua @@ -20,10 +20,11 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { Head_Form = 0, Head_Type = 3, KillDistance = 0, - LaunchDistData = { 8, 2, 50, 300, 1000, 14000, 14000, 2000, 14000, 14000, 3000, 13000, 13000, 5000, 13000, 13000, 6000, 12000, 12000, 7000, 12000, 12000, 8000, 11000, 11000, 9000, 10000, 10000 }, + LaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 9220, 9220, 9220, 9220, 9220, 27180, 28080, 28890, 200, 15520, 15520, 15520, 15520, 15520, 27330, 28230, 29040, 300, 17040, 17040, 17040, 17040, 17040, 27470, 28370, 29180, 400, 18240, 18240, 18240, 18240, 18240, 27610, 28500, 29300, 500, 19180, 19180, 19180, 19180, 19180, 27740, 28630, 29450, 600, 19980, 19980, 19980, 19980, 19980, 27870, 28760, 29600, 700, 20640, 20640, 20640, 20640, 20640, 27990, 28910, 29750, 800, 21225, 21225, 21225, 21225, 21225, 28100, 29050, 29875, 900, 21725, 21725, 21725, 21725, 21725, 28250, 29175, 30025, 1000, 22950, 24175, 25300, 26325, 27325, 28375, 29300, 30150, 2000, 24350, 25425, 26450, 27450, 28525, 29600, 30575, 31425, 3000, 25250, 26300, 26550, 26550, 26700, 30700, 31450, 31500, 4000, 26050, 27150, 28200, 29250, 30600, 31500, 31550, 31600, 5000, 26700, 27900, 29000, 30100, 30800, 30900, 30900, 31700, 6000, 26750, 27500, 28500, 30250, 30500, 31500, 32250, 32750, 7000, 27750, 28500, 29500, 30750, 31750, 32500, 33500, 34250, 8000, 28500, 29500, 30750, 32000, 33000, 33750, 34750, 35500, 9000, 29750, 30750, 31500, 33000, 34000, 35000, 36000, 37000, 10000, 30500, 31500, 32500, 34000, 35250, 36250, 37250, 38250, 11000, 31000, 32500, 33500, 35000, 36000, 37000, 38000, 39500, 12000, 32000, 33500, 34500, 36000, 37500, 38500, 39500, 40500, 13000, 33000, 34000, 35500, 37500, 38500, 39500, 40500, 41500, 14000, 33500, 35000, 37000, 38500, 39500, 41000, 42000, 43000, 15000, 34500, 36000, 38000, 39500, 41000, 42000, 43000, 44500 }, Life_Time = 100000, - M = 310, + M = 316, Mach_max = 2.65, + MinLaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 3560, 3560, 3560, 3560, 3560, 5180, 5260, 5330, 200, 4130, 4130, 4130, 4130, 4130, 5190, 5270, 5350, 300, 4270, 4270, 4270, 4270, 4270, 5210, 5290, 5360, 400, 4380, 4380, 4380, 4380, 4380, 5220, 5300, 5370, 500, 4460, 4460, 4460, 4460, 4460, 5230, 5310, 5480, 600, 4530, 4530, 4530, 4530, 4530, 5240, 5340, 5680, 700, 4590, 4590, 4590, 4590, 4590, 5250, 5530, 5870, 800, 4650, 4650, 4650, 4650, 4650, 5275, 5700, 6050, 900, 4700, 4700, 4700, 4700, 4700, 5375, 5875, 6225, 1000, 4800, 4925, 5025, 5100, 5200, 5525, 6025, 6375, 2000, 4925, 5025, 5125, 5200, 6000, 6725, 7300, 7825, 3000, 5000, 5100, 5150, 5150, 6500, 7700, 8400, 8900, 4000, 5100, 5200, 5350, 5600, 7700, 8750, 9450, 9950, 5000, 5200, 5400, 5700, 6200, 8600, 9600, 8900, 11000, 6000, 5250, 5250, 5500, 7000, 9750, 10750, 11500, 12000, 7000, 5250, 5500, 5500, 9000, 10750, 11750, 12500, 13000, 8000, 5500, 5500, 5500, 10000, 11750, 12750, 13500, 14000, 9000, 5500, 5500, 5750, 11250, 12500, 13500, 14500, 15000, 10000, 5500, 5750, 6000, 12250, 13500, 14500, 15500, 16000, 11000, 5500, 6000, 10000, 13500, 14500, 15500, 16500, 17500, 12000, 6000, 6000, 11500, 14000, 15500, 17000, 17500, 18000, 13000, 6000, 6000, 12500, 15000, 16500, 18000, 19000, 19500, 14000, 6000, 7000, 14000, 16000, 18000, 19000, 20000, 21000, 15000, 6500, 8000, 15000, 17000, 19000, 20500, 21500, 22500 }, Nr_max = 12, OmViz_max = 99.9, Range_max = 14000, @@ -33,21 +34,41 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/kh25_29_family.lua", _origin = "AircraftWeaponPack", + actuator = { + D = 250, + T1 = 0.002, + T2 = 0.006, + Tf = 0.005, + fin_stall = 0, + max_delta = 0.26179938779915, + max_omega = 6.9813170079773, + sim_count = 4 + }, autopilot = { - J_Angle_K = 0.20943951023932, - J_Angle_W = 3.5, - J_Diff_K = 0.4, - J_FinAngle_K = 0.31415926535898, - J_Int_K = 0, - J_Power_K = 1.2, - K = 100, - Kg = 6, - Ki = 0, - delay = 1, - finsLimit = 0.22, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.20943951023932, + K_Eloc = -0.003, + K_Eloc_x = 0.0001, + K_Fi = 0.6, + K_LOS_omega = 6.2, + K_fins = 1, + K_fins_x = 0.4, + K_n1 = 0.018, + K_n2 = 0.001, + K_roll = 1, + Ki_LOS_omega = 2.4, + Ki_dG = -0.02, + delay_guidance = 1, + delay_roll = 0.4, + fins_limit = 0.26179938779915, + fins_limit_x = 0.33161255787892, + have_switching_delay = true, + min_loft_time = 1.4, + n_limit = 7, + n_req = 0.6, + null_roll = 0.78539816339745, + op_time = 200 }, - booster = { + boost = { boost_factor = 0, boost_time = 0, custom_smoke_dissipation_factor = 0.2, @@ -68,27 +89,51 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { }, display_name_short = "Kh-25", fm = { - A = 0.36, - I = 353.65833333333, - I_x = 30, - Kw_x = 0.001, - L = 3.7, - Ma = 0.3, - Ma_x = 0.001, - Mw = 1.116, - Sw = 0.46, + 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.34, 0.34, 0.34, 0.34, 0.59, 0.65, 0.655, 0.651, 0.63, 0.592, 0.556, 0.556 }, + CxB = { 0.034, 0.034, 0.034, 0.034, 0.04, 0.188, 0.188, 0.142, 0.112, 0.091, 0.076, 0.076 }, + 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.8, + Iy = 207, + Iz = 207, + 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 = 4.255, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + S = 0.059, caliber = 0.275, - cx_coeff = { 1, 0.55, 1, 0.75, 1.2 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, - mass = 310, - maxAoa = 0.3, - wind_sigma = 20, - wind_time = 1000 + delta_max = 0.26179938779915, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, + mass = 316, + 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 }, fuze_proximity = { ignore_inp_armed = 0 }, + gimbal = { + delay = 0, + lock_time = 0, + max_tracking_rate = 0.1221730476396, + op_time = 200, + pitch_max = 0.5235987755983, + tracking_gain = 10, + yaw_max = 0.5235987755983 + }, manualWeaponFlag = 1, march = { boost_factor = 0, @@ -106,23 +151,26 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { mass = 310, model = "X-25MP", name = "Kh25MP_PRGS1VP", - radio_seeker = { - FOV = 0.5235987755983, + scheme = "schemes/missiles/KH-25MP.sch", + seeker = { + FOV = 2.0943951023932, + abs_err_val = 2, + aim_sigma = 4, aim_y_offset = 2, - blind_ctrl_dist = 2000, + ang_err_val = 0.00013962634015955, blind_rad_val = 0.2, calc_aim_dist = 500000, + delay = 1.5, err_correct_time = 2.5, - err_val = 0.0065, - keep_aim_time = 0.1, - min_sens_rad_val = 0.0005, - no_signal_turn_off_time = 0.1, + filter_ignore_strings = { "EWR", "ewr" }, + keep_aim_time = 4, + lock_manual_target_types_only = 0, + max_w_LOS = 0.34906585039887, op_time = 90, - pos_memory_time = 0.1, - sens_far_dist = 15000, - sens_near_dist = 300 + pos_memory_time = 40, + sens_far_dist = 70000, + sens_near_dist = 100 }, - scheme = "schemes/missiles/anti_radiation_missile.sch", shape_table_data = { { file = "X-25MP", fire = { 0, 1 }, @@ -132,9 +180,6 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { username = "Kh-25MP" } }, sigma = { 0, 0, 0 }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 - }, t_acc = 0, t_b = 0, t_marsh = 10000, @@ -167,6 +212,11 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { other_factors = { 1, 1, 1 }, piercing_mass = 17.2 }, + wcs_emulator = { + K_loft = 2.5e-05, + delay = 0.005, + los_roll = 0 + }, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "Kh-25MP (AS-12 Kegler)", @@ -190,10 +240,11 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { Head_Form = 0, Head_Type = 3, KillDistance = 0, - LaunchDistData = { 8, 2, 50, 300, 1000, 14000, 14000, 2000, 14000, 14000, 3000, 13000, 13000, 5000, 13000, 13000, 6000, 12000, 12000, 7000, 12000, 12000, 8000, 11000, 11000, 9000, 10000, 10000 }, + LaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 9220, 9220, 9220, 9220, 9220, 27180, 28080, 28890, 200, 15520, 15520, 15520, 15520, 15520, 27330, 28230, 29040, 300, 17040, 17040, 17040, 17040, 17040, 27470, 28370, 29180, 400, 18240, 18240, 18240, 18240, 18240, 27610, 28500, 29300, 500, 19180, 19180, 19180, 19180, 19180, 27740, 28630, 29450, 600, 19980, 19980, 19980, 19980, 19980, 27870, 28760, 29600, 700, 20640, 20640, 20640, 20640, 20640, 27990, 28910, 29750, 800, 21225, 21225, 21225, 21225, 21225, 28100, 29050, 29875, 900, 21725, 21725, 21725, 21725, 21725, 28250, 29175, 30025, 1000, 22950, 24175, 25300, 26325, 27325, 28375, 29300, 30150, 2000, 24350, 25425, 26450, 27450, 28525, 29600, 30575, 31425, 3000, 25250, 26300, 26550, 26550, 26700, 30700, 31450, 31500, 4000, 26050, 27150, 28200, 29250, 30600, 31500, 31550, 31600, 5000, 26700, 27900, 29000, 30100, 30800, 30900, 30900, 31700, 6000, 26750, 27500, 28500, 30250, 30500, 31500, 32250, 32750, 7000, 27750, 28500, 29500, 30750, 31750, 32500, 33500, 34250, 8000, 28500, 29500, 30750, 32000, 33000, 33750, 34750, 35500, 9000, 29750, 30750, 31500, 33000, 34000, 35000, 36000, 37000, 10000, 30500, 31500, 32500, 34000, 35250, 36250, 37250, 38250, 11000, 31000, 32500, 33500, 35000, 36000, 37000, 38000, 39500, 12000, 32000, 33500, 34500, 36000, 37500, 38500, 39500, 40500, 13000, 33000, 34000, 35500, 37500, 38500, 39500, 40500, 41500, 14000, 33500, 35000, 37000, 38500, 39500, 41000, 42000, 43000, 15000, 34500, 36000, 38000, 39500, 41000, 42000, 43000, 44500 }, Life_Time = 100000, - M = 310, + M = 316, Mach_max = 2.65, + MinLaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 3560, 3560, 3560, 3560, 3560, 5180, 5260, 5330, 200, 4130, 4130, 4130, 4130, 4130, 5190, 5270, 5350, 300, 4270, 4270, 4270, 4270, 4270, 5210, 5290, 5360, 400, 4380, 4380, 4380, 4380, 4380, 5220, 5300, 5370, 500, 4460, 4460, 4460, 4460, 4460, 5230, 5310, 5480, 600, 4530, 4530, 4530, 4530, 4530, 5240, 5340, 5680, 700, 4590, 4590, 4590, 4590, 4590, 5250, 5530, 5870, 800, 4650, 4650, 4650, 4650, 4650, 5275, 5700, 6050, 900, 4700, 4700, 4700, 4700, 4700, 5375, 5875, 6225, 1000, 4800, 4925, 5025, 5100, 5200, 5525, 6025, 6375, 2000, 4925, 5025, 5125, 5200, 6000, 6725, 7300, 7825, 3000, 5000, 5100, 5150, 5150, 6500, 7700, 8400, 8900, 4000, 5100, 5200, 5350, 5600, 7700, 8750, 9450, 9950, 5000, 5200, 5400, 5700, 6200, 8600, 9600, 8900, 11000, 6000, 5250, 5250, 5500, 7000, 9750, 10750, 11500, 12000, 7000, 5250, 5500, 5500, 9000, 10750, 11750, 12500, 13000, 8000, 5500, 5500, 5500, 10000, 11750, 12750, 13500, 14000, 9000, 5500, 5500, 5750, 11250, 12500, 13500, 14500, 15000, 10000, 5500, 5750, 6000, 12250, 13500, 14500, 15500, 16000, 11000, 5500, 6000, 10000, 13500, 14500, 15500, 16500, 17500, 12000, 6000, 6000, 11500, 14000, 15500, 17000, 17500, 18000, 13000, 6000, 6000, 12500, 15000, 16500, 18000, 19000, 19500, 14000, 6000, 7000, 14000, 16000, 18000, 19000, 20000, 21000, 15000, 6500, 8000, 15000, 17000, 19000, 20500, 21500, 22500 }, Nr_max = 12, OmViz_max = 99.9, Range_max = 14000, @@ -203,21 +254,41 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/kh25_29_family.lua", _origin = "AircraftWeaponPack", + actuator = { + D = 250, + T1 = 0.002, + T2 = 0.006, + Tf = 0.005, + fin_stall = 0, + max_delta = 0.26179938779915, + max_omega = 6.9813170079773, + sim_count = 4 + }, autopilot = { - J_Angle_K = 0.20943951023932, - J_Angle_W = 3.5, - J_Diff_K = 0.4, - J_FinAngle_K = 0.31415926535898, - J_Int_K = 0, - J_Power_K = 1.2, - K = 100, - Kg = 6, - Ki = 0, - delay = 1, - finsLimit = 0.22, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.20943951023932, + K_Eloc = -0.003, + K_Eloc_x = 0.0001, + K_Fi = 0.6, + K_LOS_omega = 6.2, + K_fins = 1, + K_fins_x = 0.4, + K_n1 = 0.018, + K_n2 = 0.001, + K_roll = 1, + Ki_LOS_omega = 2.4, + Ki_dG = -0.02, + delay_guidance = 1, + delay_roll = 0.4, + fins_limit = 0.26179938779915, + fins_limit_x = 0.33161255787892, + have_switching_delay = true, + min_loft_time = 1.4, + n_limit = 7, + n_req = 0.6, + null_roll = 0.78539816339745, + op_time = 200 }, - booster = { + boost = { boost_factor = 0, boost_time = 0, custom_smoke_dissipation_factor = 0.2, @@ -238,27 +309,51 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { }, display_name_short = "Kh-25", fm = { - A = 0.36, - I = 353.65833333333, - I_x = 30, - Kw_x = 0.001, - L = 3.7, - Ma = 0.3, - Ma_x = 0.001, - Mw = 1.116, - Sw = 0.46, + 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.34, 0.34, 0.34, 0.34, 0.59, 0.65, 0.655, 0.651, 0.63, 0.592, 0.556, 0.556 }, + CxB = { 0.034, 0.034, 0.034, 0.034, 0.04, 0.188, 0.188, 0.142, 0.112, 0.091, 0.076, 0.076 }, + 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.8, + Iy = 207, + Iz = 207, + 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 = 4.255, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + S = 0.059, caliber = 0.275, - cx_coeff = { 1, 0.55, 1, 0.75, 1.2 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, - mass = 310, - maxAoa = 0.3, - wind_sigma = 20, - wind_time = 1000 + delta_max = 0.26179938779915, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, + mass = 316, + 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 }, fuze_proximity = { ignore_inp_armed = 0 }, + gimbal = { + delay = 0, + lock_time = 0, + max_tracking_rate = 0.1221730476396, + op_time = 200, + pitch_max = 0.5235987755983, + tracking_gain = 10, + yaw_max = 0.5235987755983 + }, manualWeaponFlag = 1, march = { boost_factor = 0, @@ -276,23 +371,26 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { mass = 310, model = "X-25MP", name = "Kh25MP_PRGS1VP", - radio_seeker = { - FOV = 0.5235987755983, + scheme = "schemes/missiles/KH-25MP.sch", + seeker = { + FOV = 2.0943951023932, + abs_err_val = 2, + aim_sigma = 4, aim_y_offset = 2, - blind_ctrl_dist = 2000, + ang_err_val = 0.00013962634015955, blind_rad_val = 0.2, calc_aim_dist = 500000, + delay = 1.5, err_correct_time = 2.5, - err_val = 0.0065, - keep_aim_time = 0.1, - min_sens_rad_val = 0.0005, - no_signal_turn_off_time = 0.1, + filter_ignore_strings = { "EWR", "ewr" }, + keep_aim_time = 4, + lock_manual_target_types_only = 0, + max_w_LOS = 0.34906585039887, op_time = 90, - pos_memory_time = 0.1, - sens_far_dist = 15000, - sens_near_dist = 300 + pos_memory_time = 40, + sens_far_dist = 70000, + sens_near_dist = 100 }, - scheme = "schemes/missiles/anti_radiation_missile.sch", shape_table_data = { { file = "X-25MP", fire = { 0, 1 }, @@ -302,9 +400,6 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { username = "Kh-25MP" } }, sigma = { 0, 0, 0 }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 - }, t_acc = 0, t_b = 0, t_marsh = 10000, @@ -337,6 +432,11 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { other_factors = { 1, 1, 1 }, piercing_mass = 17.2 }, + wcs_emulator = { + K_loft = 2.5e-05, + delay = 0.005, + los_roll = 0 + }, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, sounderName = "Weapons/Missile", diff --git a/_G/weapons_table/weapons/missiles/Mistral.lua b/_G/weapons_table/weapons/missiles/Mistral.lua index 60f0187d..c80cbc73 100644 --- a/_G/weapons_table/weapons/missiles/Mistral.lua +++ b/_G/weapons_table/weapons/missiles/Mistral.lua @@ -1,7 +1,8 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { Reflection = 0.0182, - _file = "./CoreMods/aircraft/SA342/SA342_Weapons.lua", - _origin = "SA342 AI by Polychop-Simulations", + _file = "./CoreMods/tech/TechWeaponPack/Database/Weapons/manpads_missiles.lua", + _origin = "TechWeaponPack", + _unique_resource_name = "weapons.missiles.Mistral", caliber = 0.09, client = { Cx_pil = 1, @@ -31,8 +32,8 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { X_back = 0, Y_back = 0, Z_back = 0, - _file = "./CoreMods/aircraft/SA342/SA342_Weapons.lua", - _origin = "SA342 AI by Polychop-Simulations", + _file = "./CoreMods/tech/TechWeaponPack/Database/Weapons/manpads_missiles.lua", + _origin = "TechWeaponPack", autopilot = { K = 5, Kg = 0.1, @@ -91,9 +92,11 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { mass = 18.7, maxAoa = 0.27925268031909 }, - fuze_proximity = { - ignore_inp_armed = 1, - radius = 2 + fuze = { + default_arm_delays = { 0.8 }, + default_proximity_radius = 2, + default_self_destruct_delay = 14, + is_proxy_tdd_always_enabled = true }, march = { boost_factor = 0, @@ -137,7 +140,6 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { sigma = { 10, 10, 10 }, simple_IR_seeker = { FOV = 0.069813170079773, - GimbLim = 0.66322511575785, ccm_k0 = 0.5, cooled = true, delay = 0, @@ -147,6 +149,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { target_H_min = 0 }, simple_gyrostab_seeker = { + gimbal_lim = 0.66322511575785, omega_max = 0.34906585039887 }, t_acc = 0, @@ -169,17 +172,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { piercing_mass = 0.6 }, warhead_air = { - caliber = 93, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, - expl_mass = 3, - fantom = 1, - mass = 3, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0.6 + fantom = 1 }, wsTypeOfWeapon = { 4, 4, 34, "Redacted" } }, @@ -216,8 +209,8 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { X_back = 0, Y_back = 0, Z_back = 0, - _file = "./CoreMods/aircraft/SA342/SA342_Weapons.lua", - _origin = "SA342 AI by Polychop-Simulations", + _file = "./CoreMods/tech/TechWeaponPack/Database/Weapons/manpads_missiles.lua", + _origin = "TechWeaponPack", autopilot = { K = 5, Kg = 0.1, @@ -276,9 +269,11 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { mass = 18.7, maxAoa = 0.27925268031909 }, - fuze_proximity = { - ignore_inp_armed = 1, - radius = 2 + fuze = { + default_arm_delays = { 0.8 }, + default_proximity_radius = 2, + default_self_destruct_delay = 14, + is_proxy_tdd_always_enabled = true }, march = { boost_factor = 0, @@ -322,7 +317,6 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { sigma = { 10, 10, 10 }, simple_IR_seeker = { FOV = 0.069813170079773, - GimbLim = 0.66322511575785, ccm_k0 = 0.5, cooled = true, delay = 0, @@ -332,6 +326,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { target_H_min = 0 }, simple_gyrostab_seeker = { + gimbal_lim = 0.66322511575785, omega_max = 0.34906585039887 }, t_acc = 0, @@ -354,17 +349,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { piercing_mass = 0.6 }, warhead_air = { - caliber = 93, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, - expl_mass = 3, - fantom = 0, - mass = 3, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0.6 + fantom = 0 }, wsTypeOfWeapon = { 4, 4, 34, "Redacted" } }, diff --git a/_G/weapons_table/weapons/missiles/Rb_04.lua b/_G/weapons_table/weapons/missiles/Rb_04.lua index c6c6d2ab..890a1e8a 100644 --- a/_G/weapons_table/weapons/missiles/Rb_04.lua +++ b/_G/weapons_table/weapons/missiles/Rb_04.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb_04"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.Rb_04", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.5, client = { Cx_pil = 8, @@ -34,7 +34,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb_04"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.6, Kd = 0, @@ -272,7 +272,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb_04"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.6, Kd = 0, diff --git a/_G/weapons_table/weapons/missiles/Sea_Dart.lua b/_G/weapons_table/weapons/missiles/Sea_Dart.lua index 31e442f5..fddce31b 100644 --- a/_G/weapons_table/weapons/missiles/Sea_Dart.lua +++ b/_G/weapons_table/weapons/missiles/Sea_Dart.lua @@ -7,14 +7,14 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Dart"] = { client = { Cx_pil = 2.5, D_max = 56000, - D_min = 1000, + D_min = 4100, Diam = 420, Escort = 3, Fi_excort = 0, Fi_rak = 3.1415926535898, Fi_search = 2.0943951023932, Fi_start = 2.0943951023932, - H_max = 18300, + H_max = 25000, H_min = 30, H_min_t = 30, Head_Form = 1, @@ -22,7 +22,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Dart"] = { KillDistance = 15, Life_Time = 600, M = 549, - Mach_max = 3, + Mach_max = 3.5, Nr_max = 10, OmViz_max = 0, Range_max = 56000, @@ -94,12 +94,12 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Dart"] = { wind_time = 0 }, fuze = { - default_arm_delays = { 10 }, + default_arm_delays = { 7 }, default_function_delays = { 0.01 }, default_proximity_radius = 15, is_impact_fuze_nondelay = true, is_proxy_tdd_always_enabled = true, - tdd_vdiff_max = 1500 + tdd_vdiff_max = 2000 }, march = { AEC = 1.18, @@ -159,7 +159,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Dart"] = { t_b = 0, t_marsh = 17.5, user_name = "GWS-30 Sea Dart", - v_mid = 300, + v_mid = 900, v_min = 0, warhead = { caliber = 420, @@ -187,14 +187,14 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Dart"] = { server = { Cx_pil = 2.5, D_max = 56000, - D_min = 1000, + D_min = 4100, Diam = 420, Escort = 3, Fi_excort = 0, Fi_rak = 3.1415926535898, Fi_search = 2.0943951023932, Fi_start = 2.0943951023932, - H_max = 18300, + H_max = 25000, H_min = 30, H_min_t = 30, Head_Form = 1, @@ -202,7 +202,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Dart"] = { KillDistance = 15, Life_Time = 600, M = 549, - Mach_max = 3, + Mach_max = 3.5, Nr_max = 10, OmViz_max = 0, Range_max = 56000, @@ -274,12 +274,12 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Dart"] = { wind_time = 0 }, fuze = { - default_arm_delays = { 10 }, + default_arm_delays = { 7 }, default_function_delays = { 0.01 }, default_proximity_radius = 15, is_impact_fuze_nondelay = true, is_proxy_tdd_always_enabled = true, - tdd_vdiff_max = 1500 + tdd_vdiff_max = 2000 }, march = { AEC = 1.18, @@ -339,7 +339,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Dart"] = { t_b = 0, t_marsh = 17.5, user_name = "GWS-30 Sea Dart", - v_mid = 300, + v_mid = 900, v_min = 0, warhead = { caliber = 420, diff --git a/_G/weapons_table/weapons/missiles/X_25ML.lua b/_G/weapons_table/weapons/missiles/X_25ML.lua index 0830c5be..e7dbb2ef 100644 --- a/_G/weapons_table/weapons/missiles/X_25ML.lua +++ b/_G/weapons_table/weapons/missiles/X_25ML.lua @@ -6,8 +6,8 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { caliber = 0.275, client = { Cx_pil = 8.57, - D_max = 7000, - D_min = 2500, + D_max = 11500, + D_min = 2000, Diam = 275, Escort = 1, Fi_excort = 0.7, @@ -20,12 +20,14 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { Head_Form = 0, Head_Type = 4, KillDistance = 0, + LaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 11450, 11450, 11450, 11450, 11450, 11450, 11500, 200, 11400, 11400, 11400, 11400, 11450, 11500, 11500, 300, 11400, 11400, 11400, 11400, 11400, 11450, 11450, 500, 11400, 11400, 11400, 11400, 11400, 11450, 11500, 700, 11300, 11300, 11300, 11300, 11300, 11300, 11400, 1000, 11300, 11300, 11300, 11300, 11300, 11400, 11500, 2000, 11200, 11200, 11200, 11200, 11200, 11300, 11400, 3000, 11100, 11000, 11100, 11000, 11100, 11200, 11200, 4000, 10800, 10800, 10800, 10800, 10900, 11000, 11000, 5000, 10400, 10400, 10500, 10400, 10600, 10600, 10700 }, Life_Time = 60, M = 316, Mach_max = 2.5, + MinLaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 2000, 2000, 2000, 2000, 2000, 2250, 2550, 200, 2000, 2000, 2000, 2000, 2200, 2500, 2850, 300, 2000, 2000, 2000, 2000, 2350, 2700, 3050, 500, 2000, 2000, 2000, 2000, 2350, 3050, 3450, 700, 2000, 2000, 2000, 2000, 2350, 2350, 2400, 1000, 2000, 2000, 2000, 2000, 2350, 2700, 4200, 2000, 2000, 2000, 2000, 2000, 2350, 3700, 4300, 3000, 2000, 2000, 2200, 1800, 2600, 4700, 5400, 4000, 2000, 2800, 2400, 3400, 4500, 5500, 6300, 5000, 2100, 2800, 3600, 2800, 5500, 6500, 7100 }, Nr_max = 12, OmViz_max = 0.12, - Range_max = 8000, + Range_max = 11500, Reflection = 0.08, X_back = -1.092, Y_back = -0.14, @@ -44,28 +46,28 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { }, autopilot = { Fi_fix_angle_req = -0.20943951023932, - K_Eloc = 0.001, + K_Eloc = -0.002, K_Eloc_x = 0.0001, - K_Fi = 0.4, - K_LOS_omega = 2.57, + K_Fi = 0.6, + K_LOS_omega = 5, K_fins = 1, K_fins_x = 0.4, K_n1 = 0.02, K_n2 = 0.001, K_roll = 1, - Ki_LOS_omega = 2.97, - Ki_dG = -0.07, - delay_guidance = 1, - delay_roll = 0.4, + Ki_LOS_omega = 2, + Ki_dG = -0.05, + delay_guidance = 0.12, + delay_roll = 0.02, fins_limit = 0.26179938779915, fins_limit_x = 0.33161255787892, have_switching_delay = true, - n_limit = 10, + n_limit = 7, n_req = 0.6, null_roll = 0.78539816339745, op_time = 90 }, - booster = { + boost = { boost_factor = 0, boost_time = 0, custom_smoke_dissipation_factor = 0.2, @@ -149,7 +151,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { seeker = { FOV = 0.034906585039887, delay = 0, - max_seeker_range = 8000 + max_seeker_range = 12000 }, sigma = { 8, 8, 8 }, t_acc = 3, @@ -187,7 +189,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { piercing_mass = 9.24 }, wcs_emulator = { - K_loft = 2.5e-05, + K_loft = 0.0025, delay = 0.005, los_roll = 0 }, @@ -200,8 +202,8 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { name = "X_25ML", server = { Cx_pil = 8.57, - D_max = 7000, - D_min = 2500, + D_max = 11500, + D_min = 2000, Diam = 275, Escort = 1, Fi_excort = 0.7, @@ -214,12 +216,14 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { Head_Form = 0, Head_Type = 4, KillDistance = 0, + LaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 11450, 11450, 11450, 11450, 11450, 11450, 11500, 200, 11400, 11400, 11400, 11400, 11450, 11500, 11500, 300, 11400, 11400, 11400, 11400, 11400, 11450, 11450, 500, 11400, 11400, 11400, 11400, 11400, 11450, 11500, 700, 11300, 11300, 11300, 11300, 11300, 11300, 11400, 1000, 11300, 11300, 11300, 11300, 11300, 11400, 11500, 2000, 11200, 11200, 11200, 11200, 11200, 11300, 11400, 3000, 11100, 11000, 11100, 11000, 11100, 11200, 11200, 4000, 10800, 10800, 10800, 10800, 10900, 11000, 11000, 5000, 10400, 10400, 10500, 10400, 10600, 10600, 10700 }, Life_Time = 60, M = 316, Mach_max = 2.5, + MinLaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 2000, 2000, 2000, 2000, 2000, 2250, 2550, 200, 2000, 2000, 2000, 2000, 2200, 2500, 2850, 300, 2000, 2000, 2000, 2000, 2350, 2700, 3050, 500, 2000, 2000, 2000, 2000, 2350, 3050, 3450, 700, 2000, 2000, 2000, 2000, 2350, 2350, 2400, 1000, 2000, 2000, 2000, 2000, 2350, 2700, 4200, 2000, 2000, 2000, 2000, 2000, 2350, 3700, 4300, 3000, 2000, 2000, 2200, 1800, 2600, 4700, 5400, 4000, 2000, 2800, 2400, 3400, 4500, 5500, 6300, 5000, 2100, 2800, 3600, 2800, 5500, 6500, 7100 }, Nr_max = 12, OmViz_max = 0.12, - Range_max = 8000, + Range_max = 11500, Reflection = 0.08, X_back = -1.092, Y_back = -0.14, @@ -238,28 +242,28 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { }, autopilot = { Fi_fix_angle_req = -0.20943951023932, - K_Eloc = 0.001, + K_Eloc = -0.002, K_Eloc_x = 0.0001, - K_Fi = 0.4, - K_LOS_omega = 2.57, + K_Fi = 0.6, + K_LOS_omega = 5, K_fins = 1, K_fins_x = 0.4, K_n1 = 0.02, K_n2 = 0.001, K_roll = 1, - Ki_LOS_omega = 2.97, - Ki_dG = -0.07, - delay_guidance = 1, - delay_roll = 0.4, + Ki_LOS_omega = 2, + Ki_dG = -0.05, + delay_guidance = 0.12, + delay_roll = 0.02, fins_limit = 0.26179938779915, fins_limit_x = 0.33161255787892, have_switching_delay = true, - n_limit = 10, + n_limit = 7, n_req = 0.6, null_roll = 0.78539816339745, op_time = 90 }, - booster = { + boost = { boost_factor = 0, boost_time = 0, custom_smoke_dissipation_factor = 0.2, @@ -343,7 +347,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { seeker = { FOV = 0.034906585039887, delay = 0, - max_seeker_range = 8000 + max_seeker_range = 12000 }, sigma = { 8, 8, 8 }, t_acc = 3, @@ -381,7 +385,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { piercing_mass = 9.24 }, wcs_emulator = { - K_loft = 2.5e-05, + K_loft = 0.0025, delay = 0.005, los_roll = 0 }, diff --git a/_G/weapons_table/weapons/missiles/X_25MP.lua b/_G/weapons_table/weapons/missiles/X_25MP.lua index a4177f70..30acfde5 100644 --- a/_G/weapons_table/weapons/missiles/X_25MP.lua +++ b/_G/weapons_table/weapons/missiles/X_25MP.lua @@ -7,7 +7,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MP"] = { client = { Cx_pil = 8.57, D_max = 27000, - D_min = 3000, + D_min = 3300, Diam = 275, Escort = 0, Fi_excort = 0.7, @@ -20,10 +20,11 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MP"] = { Head_Form = 1, Head_Type = 3, KillDistance = 5, - LaunchDistData = { 19, 9, 50, 100, 150, 200, 250, 300, 350, 400, 450, 100, 14000, 15000, 17000, 19000, 20000, 22000, 24000, 26000, 29000, 300, 14000, 16000, 17000, 19000, 21000, 23000, 25000, 27000, 30000, 500, 15000, 17000, 18000, 20000, 22000, 24000, 26000, 28000, 30000, 800, 16000, 17000, 19000, 21000, 23000, 25000, 27000, 29000, 31000, 1000, 16000, 18000, 20000, 21000, 23000, 25000, 27000, 30000, 32000, 2000, 18000, 20000, 22000, 23000, 25000, 27000, 30000, 32000, 34000, 3000, 22000, 24000, 25000, 27000, 29000, 31000, 33000, 35000, 38000, 4000, 23000, 25000, 27000, 29000, 31000, 33000, 35000, 38000, 40000, 5000, 25000, 27000, 29000, 31000, 33000, 35000, 38000, 40000, 43000, 6000, 26000, 28000, 31000, 33000, 35000, 37000, 40000, 42000, 45000, 7000, 28000, 30000, 32000, 35000, 37000, 40000, 42000, 45000, 48000, 8000, 29000, 32000, 34000, 37000, 39000, 42000, 45000, 48000, 51000, 9000, 31000, 33000, 36000, 38000, 41000, 44000, 47000, 50000, 53000, 10000, 32000, 35000, 38000, 40000, 43000, 46000, 50000, 53000, 56000, 11000, 34000, 36000, 39000, 42000, 45000, 49000, 52000, 55000, 58000, 12000, 35000, 38000, 41000, 44000, 47000, 51000, 54000, 58000, 61000, 13000, 35000, 39000, 43000, 46000, 49000, 53000, 56000, 60000, 63000, 14000, 36000, 40000, 44000, 48000, 49000, 55000, 58000, 62000, 65000, 15000, 38000, 41000, 46000, 50000, 53000, 57000, 60000, 64000, 68000 }, + LaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 9220, 9220, 9220, 9220, 9220, 27180, 28080, 28890, 200, 15520, 15520, 15520, 15520, 15520, 27330, 28230, 29040, 300, 17040, 17040, 17040, 17040, 17040, 27470, 28370, 29180, 400, 18240, 18240, 18240, 18240, 18240, 27610, 28500, 29300, 500, 19180, 19180, 19180, 19180, 19180, 27740, 28630, 29450, 600, 19980, 19980, 19980, 19980, 19980, 27870, 28760, 29600, 700, 20640, 20640, 20640, 20640, 20640, 27990, 28910, 29750, 800, 21225, 21225, 21225, 21225, 21225, 28100, 29050, 29875, 900, 21725, 21725, 21725, 21725, 21725, 28250, 29175, 30025, 1000, 22950, 24175, 25300, 26325, 27325, 28375, 29300, 30150, 2000, 24350, 25425, 26450, 27450, 28525, 29600, 30575, 31425, 3000, 25250, 26300, 26550, 26550, 26700, 30700, 31450, 31500, 4000, 26050, 27150, 28200, 29250, 30600, 31500, 31550, 31600, 5000, 26700, 27900, 29000, 30100, 30800, 30900, 30900, 31700, 6000, 26750, 27500, 28500, 30250, 30500, 31500, 32250, 32750, 7000, 27750, 28500, 29500, 30750, 31750, 32500, 33500, 34250, 8000, 28500, 29500, 30750, 32000, 33000, 33750, 34750, 35500, 9000, 29750, 30750, 31500, 33000, 34000, 35000, 36000, 37000, 10000, 30500, 31500, 32500, 34000, 35250, 36250, 37250, 38250, 11000, 31000, 32500, 33500, 35000, 36000, 37000, 38000, 39500, 12000, 32000, 33500, 34500, 36000, 37500, 38500, 39500, 40500, 13000, 33000, 34000, 35500, 37500, 38500, 39500, 40500, 41500, 14000, 33500, 35000, 37000, 38500, 39500, 41000, 42000, 43000, 15000, 34500, 36000, 38000, 39500, 41000, 42000, 43000, 44500 }, Life_Time = 300, M = 310, Mach_max = 2.65, + MinLaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 3560, 3560, 3560, 3560, 3560, 5180, 5260, 5330, 200, 4130, 4130, 4130, 4130, 4130, 5190, 5270, 5350, 300, 4270, 4270, 4270, 4270, 4270, 5210, 5290, 5360, 400, 4380, 4380, 4380, 4380, 4380, 5220, 5300, 5370, 500, 4460, 4460, 4460, 4460, 4460, 5230, 5310, 5480, 600, 4530, 4530, 4530, 4530, 4530, 5240, 5340, 5680, 700, 4590, 4590, 4590, 4590, 4590, 5250, 5530, 5870, 800, 4650, 4650, 4650, 4650, 4650, 5275, 5700, 6050, 900, 4700, 4700, 4700, 4700, 4700, 5375, 5875, 6225, 1000, 4800, 4925, 5025, 5100, 5200, 5525, 6025, 6375, 2000, 4925, 5025, 5125, 5200, 6000, 6725, 7300, 7825, 3000, 5000, 5100, 5150, 5150, 6500, 7700, 8400, 8900, 4000, 5100, 5200, 5350, 5600, 7700, 8750, 9450, 9950, 5000, 5200, 5400, 5700, 6200, 8600, 9600, 8900, 11000, 6000, 5250, 5250, 5500, 7000, 9750, 10750, 11500, 12000, 7000, 5250, 5500, 5500, 9000, 10750, 11750, 12500, 13000, 8000, 5500, 5500, 5500, 10000, 11750, 12750, 13500, 14000, 9000, 5500, 5500, 5750, 11250, 12500, 13500, 14500, 15000, 10000, 5500, 5750, 6000, 12250, 13500, 14500, 15500, 16000, 11000, 5500, 6000, 10000, 13500, 14500, 15500, 16500, 17500, 12000, 6000, 6000, 11500, 14000, 15500, 17000, 17500, 18000, 13000, 6000, 6000, 12500, 15000, 16500, 18000, 19000, 19500, 14000, 6000, 7000, 14000, 16000, 18000, 19000, 20000, 21000, 15000, 6500, 8000, 15000, 17000, 19000, 20500, 21500, 22500 }, Nr_max = 12, OmViz_max = 99.9, Range_max = 60000, @@ -45,28 +46,29 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MP"] = { }, autopilot = { Fi_fix_angle_req = -0.20943951023932, - K_Eloc = 0.003, + K_Eloc = -0.003, K_Eloc_x = 0.0001, - K_Fi = 0.7, - K_LOS_omega = 0.18, + K_Fi = 0.6, + K_LOS_omega = 6.2, K_fins = 1, K_fins_x = 0.4, - K_n1 = 0.022, + K_n1 = 0.018, K_n2 = 0.001, K_roll = 1, - Ki_LOS_omega = 2.08, - Ki_dG = -0.05, + Ki_LOS_omega = 2.4, + Ki_dG = -0.02, delay_guidance = 1, delay_roll = 0.4, fins_limit = 0.26179938779915, fins_limit_x = 0.33161255787892, have_switching_delay = true, - n_limit = 10, + min_loft_time = 1.4, + n_limit = 7, n_req = 0.6, null_roll = 0.78539816339745, - op_time = 90 + op_time = 200 }, - booster = { + boost = { boost_factor = 0, boost_time = 0, custom_smoke_dissipation_factor = 0.2, @@ -127,10 +129,10 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MP"] = { gimbal = { delay = 0, lock_time = 0, - max_tracking_rate = 0.10471975511966, - op_time = 90, + max_tracking_rate = 0.1221730476396, + op_time = 200, pitch_max = 0.5235987755983, - tracking_gain = 50, + tracking_gain = 10, yaw_max = 0.5235987755983 }, march = { @@ -148,22 +150,26 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MP"] = { }, model = "X-25MP", name = "X_25MP", - radio_seeker = { - FOV = 0.087266462599716, + scheme = "schemes/missiles/KH-25MP.sch", + seeker = { + FOV = 2.0943951023932, + abs_err_val = 2, + aim_sigma = 4, aim_y_offset = 2, - blind_ctrl_dist = 2000, + ang_err_val = 0.00013962634015955, blind_rad_val = 0.2, calc_aim_dist = 500000, + delay = 1.5, err_correct_time = 2.5, - err_val = 0.0044, filter_ignore_strings = { "EWR", "ewr" }, keep_aim_time = 4, + lock_manual_target_types_only = 0, + max_w_LOS = 0.34906585039887, op_time = 90, pos_memory_time = 40, - sens_far_dist = 40000, - sens_near_dist = 300 + sens_far_dist = 70000, + sens_near_dist = 100 }, - scheme = "schemes/missiles/KH-25MP.sch", shape_table_data = { { file = "X-25MP", fire = { 0, 1 }, @@ -220,7 +226,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MP"] = { server = { Cx_pil = 8.57, D_max = 27000, - D_min = 3000, + D_min = 3300, Diam = 275, Escort = 0, Fi_excort = 0.7, @@ -233,10 +239,11 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MP"] = { Head_Form = 1, Head_Type = 3, KillDistance = 5, - LaunchDistData = { 19, 9, 50, 100, 150, 200, 250, 300, 350, 400, 450, 100, 14000, 15000, 17000, 19000, 20000, 22000, 24000, 26000, 29000, 300, 14000, 16000, 17000, 19000, 21000, 23000, 25000, 27000, 30000, 500, 15000, 17000, 18000, 20000, 22000, 24000, 26000, 28000, 30000, 800, 16000, 17000, 19000, 21000, 23000, 25000, 27000, 29000, 31000, 1000, 16000, 18000, 20000, 21000, 23000, 25000, 27000, 30000, 32000, 2000, 18000, 20000, 22000, 23000, 25000, 27000, 30000, 32000, 34000, 3000, 22000, 24000, 25000, 27000, 29000, 31000, 33000, 35000, 38000, 4000, 23000, 25000, 27000, 29000, 31000, 33000, 35000, 38000, 40000, 5000, 25000, 27000, 29000, 31000, 33000, 35000, 38000, 40000, 43000, 6000, 26000, 28000, 31000, 33000, 35000, 37000, 40000, 42000, 45000, 7000, 28000, 30000, 32000, 35000, 37000, 40000, 42000, 45000, 48000, 8000, 29000, 32000, 34000, 37000, 39000, 42000, 45000, 48000, 51000, 9000, 31000, 33000, 36000, 38000, 41000, 44000, 47000, 50000, 53000, 10000, 32000, 35000, 38000, 40000, 43000, 46000, 50000, 53000, 56000, 11000, 34000, 36000, 39000, 42000, 45000, 49000, 52000, 55000, 58000, 12000, 35000, 38000, 41000, 44000, 47000, 51000, 54000, 58000, 61000, 13000, 35000, 39000, 43000, 46000, 49000, 53000, 56000, 60000, 63000, 14000, 36000, 40000, 44000, 48000, 49000, 55000, 58000, 62000, 65000, 15000, 38000, 41000, 46000, 50000, 53000, 57000, 60000, 64000, 68000 }, + LaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 9220, 9220, 9220, 9220, 9220, 27180, 28080, 28890, 200, 15520, 15520, 15520, 15520, 15520, 27330, 28230, 29040, 300, 17040, 17040, 17040, 17040, 17040, 27470, 28370, 29180, 400, 18240, 18240, 18240, 18240, 18240, 27610, 28500, 29300, 500, 19180, 19180, 19180, 19180, 19180, 27740, 28630, 29450, 600, 19980, 19980, 19980, 19980, 19980, 27870, 28760, 29600, 700, 20640, 20640, 20640, 20640, 20640, 27990, 28910, 29750, 800, 21225, 21225, 21225, 21225, 21225, 28100, 29050, 29875, 900, 21725, 21725, 21725, 21725, 21725, 28250, 29175, 30025, 1000, 22950, 24175, 25300, 26325, 27325, 28375, 29300, 30150, 2000, 24350, 25425, 26450, 27450, 28525, 29600, 30575, 31425, 3000, 25250, 26300, 26550, 26550, 26700, 30700, 31450, 31500, 4000, 26050, 27150, 28200, 29250, 30600, 31500, 31550, 31600, 5000, 26700, 27900, 29000, 30100, 30800, 30900, 30900, 31700, 6000, 26750, 27500, 28500, 30250, 30500, 31500, 32250, 32750, 7000, 27750, 28500, 29500, 30750, 31750, 32500, 33500, 34250, 8000, 28500, 29500, 30750, 32000, 33000, 33750, 34750, 35500, 9000, 29750, 30750, 31500, 33000, 34000, 35000, 36000, 37000, 10000, 30500, 31500, 32500, 34000, 35250, 36250, 37250, 38250, 11000, 31000, 32500, 33500, 35000, 36000, 37000, 38000, 39500, 12000, 32000, 33500, 34500, 36000, 37500, 38500, 39500, 40500, 13000, 33000, 34000, 35500, 37500, 38500, 39500, 40500, 41500, 14000, 33500, 35000, 37000, 38500, 39500, 41000, 42000, 43000, 15000, 34500, 36000, 38000, 39500, 41000, 42000, 43000, 44500 }, Life_Time = 300, M = 310, Mach_max = 2.65, + MinLaunchDistData = { 24, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 3560, 3560, 3560, 3560, 3560, 5180, 5260, 5330, 200, 4130, 4130, 4130, 4130, 4130, 5190, 5270, 5350, 300, 4270, 4270, 4270, 4270, 4270, 5210, 5290, 5360, 400, 4380, 4380, 4380, 4380, 4380, 5220, 5300, 5370, 500, 4460, 4460, 4460, 4460, 4460, 5230, 5310, 5480, 600, 4530, 4530, 4530, 4530, 4530, 5240, 5340, 5680, 700, 4590, 4590, 4590, 4590, 4590, 5250, 5530, 5870, 800, 4650, 4650, 4650, 4650, 4650, 5275, 5700, 6050, 900, 4700, 4700, 4700, 4700, 4700, 5375, 5875, 6225, 1000, 4800, 4925, 5025, 5100, 5200, 5525, 6025, 6375, 2000, 4925, 5025, 5125, 5200, 6000, 6725, 7300, 7825, 3000, 5000, 5100, 5150, 5150, 6500, 7700, 8400, 8900, 4000, 5100, 5200, 5350, 5600, 7700, 8750, 9450, 9950, 5000, 5200, 5400, 5700, 6200, 8600, 9600, 8900, 11000, 6000, 5250, 5250, 5500, 7000, 9750, 10750, 11500, 12000, 7000, 5250, 5500, 5500, 9000, 10750, 11750, 12500, 13000, 8000, 5500, 5500, 5500, 10000, 11750, 12750, 13500, 14000, 9000, 5500, 5500, 5750, 11250, 12500, 13500, 14500, 15000, 10000, 5500, 5750, 6000, 12250, 13500, 14500, 15500, 16000, 11000, 5500, 6000, 10000, 13500, 14500, 15500, 16500, 17500, 12000, 6000, 6000, 11500, 14000, 15500, 17000, 17500, 18000, 13000, 6000, 6000, 12500, 15000, 16500, 18000, 19000, 19500, 14000, 6000, 7000, 14000, 16000, 18000, 19000, 20000, 21000, 15000, 6500, 8000, 15000, 17000, 19000, 20500, 21500, 22500 }, Nr_max = 12, OmViz_max = 99.9, Range_max = 60000, @@ -258,28 +265,29 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MP"] = { }, autopilot = { Fi_fix_angle_req = -0.20943951023932, - K_Eloc = 0.003, + K_Eloc = -0.003, K_Eloc_x = 0.0001, - K_Fi = 0.7, - K_LOS_omega = 0.18, + K_Fi = 0.6, + K_LOS_omega = 6.2, K_fins = 1, K_fins_x = 0.4, - K_n1 = 0.022, + K_n1 = 0.018, K_n2 = 0.001, K_roll = 1, - Ki_LOS_omega = 2.08, - Ki_dG = -0.05, + Ki_LOS_omega = 2.4, + Ki_dG = -0.02, delay_guidance = 1, delay_roll = 0.4, fins_limit = 0.26179938779915, fins_limit_x = 0.33161255787892, have_switching_delay = true, - n_limit = 10, + min_loft_time = 1.4, + n_limit = 7, n_req = 0.6, null_roll = 0.78539816339745, - op_time = 90 + op_time = 200 }, - booster = { + boost = { boost_factor = 0, boost_time = 0, custom_smoke_dissipation_factor = 0.2, @@ -340,10 +348,10 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MP"] = { gimbal = { delay = 0, lock_time = 0, - max_tracking_rate = 0.10471975511966, - op_time = 90, + max_tracking_rate = 0.1221730476396, + op_time = 200, pitch_max = 0.5235987755983, - tracking_gain = 50, + tracking_gain = 10, yaw_max = 0.5235987755983 }, march = { @@ -361,22 +369,26 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MP"] = { }, model = "X-25MP", name = "X_25MP", - radio_seeker = { - FOV = 0.087266462599716, + scheme = "schemes/missiles/KH-25MP.sch", + seeker = { + FOV = 2.0943951023932, + abs_err_val = 2, + aim_sigma = 4, aim_y_offset = 2, - blind_ctrl_dist = 2000, + ang_err_val = 0.00013962634015955, blind_rad_val = 0.2, calc_aim_dist = 500000, + delay = 1.5, err_correct_time = 2.5, - err_val = 0.0044, filter_ignore_strings = { "EWR", "ewr" }, keep_aim_time = 4, + lock_manual_target_types_only = 0, + max_w_LOS = 0.34906585039887, op_time = 90, pos_memory_time = 40, - sens_far_dist = 40000, - sens_near_dist = 300 + sens_far_dist = 70000, + sens_near_dist = 100 }, - scheme = "schemes/missiles/KH-25MP.sch", shape_table_data = { { file = "X-25MP", fire = { 0, 1 }, diff --git a/_G/weapons_table/weapons/missiles/X_25MR.lua b/_G/weapons_table/weapons/missiles/X_25MR.lua index 8cfbcd56..9974c5de 100644 --- a/_G/weapons_table/weapons/missiles/X_25MR.lua +++ b/_G/weapons_table/weapons/missiles/X_25MR.lua @@ -33,14 +33,17 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MR"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/kh25_29_family.lua", _origin = "AircraftWeaponPack", autopilot = { - Kd = 0.006, - Ki = 0.004, - Kp = 0.008, - delay = 0.9, - fins_discreet = 0.001, + Kd = 0.0022, + Ki = 0.0032, + Kp = 0.4, + delay_guidance = 1.4, + delay_roll = 0.4, + fins_limit = 0.34906585039887, + fins_limit_x = 0.34906585039887, max_ctrl_angle = 1, - no_ctrl_center_ang = 5e-05, - op_time = 0 + no_ctrl_center_ang = 1.5e-05, + null_roll = -0.78539816339745, + op_time = 40 }, booster = { boost_factor = 0, @@ -56,7 +59,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MR"] = { work_time = 2 }, category = 2, - class_name = "wAmmunitionVikhr", + class_name = "wAmmunitionAtgm", controller = { boost_start = 0, march_start = 2 @@ -65,21 +68,38 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MR"] = { display_name_short = "Kh-25", exhaust = { 0.63, 0.67, 0.75, 0.2 }, fm = { - A = 0.6, - I = 338.8275, - L = 3.7, - Ma = 0.4, - Mw = 1.2, - 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 = 148, + Iz = 148, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + S = 0.059, caliber = 0.275, - cx_coeff = { 1, 0.55, 1, 0.75, 1.2 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, - lockRoll = 1, - mass = 300, - maxAoa = 0.24, + delta_max = 0.26179938779915, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, + mass = 297, + 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 }, march = { boost_factor = 0, @@ -96,7 +116,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MR"] = { }, model = "X-25MP", name = "X_25MR", - scheme = "schemes/missiles/command_guided_missile.sch", + scheme = "schemes/missiles/KH-25MR.sch", sigma = { 5.6, 6, 5.6 }, spiral_nav = { def_cone_max_dist = 10000, @@ -148,7 +168,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MR"] = { }, display_name = "Kh-25MR", display_name_short = "Kh-25", - mass = 300, + mass = 297, model = "X-25MP", name = "X_25MR", server = { @@ -180,14 +200,17 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MR"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/kh25_29_family.lua", _origin = "AircraftWeaponPack", autopilot = { - Kd = 0.006, - Ki = 0.004, - Kp = 0.008, - delay = 0.9, - fins_discreet = 0.001, + Kd = 0.0022, + Ki = 0.0032, + Kp = 0.4, + delay_guidance = 1.4, + delay_roll = 0.4, + fins_limit = 0.34906585039887, + fins_limit_x = 0.34906585039887, max_ctrl_angle = 1, - no_ctrl_center_ang = 5e-05, - op_time = 0 + no_ctrl_center_ang = 1.5e-05, + null_roll = -0.78539816339745, + op_time = 40 }, booster = { boost_factor = 0, @@ -203,7 +226,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MR"] = { work_time = 2 }, category = 2, - class_name = "wAmmunitionVikhr", + class_name = "wAmmunitionAtgm", controller = { boost_start = 0, march_start = 2 @@ -212,21 +235,38 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MR"] = { display_name_short = "Kh-25", exhaust = { 0.63, 0.67, 0.75, 0.2 }, fm = { - A = 0.6, - I = 338.8275, - L = 3.7, - Ma = 0.4, - Mw = 1.2, - 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 = 148, + Iz = 148, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + S = 0.059, caliber = 0.275, - cx_coeff = { 1, 0.55, 1, 0.75, 1.2 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, - lockRoll = 1, - mass = 300, - maxAoa = 0.24, + delta_max = 0.26179938779915, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, + mass = 297, + 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 }, march = { boost_factor = 0, @@ -243,7 +283,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25MR"] = { }, model = "X-25MP", name = "X_25MR", - scheme = "schemes/missiles/command_guided_missile.sch", + scheme = "schemes/missiles/KH-25MR.sch", sigma = { 5.6, 6, 5.6 }, spiral_nav = { def_cone_max_dist = 10000, diff --git a/_G/weapons_table/weapons/missiles/X_29L.lua b/_G/weapons_table/weapons/missiles/X_29L.lua index 6f7e9c8f..c305251b 100644 --- a/_G/weapons_table/weapons/missiles/X_29L.lua +++ b/_G/weapons_table/weapons/missiles/X_29L.lua @@ -6,8 +6,8 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { caliber = 0.38, client = { Cx_pil = 16.37, - D_max = 8000, - D_min = 3000, + D_max = 11500, + D_min = 2500, Diam = 380, Escort = 1, Fi_excort = 1.05, @@ -20,13 +20,14 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { Head_Form = 0, Head_Type = 4, KillDistance = 0, - LaunchDistData = { 13, 13, 50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 500, 200, 6500, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11000, 11500, 12000, 12000, 300, 6500, 7250, 7750, 8250, 9000, 9500, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 400, 6500, 7250, 7750, 8500, 9000, 9500, 10000, 10500, 10750, 11250, 11750, 12000, 12000, 500, 6750, 7250, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 1000, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 12000, 1500, 7500, 8000, 8500, 9000, 9750, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 2000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 2500, 7750, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 3000, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 3500, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 4000, 8500, 9000, 9500, 10000, 10750, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 12000, 4500, 8500, 9000, 9500, 10000, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000, 5000, 8500, 9000, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000 }, + LaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 11450, 11450, 11450, 11450, 11450, 11450, 11450, 200, 11400, 11400, 11400, 11400, 11450, 11450, 11450, 300, 11400, 11400, 11400, 11400, 11400, 11450, 11450, 500, 11400, 11400, 11400, 11400, 11450, 11450, 11450, 700, 11300, 11300, 11300, 11300, 11400, 11400, 11400, 1000, 11300, 11300, 11300, 11400, 11300, 11400, 11400, 2000, 11300, 11300, 11300, 11300, 11300, 11300, 11400, 3000, 11100, 11100, 11200, 11100, 11200, 11200, 11200, 4000, 10900, 10900, 10900, 10900, 10900, 10900, 11000, 5000, 10600, 10500, 10600, 10500, 10600, 10600, 10600 }, Life_Time = 60, M = 648, Mach_max = 1.8, + MinLaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 2500, 2500, 2500, 2500, 2500, 2500, 2500, 200, 2500, 2500, 2500, 2500, 2500, 2500, 2500, 300, 2500, 2500, 2500, 2500, 2500, 2500, 2750, 500, 2500, 2500, 2500, 2500, 2600, 2900, 3150, 700, 2500, 2500, 2500, 2500, 2600, 2800, 3500, 1000, 2500, 2500, 2500, 2500, 2100, 3200, 3700, 2000, 2700, 2800, 2700, 2900, 3300, 4000, 4600, 3000, 3400, 3500, 3900, 3500, 3900, 4800, 5500, 4000, 4700, 4700, 4500, 4100, 4600, 5300, 5800, 5000, 5400, 5000, 5700, 4800, 5300, 5900, 6400 }, Nr_max = 10, OmViz_max = 0.12, - Range_max = 13000, + Range_max = 11500, Reflection = 0.175, X_back = -1.446, Y_back = -0.196, @@ -53,10 +54,12 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { K_fins_x = 0.6, K_n1 = 0.032, K_n2 = 0.001, + K_p_loft = 1.6, + K_p_turn = 0.018, K_roll = 1, Ki_LOS_omega = 5.2, Ki_dG = -0.12, - delay_guidance = 0.8, + delay_guidance = 1.4, delay_roll = 0.4, fins_limit = 0.31415926535898, fins_limit_x = 0.43633231299858, @@ -65,7 +68,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { null_roll = 0.78539816339745, op_time = 40 }, - booster = { + boost = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, impulse = 0, @@ -148,7 +151,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { seeker = { FOV = 0.034906585039887, delay = 0, - max_seeker_range = 8000 + max_seeker_range = 12000 }, sigma = { 8, 8, 8 }, t_acc = 6, @@ -199,8 +202,8 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { name = "X_29L", server = { Cx_pil = 16.37, - D_max = 8000, - D_min = 3000, + D_max = 11500, + D_min = 2500, Diam = 380, Escort = 1, Fi_excort = 1.05, @@ -213,13 +216,14 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { Head_Form = 0, Head_Type = 4, KillDistance = 0, - LaunchDistData = { 13, 13, 50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 500, 200, 6500, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11000, 11500, 12000, 12000, 300, 6500, 7250, 7750, 8250, 9000, 9500, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 400, 6500, 7250, 7750, 8500, 9000, 9500, 10000, 10500, 10750, 11250, 11750, 12000, 12000, 500, 6750, 7250, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 1000, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 12000, 1500, 7500, 8000, 8500, 9000, 9750, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 2000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 2500, 7750, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 3000, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 3500, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 4000, 8500, 9000, 9500, 10000, 10750, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 12000, 4500, 8500, 9000, 9500, 10000, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000, 5000, 8500, 9000, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000 }, + LaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 11450, 11450, 11450, 11450, 11450, 11450, 11450, 200, 11400, 11400, 11400, 11400, 11450, 11450, 11450, 300, 11400, 11400, 11400, 11400, 11400, 11450, 11450, 500, 11400, 11400, 11400, 11400, 11450, 11450, 11450, 700, 11300, 11300, 11300, 11300, 11400, 11400, 11400, 1000, 11300, 11300, 11300, 11400, 11300, 11400, 11400, 2000, 11300, 11300, 11300, 11300, 11300, 11300, 11400, 3000, 11100, 11100, 11200, 11100, 11200, 11200, 11200, 4000, 10900, 10900, 10900, 10900, 10900, 10900, 11000, 5000, 10600, 10500, 10600, 10500, 10600, 10600, 10600 }, Life_Time = 60, M = 648, Mach_max = 1.8, + MinLaunchDistData = { 10, 7, 150, 200, 250, 300, 350, 400, 450, 100, 2500, 2500, 2500, 2500, 2500, 2500, 2500, 200, 2500, 2500, 2500, 2500, 2500, 2500, 2500, 300, 2500, 2500, 2500, 2500, 2500, 2500, 2750, 500, 2500, 2500, 2500, 2500, 2600, 2900, 3150, 700, 2500, 2500, 2500, 2500, 2600, 2800, 3500, 1000, 2500, 2500, 2500, 2500, 2100, 3200, 3700, 2000, 2700, 2800, 2700, 2900, 3300, 4000, 4600, 3000, 3400, 3500, 3900, 3500, 3900, 4800, 5500, 4000, 4700, 4700, 4500, 4100, 4600, 5300, 5800, 5000, 5400, 5000, 5700, 4800, 5300, 5900, 6400 }, Nr_max = 10, OmViz_max = 0.12, - Range_max = 13000, + Range_max = 11500, Reflection = 0.175, X_back = -1.446, Y_back = -0.196, @@ -246,10 +250,12 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { K_fins_x = 0.6, K_n1 = 0.032, K_n2 = 0.001, + K_p_loft = 1.6, + K_p_turn = 0.018, K_roll = 1, Ki_LOS_omega = 5.2, Ki_dG = -0.12, - delay_guidance = 0.8, + delay_guidance = 1.4, delay_roll = 0.4, fins_limit = 0.31415926535898, fins_limit_x = 0.43633231299858, @@ -258,7 +264,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { null_roll = 0.78539816339745, op_time = 40 }, - booster = { + boost = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, impulse = 0, @@ -341,7 +347,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { seeker = { FOV = 0.034906585039887, delay = 0, - max_seeker_range = 8000 + max_seeker_range = 12000 }, sigma = { 8, 8, 8 }, t_acc = 6, diff --git a/_G/weapons_table/weapons/missiles/X_29T.lua b/_G/weapons_table/weapons/missiles/X_29T.lua index 010283e4..8b208da8 100644 --- a/_G/weapons_table/weapons/missiles/X_29T.lua +++ b/_G/weapons_table/weapons/missiles/X_29T.lua @@ -6,7 +6,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { caliber = 0.38, client = { Cx_pil = 16.37, - D_max = 10000, + D_max = 12000, D_min = 3000, Diam = 380, Escort = 0, @@ -20,13 +20,14 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 13, 13, 50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 500, 200, 6500, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11000, 11500, 12000, 12000, 300, 6500, 7250, 7750, 8250, 9000, 9500, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 400, 6500, 7250, 7750, 8500, 9000, 9500, 10000, 10500, 10750, 11250, 11750, 12000, 12000, 500, 6750, 7250, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 1000, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 12000, 1500, 7500, 8000, 8500, 9000, 9750, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 2000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 2500, 7750, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 3000, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 3500, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 4000, 8500, 9000, 9500, 10000, 10750, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 12000, 4500, 8500, 9000, 9500, 10000, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000, 5000, 8500, 9000, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000 }, + LaunchDistData = { 7, 3, 100, 150, 200, 100, 10900, 12500, 12000, 200, 11800, 11800, 12000, 300, 11000, 11600, 12000, 500, 11000, 11800, 12000, 700, 11200, 12000, 12000, 1000, 11600, 12000, 12000, 2000, 12000, 12000, 12000 }, Life_Time = 120, M = 680, Mach_max = 1.4, + MinLaunchDistData = { 10, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 2600, 2700, 2700, 2700, 2700, 2700, 2700, 2700, 200, 2600, 2600, 2700, 2700, 2700, 2700, 2700, 2700, 300, 2600, 2600, 2800, 2800, 2800, 2800, 2800, 3000, 500, 2600, 2600, 2800, 2800, 2800, 2800, 3200, 3200, 700, 2600, 2600, 2800, 2800, 2800, 2800, 3000, 3600, 1000, 2600, 2800, 2800, 5600, 2800, 3000, 3200, 3800, 2000, 3000, 3000, 3000, 3500, 3000, 3500, 4500, 4500, 3000, 3500, 3500, 4500, 4500, 4000, 4500, 4500, 5500, 4000, 4500, 4500, 4500, 5000, 4500, 4500, 5500, 6000, 5000, 5000, 5000, 5000, 5500, 4500, 5500, 6000, 6500 }, Nr_max = 10, OmViz_max = 99.9, - Range_max = 15000, + Range_max = 12000, Reflection = 0.1729, X_back = -1.446, Y_back = -0.202, @@ -45,18 +46,20 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { }, autopilot = { Fi_fix_angle_req = -0.20943951023932, - K_Eloc = 0.004, + K_Eloc = 0.003, K_Eloc_x = 0.0001, K_Fi = 0.7, K_LOS_omega = 4.5, K_fins = 1, K_fins_x = 0.6, - K_n1 = 0.033, + K_n1 = 0.032, K_n2 = 0.001, + K_p_loft = 1.6, + K_p_turn = 0.018, K_roll = 1, Ki_LOS_omega = 5.2, Ki_dG = -0.12, - delay_guidance = 0.8, + delay_guidance = 1.4, delay_roll = 0.4, fins_limit = 0.31415926535898, fins_limit_x = 0.43633231299858, @@ -122,11 +125,10 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { gimbal = { delay = 0, lock_time = 0, - max_tracking_rate = 0.17453292519943, - mount_roll_angle = -0.78539816339745, + max_tracking_rate = 0.1221730476396, op_time = 40, pitch_max = 0.5235987755983, - tracking_gain = 50, + tracking_gain = 10, yaw_max = 0.5235987755983 }, march = { @@ -202,7 +204,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { name = "X_29T", server = { Cx_pil = 16.37, - D_max = 10000, + D_max = 12000, D_min = 3000, Diam = 380, Escort = 0, @@ -216,13 +218,14 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 13, 13, 50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 500, 200, 6500, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11000, 11500, 12000, 12000, 300, 6500, 7250, 7750, 8250, 9000, 9500, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 400, 6500, 7250, 7750, 8500, 9000, 9500, 10000, 10500, 10750, 11250, 11750, 12000, 12000, 500, 6750, 7250, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 1000, 7000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11500, 12000, 12000, 12000, 1500, 7500, 8000, 8500, 9000, 9750, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 2000, 7750, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 2500, 7750, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 3000, 8250, 8750, 9250, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 3500, 8500, 9000, 9500, 10000, 10500, 11000, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 4000, 8500, 9000, 9500, 10000, 10750, 11000, 11500, 12000, 12000, 12000, 12000, 12000, 12000, 4500, 8500, 9000, 9500, 10000, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000, 5000, 8500, 9000, 9750, 10250, 10750, 11250, 11750, 12000, 12000, 12000, 12000, 12000, 12000 }, + LaunchDistData = { 7, 3, 100, 150, 200, 100, 10900, 12500, 12000, 200, 11800, 11800, 12000, 300, 11000, 11600, 12000, 500, 11000, 11800, 12000, 700, 11200, 12000, 12000, 1000, 11600, 12000, 12000, 2000, 12000, 12000, 12000 }, Life_Time = 120, M = 680, Mach_max = 1.4, + MinLaunchDistData = { 10, 8, 100, 150, 200, 250, 300, 350, 400, 450, 100, 2600, 2700, 2700, 2700, 2700, 2700, 2700, 2700, 200, 2600, 2600, 2700, 2700, 2700, 2700, 2700, 2700, 300, 2600, 2600, 2800, 2800, 2800, 2800, 2800, 3000, 500, 2600, 2600, 2800, 2800, 2800, 2800, 3200, 3200, 700, 2600, 2600, 2800, 2800, 2800, 2800, 3000, 3600, 1000, 2600, 2800, 2800, 5600, 2800, 3000, 3200, 3800, 2000, 3000, 3000, 3000, 3500, 3000, 3500, 4500, 4500, 3000, 3500, 3500, 4500, 4500, 4000, 4500, 4500, 5500, 4000, 4500, 4500, 4500, 5000, 4500, 4500, 5500, 6000, 5000, 5000, 5000, 5000, 5500, 4500, 5500, 6000, 6500 }, Nr_max = 10, OmViz_max = 99.9, - Range_max = 15000, + Range_max = 12000, Reflection = 0.1729, X_back = -1.446, Y_back = -0.202, @@ -241,18 +244,20 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { }, autopilot = { Fi_fix_angle_req = -0.20943951023932, - K_Eloc = 0.004, + K_Eloc = 0.003, K_Eloc_x = 0.0001, K_Fi = 0.7, K_LOS_omega = 4.5, K_fins = 1, K_fins_x = 0.6, - K_n1 = 0.033, + K_n1 = 0.032, K_n2 = 0.001, + K_p_loft = 1.6, + K_p_turn = 0.018, K_roll = 1, Ki_LOS_omega = 5.2, Ki_dG = -0.12, - delay_guidance = 0.8, + delay_guidance = 1.4, delay_roll = 0.4, fins_limit = 0.31415926535898, fins_limit_x = 0.43633231299858, @@ -318,11 +323,10 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { gimbal = { delay = 0, lock_time = 0, - max_tracking_rate = 0.17453292519943, - mount_roll_angle = -0.78539816339745, + max_tracking_rate = 0.1221730476396, op_time = 40, pitch_max = 0.5235987755983, - tracking_gain = 50, + tracking_gain = 10, yaw_max = 0.5235987755983 }, march = { diff --git a/_G/weapons_table/weapons/missiles/X_29TE.lua b/_G/weapons_table/weapons/missiles/X_29TE.lua index 8f3c8b69..dfc359a2 100644 --- a/_G/weapons_table/weapons/missiles/X_29TE.lua +++ b/_G/weapons_table/weapons/missiles/X_29TE.lua @@ -32,19 +32,39 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/kh25_29_family.lua", _origin = "AircraftWeaponPack", + actuator = { + D = 250, + T1 = 0.002, + T2 = 0.006, + Tf = 0.005, + fin_stall = 0, + max_delta = 0.31415926535898, + max_omega = 6.9813170079773, + sim_count = 4 + }, 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.15, - finsLimit = 0.2, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.20943951023932, + K_Eloc = 0.003, + K_Eloc_x = 0.0001, + K_Fi = 0.7, + K_LOS_omega = 4.5, + K_fins = 1, + K_fins_x = 0.6, + K_n1 = 0.032, + K_n2 = 0.001, + K_p_loft = 1.6, + K_p_turn = 0.018, + K_roll = 1, + Ki_LOS_omega = 5.2, + Ki_dG = -0.12, + delay_guidance = 1.4, + delay_roll = 0.4, + fins_limit = 0.31415926535898, + fins_limit_x = 0.43633231299858, + n_limit = 10, + n_req = 0.6, + null_roll = 0.78539816339745, + op_time = 40 }, boost = { custom_smoke_dissipation_factor = 0.2, @@ -53,7 +73,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, - smoke_transparency = 0.1, + smoke_transparency = 0.9, tail_width = 0.4, work_time = 0 }, @@ -67,23 +87,47 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { display_name_short = "Kh-29", exhaust = { 0.63, 0.71, 0.78, 0.5 }, fm = { - A = 0.36, - I = 848.3828125, - 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 = 16.5, + Iy = 430, + Iz = 430, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = 678, - 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 = 1000 + 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 = { custom_smoke_dissipation_factor = 0.2, @@ -93,13 +137,13 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, - smoke_transparency = 0.1, + smoke_transparency = 0.9, tail_width = 0.4, work_time = 4.7 }, model = "X-29T", name = "X_29TE", - scheme = "schemes/missiles/tv_homing_gyrost_missile.sch", + scheme = "schemes/missiles/KH-29T.sch", seeker = { FOV = 1.0471975511966, aim_sigma = 0.5, @@ -110,9 +154,6 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { send_off_data = 0 }, sigma = { 8, 8, 8 }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 - }, t_acc = 16, t_b = 0.8, t_marsh = 150, @@ -147,6 +188,11 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { other_factors = { 1, 1, 1 }, piercing_mass = 25.36 }, + wcs_emulator = { + K_loft = 2.5e-05, + delay = 0.005, + los_roll = -0.78539816339745 + }, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "Kh-29TE", @@ -182,19 +228,39 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/kh25_29_family.lua", _origin = "AircraftWeaponPack", + actuator = { + D = 250, + T1 = 0.002, + T2 = 0.006, + Tf = 0.005, + fin_stall = 0, + max_delta = 0.31415926535898, + max_omega = 6.9813170079773, + sim_count = 4 + }, 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.15, - finsLimit = 0.2, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.20943951023932, + K_Eloc = 0.003, + K_Eloc_x = 0.0001, + K_Fi = 0.7, + K_LOS_omega = 4.5, + K_fins = 1, + K_fins_x = 0.6, + K_n1 = 0.032, + K_n2 = 0.001, + K_p_loft = 1.6, + K_p_turn = 0.018, + K_roll = 1, + Ki_LOS_omega = 5.2, + Ki_dG = -0.12, + delay_guidance = 1.4, + delay_roll = 0.4, + fins_limit = 0.31415926535898, + fins_limit_x = 0.43633231299858, + n_limit = 10, + n_req = 0.6, + null_roll = 0.78539816339745, + op_time = 40 }, boost = { custom_smoke_dissipation_factor = 0.2, @@ -203,7 +269,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, - smoke_transparency = 0.1, + smoke_transparency = 0.9, tail_width = 0.4, work_time = 0 }, @@ -217,23 +283,47 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { display_name_short = "Kh-29", exhaust = { 0.63, 0.71, 0.78, 0.5 }, fm = { - A = 0.36, - I = 848.3828125, - 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 = 16.5, + Iy = 430, + Iz = 430, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = { -0.169, -0.169, -0.169, -0.177, -0.214, -0.213, -0.213, -0.211, -0.204, -0.204, -0.195, -0.176 }, + 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 = 678, - 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 = 1000 + 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 = { custom_smoke_dissipation_factor = 0.2, @@ -243,13 +333,13 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, - smoke_transparency = 0.1, + smoke_transparency = 0.9, tail_width = 0.4, work_time = 4.7 }, model = "X-29T", name = "X_29TE", - scheme = "schemes/missiles/tv_homing_gyrost_missile.sch", + scheme = "schemes/missiles/KH-29T.sch", seeker = { FOV = 1.0471975511966, aim_sigma = 0.5, @@ -260,9 +350,6 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { send_off_data = 0 }, sigma = { 8, 8, 8 }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 - }, t_acc = 16, t_b = 0.8, t_marsh = 150, @@ -297,6 +384,11 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { other_factors = { 1, 1, 1 }, piercing_mass = 25.36 }, + wcs_emulator = { + K_loft = 2.5e-05, + delay = 0.005, + los_roll = -0.78539816339745 + }, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, sounderName = "Weapons/Missile", diff --git a/_G/weapons_table/weapons/missiles/X_31A.lua b/_G/weapons_table/weapons/missiles/X_31A.lua index 7ffebe2f..6f0b99d1 100644 --- a/_G/weapons_table/weapons/missiles/X_31A.lua +++ b/_G/weapons_table/weapons/missiles/X_31A.lua @@ -1,7 +1,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_31A"] = { Reflection = 0.3, _unique_resource_name = "weapons.missiles.X_31A", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.36, client = { autopilot = { diff --git a/_G/weapons_table/weapons/missiles/X_35.lua b/_G/weapons_table/weapons/missiles/X_35.lua index 70388c5f..bda89825 100644 --- a/_G/weapons_table/weapons/missiles/X_35.lua +++ b/_G/weapons_table/weapons/missiles/X_35.lua @@ -1,7 +1,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_35"] = { Reflection = 0.13, _unique_resource_name = "weapons.missiles.X_35", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.42, client = { autopilot = { diff --git a/_G/weapons_table/weapons/missiles/X_59M.lua b/_G/weapons_table/weapons/missiles/X_59M.lua index ed960ae0..82dcdefa 100644 --- a/_G/weapons_table/weapons/missiles/X_59M.lua +++ b/_G/weapons_table/weapons/missiles/X_59M.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.X_59M", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.38, client = { Cx_pil = 19.64, @@ -36,7 +36,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { Z_back_acc = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.4, Kd = 0, @@ -291,7 +291,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { Z_back_acc = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", - add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, autopilot = { K = 1.4, Kd = 0, diff --git a/_G/weapons_table/weapons/missiles/X_65.lua b/_G/weapons_table/weapons/missiles/X_65.lua index becaa7be..70bc4de8 100644 --- a/_G/weapons_table/weapons/missiles/X_65.lua +++ b/_G/weapons_table/weapons/missiles/X_65.lua @@ -1,7 +1,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_65"] = { Reflection = 0.1656, _unique_resource_name = "weapons.missiles.X_65", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles", "Air" }, caliber = 0.514, client = { boost = { diff --git a/_G/weapons_table/weapons/missiles/YJ-83K.lua b/_G/weapons_table/weapons/missiles/YJ-83K.lua deleted file mode 100644 index 0592014f..00000000 --- a/_G/weapons_table/weapons/missiles/YJ-83K.lua +++ /dev/null @@ -1,521 +0,0 @@ -_G["weapons_table"]["weapons"]["missiles"]["YJ-83K"] = { - Reflection = 0.09, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_c802ak.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - _unique_resource_name = "weapons.missiles.YJ-83K", - add_attributes = { "Cruise missiles" }, - caliber = 0.36, - client = { - Cx_pil = 8, - D_max = 220000, - D_min = 2000, - Diam = 360, - Engine_Type = 5, - Escort = 0, - Fi_excort = 3.14152, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.25, - H_max = 15000, - H_min = -1, - H_min_t = 0, - Head_Form = 1, - Head_Type = 5, - KillDistance = 0, - LaunchDistData = { 12, 7, 100, 125, 150, 175, 200, 250, 300, 500, 150000, 155000, 160000, 165000, 170000, 175000, 180000, 600, 152000, 157000, 162000, 167000, 172000, 177000, 182000, 700, 154000, 159000, 164000, 169000, 174000, 179000, 184000, 800, 156000, 161000, 166000, 171000, 176000, 181000, 186000, 900, 158000, 163000, 168000, 173000, 178000, 183000, 188000, 1000, 160000, 165000, 170000, 175000, 180000, 185000, 190000, 1200, 163000, 168000, 173000, 178000, 183000, 188000, 193000, 2200, 170000, 175000, 180000, 185000, 189000, 194000, 199000, 3200, 176000, 181000, 186000, 191000, 194000, 199000, 204000, 4200, 181000, 186000, 191000, 196000, 199000, 203000, 208000, 5200, 185000, 190000, 195000, 199000, 203000, 207000, 212000, 7500, 190000, 195000, 200000, 204000, 208000, 212000, 217000 }, - Life_Time = 1850, - M = 715, - Mach_max = 1.3, - Nr_max = 15, - OmViz_max = 99.9, - Range_max = 220000, - Reflection = 0.09, - Stage_ = 1, - X_back = -2.566, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_c802ak.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Cruise missiles" }, - autopilot = { - K = 1.6, - Kd = 0, - Kdx = 0.001, - Ki = 20, - Ks = 0.9, - Ksd = 0, - Ksi = 0, - Kw = 3.5, - Kx = 0.04, - PN_dist_data = { 2000, 0, 500, 0 }, - altim_vel_k = 4, - conv_input = 0, - default_glide_height = 1524, - delay = 1, - dont_climb_on_cruise_height = 1, - fins_limit = 0.87266462599716, - fins_limit_x = 0.43633231299858, - glide_height = 20, - glide_height_abs_error = 1.5, - glide_height_eq_error = 0.02, - hor_err_limit = 0.5, - inertial_km_error = 0.15, - integr_val_limit = 0.5, - max_climb_ang_hdiff = 200, - max_climb_angle = 0.17453292519943, - max_climb_h = 3000, - max_climb_vel = 200, - max_dive_ang_hdiff = -500, - max_dive_angle = -0.43633231299858, - min_climb_h = 10000, - min_climb_h_factor = 0.5, - min_climb_vel = 120, - min_climb_vel_factor = 0, - min_glide_height = 15, - op_time = 9999, - pre_maneuver_glide_height = 12, - rotated_WLOS_input = 0, - skim_glide_height = 8, - use_start_bar_height = 1, - vel_proj_div = 6, - w_limit = 0.087266462599716 - }, - boost = { - boost_factor = 0, - 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 = "wAmmunitionAntiShip", - controller = { - boost_start = 0, - march_start = 5 - }, - display_name_short = "YJ-83K", - engine_control = { - K = 265, - Kd = 0.01, - Ki = 0.001, - default_speed = 300, - speed_delta = 5 - }, - final_autopilot = { - K = 5.4, - K_loft_err = 1, - Kd = 0, - Ki = 0, - Kix = 0, - Ks = 5, - Kw = 1, - Kx = 0, - PN_dist_data = { 2000, 1, 500, 1 }, - add_err_val = 0, - add_err_vert = 0, - add_out_val = 0.1, - add_out_vert = 1, - conv_input = 0, - delay = 1, - fins_limit = 0.87266462599716, - loft_active_by_default = 0, - loft_angle = 0.13962634015955, - loft_angle_vert = 1, - loft_trig_angle = 0.24434609527921, - op_time = 9999, - rotated_WLOS_input = 0, - w_limit = 0.26179938779915 - }, - fm = { - A = 0.5, - I = 1577.23190625, - Kw_x = 0.05, - L = 5.145, - Ma = 0.6, - Ma_x = 3, - Ma_z = 3, - Mw = 1.116, - Sw = 0.7, - caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, - maxAoa = 0.3, - wind_sigma = 0, - wind_time = 1000 - }, - manualWeaponFlag = 2, - march = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 200, - impulse = 700, - max_thrust = 6000, - min_fuel_rate = 0.005, - min_thrust = 0, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.566, 0, 0 } }, - smoke_color = { 0, 0, 0 }, - smoke_transparency = 0.2, - start_burn_effect = 0, - start_effect_delay = { 0, 0.3, 0.8 }, - start_effect_size = { 0.09, 0.104, 0.11 }, - start_effect_smoke = { 0.01, 0.4, 0.01 }, - start_effect_time = { 0.7, 1, 0.1 }, - start_effect_x_dist = { 1.1, 0.9, 0 }, - start_effect_x_pow = { 1, 1, 1 }, - start_effect_x_shift = { 0.15, 0.15, 0.2 }, - tail_width = 0.5, - thrust_Tau = 0.0017, - work_time = 9999 - }, - mass = 715, - model = "yj83k", - name = "YJ-83K", - scheme = "schemes/missiles/Harpoon.sch", - seeker = { - FOV = 1.0471975511966, - add_y = 3, - delay = 0, - flag_dist = 5000, - max_small_target_rcs = 29999.999, - max_target_speed = 33, - max_target_speed_rnd_coeff = 10, - max_w_LOS = 0.06, - min_detectable_rcs = 50, - min_large_target_rcs = 60000, - op_time = 9999, - primary_target_filter = 1, - sens_far_dist = 16000, - sens_near_dist = 10, - sens_ref_dist = 32000, - sens_ref_rcs = 10000, - ship_l_error_k = 0.33, - ship_track_by_default = 1 - }, - shape_table_data = { { - file = "yj83k", - fire = { 0, 1 }, - index = "Redacted", - life = 0.6, - name = "YJ-83K", - username = "YJ-83K" - } }, - sigma = { 8, 8, 8 }, - t_acc = 0, - t_b = 5, - t_marsh = 1800, - triggers_control = { - can_increase_tg_dist = 1, - check_self_destruct_dist_with_no_target = 1, - final_maneuver_tg_dist = 4000, - final_maneuver_trig_v_lim = 3, - pre_maneuver_glide_height = 20, - self_destruct_tg_dist = 4000, - send_final_maneuver_by_default = 0, - sensor_tg_dist = 8000, - straight_nav_tg_dist = 2000, - target_upd_jump_dist = 20000, - update_pos_from_input = 0, - use_horiz_dist = 1 - }, - user_name = "YJ-83K", - v_mid = 372, - v_min = 170, - warhead = { - caliber = 360, - concrete_factors = { 3, 1, 1 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 165, - fantom = 1, - mass = 165, - obj_factors = { 3, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - warhead_air = { - caliber = 360, - concrete_factors = { 3, 1, 1 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 165, - fantom = 1, - mass = 165, - obj_factors = { 3, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } - }, - display_name = "YJ-83K", - display_name_short = "YJ-83K", - mass = 715, - model = "yj83k", - name = "YJ-83K", - server = { - Cx_pil = 8, - D_max = 220000, - D_min = 2000, - Diam = 360, - Engine_Type = 5, - Escort = 0, - Fi_excort = 3.14152, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.25, - H_max = 15000, - H_min = -1, - H_min_t = 0, - Head_Form = 1, - Head_Type = 5, - KillDistance = 0, - LaunchDistData = { 12, 7, 100, 125, 150, 175, 200, 250, 300, 500, 150000, 155000, 160000, 165000, 170000, 175000, 180000, 600, 152000, 157000, 162000, 167000, 172000, 177000, 182000, 700, 154000, 159000, 164000, 169000, 174000, 179000, 184000, 800, 156000, 161000, 166000, 171000, 176000, 181000, 186000, 900, 158000, 163000, 168000, 173000, 178000, 183000, 188000, 1000, 160000, 165000, 170000, 175000, 180000, 185000, 190000, 1200, 163000, 168000, 173000, 178000, 183000, 188000, 193000, 2200, 170000, 175000, 180000, 185000, 189000, 194000, 199000, 3200, 176000, 181000, 186000, 191000, 194000, 199000, 204000, 4200, 181000, 186000, 191000, 196000, 199000, 203000, 208000, 5200, 185000, 190000, 195000, 199000, 203000, 207000, 212000, 7500, 190000, 195000, 200000, 204000, 208000, 212000, 217000 }, - Life_Time = 1850, - M = 715, - Mach_max = 1.3, - Nr_max = 15, - OmViz_max = 99.9, - Range_max = 220000, - Reflection = 0.09, - Stage_ = 1, - X_back = -2.566, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_c802ak.lua", - _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Cruise missiles" }, - autopilot = { - K = 1.6, - Kd = 0, - Kdx = 0.001, - Ki = 20, - Ks = 0.9, - Ksd = 0, - Ksi = 0, - Kw = 3.5, - Kx = 0.04, - PN_dist_data = { 2000, 0, 500, 0 }, - altim_vel_k = 4, - conv_input = 0, - default_glide_height = 1524, - delay = 1, - dont_climb_on_cruise_height = 1, - fins_limit = 0.87266462599716, - fins_limit_x = 0.43633231299858, - glide_height = 20, - glide_height_abs_error = 1.5, - glide_height_eq_error = 0.02, - hor_err_limit = 0.5, - inertial_km_error = 0.15, - integr_val_limit = 0.5, - max_climb_ang_hdiff = 200, - max_climb_angle = 0.17453292519943, - max_climb_h = 3000, - max_climb_vel = 200, - max_dive_ang_hdiff = -500, - max_dive_angle = -0.43633231299858, - min_climb_h = 10000, - min_climb_h_factor = 0.5, - min_climb_vel = 120, - min_climb_vel_factor = 0, - min_glide_height = 15, - op_time = 9999, - pre_maneuver_glide_height = 12, - rotated_WLOS_input = 0, - skim_glide_height = 8, - use_start_bar_height = 1, - vel_proj_div = 6, - w_limit = 0.087266462599716 - }, - boost = { - boost_factor = 0, - 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 = "wAmmunitionAntiShip", - controller = { - boost_start = 0, - march_start = 5 - }, - display_name_short = "YJ-83K", - engine_control = { - K = 265, - Kd = 0.01, - Ki = 0.001, - default_speed = 300, - speed_delta = 5 - }, - final_autopilot = { - K = 5.4, - K_loft_err = 1, - Kd = 0, - Ki = 0, - Kix = 0, - Ks = 5, - Kw = 1, - Kx = 0, - PN_dist_data = { 2000, 1, 500, 1 }, - add_err_val = 0, - add_err_vert = 0, - add_out_val = 0.1, - add_out_vert = 1, - conv_input = 0, - delay = 1, - fins_limit = 0.87266462599716, - loft_active_by_default = 0, - loft_angle = 0.13962634015955, - loft_angle_vert = 1, - loft_trig_angle = 0.24434609527921, - op_time = 9999, - rotated_WLOS_input = 0, - w_limit = 0.26179938779915 - }, - fm = { - A = 0.5, - I = 1577.23190625, - Kw_x = 0.05, - L = 5.145, - Ma = 0.6, - Ma_x = 3, - Ma_z = 3, - Mw = 1.116, - Sw = 0.7, - caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, - maxAoa = 0.3, - wind_sigma = 0, - wind_time = 1000 - }, - manualWeaponFlag = 2, - march = { - custom_smoke_dissipation_factor = 0.2, - fuel_mass = 200, - impulse = 700, - max_thrust = 6000, - min_fuel_rate = 0.005, - min_thrust = 0, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.566, 0, 0 } }, - smoke_color = { 0, 0, 0 }, - smoke_transparency = 0.2, - start_burn_effect = 0, - start_effect_delay = { 0, 0.3, 0.8 }, - start_effect_size = { 0.09, 0.104, 0.11 }, - start_effect_smoke = { 0.01, 0.4, 0.01 }, - start_effect_time = { 0.7, 1, 0.1 }, - start_effect_x_dist = { 1.1, 0.9, 0 }, - start_effect_x_pow = { 1, 1, 1 }, - start_effect_x_shift = { 0.15, 0.15, 0.2 }, - tail_width = 0.5, - thrust_Tau = 0.0017, - work_time = 9999 - }, - mass = 715, - model = "yj83k", - name = "YJ-83K", - scheme = "schemes/missiles/Harpoon.sch", - seeker = { - FOV = 1.0471975511966, - add_y = 3, - delay = 0, - flag_dist = 5000, - max_small_target_rcs = 29999.999, - max_target_speed = 33, - max_target_speed_rnd_coeff = 10, - max_w_LOS = 0.06, - min_detectable_rcs = 50, - min_large_target_rcs = 60000, - op_time = 9999, - primary_target_filter = 1, - sens_far_dist = 16000, - sens_near_dist = 10, - sens_ref_dist = 32000, - sens_ref_rcs = 10000, - ship_l_error_k = 0.33, - ship_track_by_default = 1 - }, - shape_table_data = { { - file = "yj83k", - fire = { 0, 1 }, - index = "Redacted", - life = 0.6, - name = "YJ-83K", - username = "YJ-83K" - } }, - sigma = { 8, 8, 8 }, - t_acc = 0, - t_b = 5, - t_marsh = 1800, - triggers_control = { - can_increase_tg_dist = 1, - check_self_destruct_dist_with_no_target = 1, - final_maneuver_tg_dist = 4000, - final_maneuver_trig_v_lim = 3, - pre_maneuver_glide_height = 20, - self_destruct_tg_dist = 4000, - send_final_maneuver_by_default = 0, - sensor_tg_dist = 8000, - straight_nav_tg_dist = 2000, - target_upd_jump_dist = 20000, - update_pos_from_input = 0, - use_horiz_dist = 1 - }, - user_name = "YJ-83K", - v_mid = 372, - v_min = 170, - warhead = { - caliber = 360, - concrete_factors = { 3, 1, 1 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 165, - fantom = 0, - mass = 165, - obj_factors = { 3, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - warhead_air = { - caliber = 360, - concrete_factors = { 3, 1, 1 }, - concrete_obj_factor = 2, - cumulative_factor = 2, - cumulative_thickness = 0, - expl_mass = 165, - fantom = 0, - mass = 165, - obj_factors = { 3, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 0 - }, - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } - }, - sounderName = "Weapons/Missile", - targeting_data = { - fm_type = -1 - }, - type_name = "missile", - ws_type = { 4, 4, 8, "Redacted" } -} \ No newline at end of file diff --git a/_G/weapons_table/weapons/nurs/C_24.lua b/_G/weapons_table/weapons/nurs/C_24.lua index 138eed3f..34779b3a 100644 --- a/_G/weapons_table/weapons/nurs/C_24.lua +++ b/_G/weapons_table/weapons/nurs/C_24.lua @@ -29,7 +29,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_24"] = { Ma = 0.1720553, Mw = 6.106276, caliber = 0.24, - cx_coeff = { 1, 0.8889618, 0.67, 0.317291, 2.08 }, + cx_coeff = { 1, 1.889, 0.67, 0.33, 1.8 }, freq = 7, mass = 235, rail_open = true, @@ -67,7 +67,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_24"] = { }, wsTypeOfWeapon = { 4, 7, 33, "Redacted" } }, - cx_pil = 0.00025405203965735, + cx_pil = 0.00026422802123894, display_name = "S-24B", display_name_short = "S-24", dist_max = 3000, @@ -102,7 +102,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_24"] = { Ma = 0.1720553, Mw = 6.106276, caliber = 0.24, - cx_coeff = { 1, 0.8889618, 0.67, 0.317291, 2.08 }, + cx_coeff = { 1, 1.889, 0.67, 0.33, 1.8 }, freq = 7, mass = 235, rail_open = true, @@ -152,7 +152,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_24"] = { Ma = 0.1720553, Mw = 6.106276, caliber = 0.24, - cx_coeff = { 1, 0.8889618, 0.67, 0.317291, 2.08 }, + cx_coeff = { 1, 1.889, 0.67, 0.33, 1.8 }, freq = 7, mass = 235, rail_open = true, diff --git a/_G/weapons_table/weapons/nurs/C_5.lua b/_G/weapons_table/weapons/nurs/C_5.lua index fb2a8c5a..a36ec235 100644 --- a/_G/weapons_table/weapons/nurs/C_5.lua +++ b/_G/weapons_table/weapons/nurs/C_5.lua @@ -28,6 +28,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_5"] = { work_time = 0.78 }, fm = { + Cx0 = { 0.55, 0.55, 0.55, 0.55, 0.584, 0.95, 1.06, 1, 0.93, 0.86, 0.81, 0.77, 0.74, 0.71, 0.68, 0.65 }, I = 0.362066145, Ix = 0.0017991, L = 0.987, @@ -39,6 +40,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_5"] = { mass = 4.46, rail_open = false, shapeName = "s-5ko", + table_scale = 0.2, wind_sigma = 10, wind_sigma_z_coeff = 1, wind_time = 0.78, @@ -74,7 +76,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_5"] = { }, wsTypeOfWeapon = { 4, 7, 33, "Redacted" } }, - cx_pil = 2.0422399873056e-05, + cx_pil = 2.4840186371681e-05, display_name = "S-5KO HEAT/Frag", display_name_short = "S-5", dist_max = 2500, @@ -108,6 +110,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_5"] = { work_time = 0.78 }, fm = { + Cx0 = { 0.55, 0.55, 0.55, 0.55, 0.584, 0.95, 1.06, 1, 0.93, 0.86, 0.81, 0.77, 0.74, 0.71, 0.68, 0.65 }, I = 0.362066145, Ix = 0.0017991, L = 0.987, @@ -119,6 +122,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_5"] = { mass = 4.46, rail_open = false, shapeName = "s-5ko", + table_scale = 0.2, wind_sigma = 10, wind_sigma_z_coeff = 1, wind_time = 0.78, @@ -161,6 +165,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_5"] = { work_time = 0.78 }, fm = { + Cx0 = { 0.55, 0.55, 0.55, 0.55, 0.584, 0.95, 1.06, 1, 0.93, 0.86, 0.81, 0.77, 0.74, 0.71, 0.68, 0.65 }, I = 0.362066145, Ix = 0.0017991, L = 0.987, @@ -172,6 +177,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_5"] = { mass = 4.46, rail_open = false, shapeName = "s-5ko", + table_scale = 0.2, wind_sigma = 10, wind_sigma_z_coeff = 1, wind_time = 0.78, diff --git a/_G/weapons_table/weapons/nurs/C_8OM.lua b/_G/weapons_table/weapons/nurs/C_8OM.lua index 514adaf3..44709ce1 100644 --- a/_G/weapons_table/weapons/nurs/C_8OM.lua +++ b/_G/weapons_table/weapons/nurs/C_8OM.lua @@ -122,7 +122,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OM"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 @@ -201,7 +201,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OM"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 @@ -366,7 +366,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OM"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 @@ -445,7 +445,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OM"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_M257.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_M257.lua index f32f4ddd..a54f8c1d 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_M257.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_M257.lua @@ -118,7 +118,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M257"] = { shape_table_data = { { file = "Hydra_M257_Parashute", index = "Redacted", - username = "M257_FLARE" + username = "M257 Flare" } }, targeting_data = { char_time = 20.5 @@ -198,7 +198,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M257"] = { shape_table_data = { { file = "Hydra_M257_Parashute", index = "Redacted", - username = "M257_FLARE" + username = "M257 Flare" } }, targeting_data = { char_time = 20.5 @@ -359,7 +359,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M257"] = { shape_table_data = { { file = "Hydra_M257_Parashute", index = "Redacted", - username = "M257_FLARE" + username = "M257 Flare" } }, targeting_data = { char_time = 20.5 @@ -439,7 +439,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M257"] = { shape_table_data = { { file = "Hydra_M257_Parashute", index = "Redacted", - username = "M257_FLARE" + username = "M257 Flare" } }, targeting_data = { char_time = 20.5 diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_F1B.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_F1B.lua index 7be01ea5..463acb83 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_F1B.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_F1B.lua @@ -117,7 +117,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_F1B"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 @@ -196,7 +196,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_F1B"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 @@ -354,7 +354,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_F1B"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 @@ -433,7 +433,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_F1B"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_H1.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_H1.lua index da01a142..9acf4e68 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_H1.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_H1.lua @@ -117,7 +117,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_H1"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 @@ -196,7 +196,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_H1"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 @@ -354,7 +354,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_H1"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 @@ -433,7 +433,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_H1"] = { shape_table_data = { { file = "s-8_om_parashut", index = "Redacted", - username = "S_8OM_FLARE" + username = "S-8OM Flare" } }, targeting_data = { char_time = 20.5 diff --git a/_G/weapons_table/weapons/nurs/S_5KP.lua b/_G/weapons_table/weapons/nurs/S_5KP.lua index d7be6a56..2081a18f 100644 --- a/_G/weapons_table/weapons/nurs/S_5KP.lua +++ b/_G/weapons_table/weapons/nurs/S_5KP.lua @@ -28,6 +28,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5KP"] = { work_time = 0.78 }, fm = { + Cx0 = { 0.55, 0.55, 0.55, 0.55, 0.584, 0.95, 1.06, 1, 0.93, 0.86, 0.81, 0.77, 0.74, 0.71, 0.68, 0.65 }, I = 0.47636860916667, Ix = 0.0017991, L = 1.079, @@ -39,6 +40,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5KP"] = { mass = 4.91, rail_open = false, shapeName = "c-5", + table_scale = 0.2, wind_sigma = 10, wind_sigma_z_coeff = 1, wind_time = 0.78, @@ -74,7 +76,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5KP"] = { }, wsTypeOfWeapon = { 4, 7, 33, "Redacted" } }, - cx_pil = 2.0422399873056e-05, + cx_pil = 2.4840186371681e-05, display_name = "S-5KP HEAT/Frag", display_name_short = "S-5", dist_max = 2500, @@ -108,6 +110,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5KP"] = { work_time = 0.78 }, fm = { + Cx0 = { 0.55, 0.55, 0.55, 0.55, 0.584, 0.95, 1.06, 1, 0.93, 0.86, 0.81, 0.77, 0.74, 0.71, 0.68, 0.65 }, I = 0.47636860916667, Ix = 0.0017991, L = 1.079, @@ -119,6 +122,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5KP"] = { mass = 4.91, rail_open = false, shapeName = "c-5", + table_scale = 0.2, wind_sigma = 10, wind_sigma_z_coeff = 1, wind_time = 0.78, @@ -161,6 +165,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5KP"] = { work_time = 0.78 }, fm = { + Cx0 = { 0.55, 0.55, 0.55, 0.55, 0.584, 0.95, 1.06, 1, 0.93, 0.86, 0.81, 0.77, 0.74, 0.71, 0.68, 0.65 }, I = 0.47636860916667, Ix = 0.0017991, L = 1.079, @@ -172,6 +177,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5KP"] = { mass = 4.91, rail_open = false, shapeName = "c-5", + table_scale = 0.2, wind_sigma = 10, wind_sigma_z_coeff = 1, wind_time = 0.78, diff --git a/_G/weapons_table/weapons/nurs/S_5M.lua b/_G/weapons_table/weapons/nurs/S_5M.lua index 92e07f8a..d492426a 100644 --- a/_G/weapons_table/weapons/nurs/S_5M.lua +++ b/_G/weapons_table/weapons/nurs/S_5M.lua @@ -28,6 +28,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5M"] = { work_time = 0.78 }, fm = { + Cx0 = { 0.55, 0.55, 0.55, 0.55, 0.584, 0.95, 1.06, 1, 0.93, 0.86, 0.81, 0.77, 0.74, 0.71, 0.68, 0.65 }, I = 0.254445975, Ix = 0.0017991, L = 0.882, @@ -39,6 +40,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5M"] = { mass = 3.925, rail_open = false, shapeName = "s-5m", + table_scale = 0.2, wind_sigma = 10, wind_sigma_z_coeff = 1, wind_time = 0.78, @@ -74,7 +76,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5M"] = { }, wsTypeOfWeapon = { 4, 7, 33, "Redacted" } }, - cx_pil = 2.0422399873056e-05, + cx_pil = 2.4840186371681e-05, display_name = "S-5M HE", display_name_short = "S-5", dist_max = 2500, @@ -108,6 +110,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5M"] = { work_time = 0.78 }, fm = { + Cx0 = { 0.55, 0.55, 0.55, 0.55, 0.584, 0.95, 1.06, 1, 0.93, 0.86, 0.81, 0.77, 0.74, 0.71, 0.68, 0.65 }, I = 0.254445975, Ix = 0.0017991, L = 0.882, @@ -119,6 +122,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5M"] = { mass = 3.925, rail_open = false, shapeName = "s-5m", + table_scale = 0.2, wind_sigma = 10, wind_sigma_z_coeff = 1, wind_time = 0.78, @@ -161,6 +165,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5M"] = { work_time = 0.78 }, fm = { + Cx0 = { 0.55, 0.55, 0.55, 0.55, 0.584, 0.95, 1.06, 1, 0.93, 0.86, 0.81, 0.77, 0.74, 0.71, 0.68, 0.65 }, I = 0.254445975, Ix = 0.0017991, L = 0.882, @@ -172,6 +177,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S_5M"] = { mass = 3.925, rail_open = false, shapeName = "s-5m", + table_scale = 0.2, wind_sigma = 10, wind_sigma_z_coeff = 1, wind_time = 0.78,