diff --git a/_G/Pylons/9M114-PYLON_EMPTY.lua b/_G/Pylons/9M114-PYLON_EMPTY.lua index 8228c4d5..b4776d0d 100644 --- a/_G/Pylons/9M114-PYLON_EMPTY.lua +++ b/_G/Pylons/9M114-PYLON_EMPTY.lua @@ -1,6 +1,5 @@ _G["Pylons"]["9M114-PYLON_EMPTY"] = { IsAdapter = true, - Position = { 0, 0, 0 }, ShapeName = "9M114-PYLON_EMPTY", _unique_resource_name = "weapons.adapters.9M114-PYLON_EMPTY", index = "Redacted", diff --git a/_G/Pylons/9m114-pilon.lua b/_G/Pylons/9m114-pilon.lua index 278b9f66..add7dfb8 100644 --- a/_G/Pylons/9m114-pilon.lua +++ b/_G/Pylons/9m114-pilon.lua @@ -1,7 +1,16 @@ -_G["Pylons"]["9m114-pilon"] = { - ShapeName = "9m114-pilon", - _unique_resource_name = "weapons.adapters.9m114-pilon", +_G["Pylons"]["9M114-PILON"] = { + IsAdapter = true, + ShapeName = "9M114-PILON", + _unique_resource_name = "weapons.adapters.9M114-PILON", index = "Redacted", - name = "9m114-pilon", + name = "9M114-PILON", + shape_table_data = { { + file = "9M114-PILON", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "9M114-PILON", + username = "9M114-PILON" + } }, 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 c9a80c0a..86838ad5 100644 --- a/_G/__DCS_VERSION__.lua +++ b/_G/__DCS_VERSION__.lua @@ -1 +1 @@ -2.7.14.24228 \ No newline at end of file +2.7.15.25026 \ No newline at end of file diff --git a/_G/bombs/GBU_24.lua b/_G/bombs/GBU_24.lua index f073995c..2b45b113 100644 --- a/_G/bombs/GBU_24.lua +++ b/_G/bombs/GBU_24.lua @@ -3,13 +3,16 @@ _G["bombs"]["#Index"] = { AspectDistData = { 15, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 1000, 0, 4, 4, 3, 10, 11, 12, 12, 12, 12, 2000, 6, 4, 4, 5, 9, 10, 10, 10, 10, 10, 3000, 9, 7, 7, 9, 10, 10, 9, 9, 9, 9, 4000, 13, 10, 9, 10, 10, 10, 10, 9, 9, 9, 5000, 16, 12, 11, 11, 11, 11, 10, 10, 9, 9, 6000, 17, 13, 12, 11, 11, 11, 11, 10, 9, 9, 7000, 19, 14, 12, 12, 11, 11, 10, 10, 9, 9, 8000, 20, 15, 13, 12, 12, 11, 10, 10, 9, 9, 9000, 21, 16, 14, 12, 12, 11, 10, 10, 9, 9, 10000, 21, 16, 14, 13, 12, 11, 10, 10, 9, 8, 11000, 22, 17, 14, 13, 12, 11, 10, 9, 9, 8, 12000, 23, 17, 15, 13, 12, 11, 10, 9, 8, 8, 13000, 23, 18, 15, 13, 12, 11, 10, 9, 8, 7, 14000, 25, 18, 15, 13, 12, 11, 10, 9, 8, 7, 15000, 26, 19, 15, 13, 12, 10, 9, 8, 8, 7 }, Cx = 0.00051, LaunchDistData = { 15, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 1000, 0, 2225, 2800, 3300, 5800, 6975, 7900, 8750, 9725, 10800, 2000, 2100, 3075, 4000, 5600, 7900, 9000, 9875, 10675, 11650, 12775, 3000, 2650, 3950, 5450, 7700, 10000, 11000, 11800, 12650, 13600, 14750, 4000, 3450, 5050, 7000, 9550, 12100, 13150, 13850, 14700, 16000, 17300, 5000, 4200, 6100, 8500, 11300, 13700, 15600, 16600, 17600, 18700, 19900, 6000, 5000, 7250, 10000, 12750, 15500, 17500, 18500, 19500, 20500, 21750, 7000, 6000, 8500, 11250, 14500, 17000, 18250, 19500, 20750, 22000, 23500, 8000, 6750, 9500, 12750, 16000, 17750, 19000, 20250, 21750, 23250, 25000, 9000, 7500, 10750, 14500, 16750, 18250, 19750, 21000, 22500, 24500, 26250, 10000, 8500, 11750, 15000, 17250, 19000, 20500, 21750, 23500, 25750, 27750, 11000, 9500, 13000, 15500, 17500, 19000, 20500, 22000, 24000, 26000, 28500, 12000, 10500, 13500, 15500, 17500, 19500, 21000, 23000, 25000, 27000, 29500, 13000, 10500, 13500, 16000, 18000, 20000, 21500, 23500, 25500, 28000, 30500, 14000, 10500, 13500, 16000, 18500, 20000, 22000, 24000, 26500, 29000, 31500, 15000, 10500, 13500, 16500, 18500, 20500, 22500, 25000, 27500, 30000, 32500 }, + LoftData2 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, MaxTOF = { 15, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 1000, 0, 15.4, 14.9, 14.5, 23.3, 26.2, 28.1, 29.7, 31.3, 32.9, 2000, 21.5, 21.7, 21.7, 25.1, 32.6, 34.8, 36.4, 37.5, 38.7, 40.1, 3000, 26.6, 27.3, 28.9, 34.5, 41.9, 43.4, 44.4, 45.4, 46.1, 47.2, 4000, 31.9, 33.2, 36.1, 42.7, 50.9, 52.6, 52.9, 53.6, 55.3, 56.4, 5000, 36.5, 38.5, 42.8, 50.1, 57.3, 62.8, 63.9, 64.7, 65.2, 65.3, 6000, 41, 43.9, 49.3, 56.1, 64.4, 69.4, 70.3, 70.8, 70.4, 70.3, 7000, 45.8, 49.5, 54.6, 63.3, 69.5, 71, 72.9, 74.3, 74.6, 75.2, 8000, 49.8, 54, 60.9, 68.8, 71.6, 73.1, 74.7, 76.8, 77.5, 78.7, 9000, 53.7, 59.4, 67.9, 71.3, 73, 75.4, 76.6, 77.9, 80.4, 80.6, 10000, 58.3, 63.8, 69.7, 73.2, 75.8, 77.8, 78.5, 80.2, 83, 83.6, 11000, 62.9, 68.8, 71.9, 74.3, 75.4, 76.9, 78.1, 79.9, 80.3, 82.4, 12000, 67.3, 71.3, 72.4, 74.4, 77.1, 78.2, 80.9, 81.7, 81, 82.3, 13000, 68.4, 72.3, 74.9, 76.5, 78.8, 79.4, 81.4, 80.9, 81.6, 82.2, 14000, 69.9, 73.3, 75.6, 78.6, 78.5, 80.5, 81.6, 82, 82, 82, 15000, 71.4, 74.4, 78, 78.8, 80.1, 81.4, 83.5, 82.9, 82.3, 81.8 }, MidTOF = { 15, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 1000, 15.3, 15.3, 14.7, 14.2, 18.4, 19.5, 20, 20.1, 20.3, 20.7, 2000, 21.3, 21.4, 21.4, 23, 26.8, 28, 28.9, 29.4, 29.8, 29.7, 3000, 26.2, 26.6, 27.5, 30.2, 33.9, 34.9, 35.5, 36.3, 36.7, 37.2, 4000, 30.6, 31.4, 33, 36.4, 40.4, 41.5, 41.9, 42.4, 43.6, 44.4, 5000, 34.6, 35.9, 38.1, 41.6, 45.4, 48.3, 49.3, 50, 50.8, 51, 6000, 38.3, 39.9, 42.8, 46.3, 50.6, 53.6, 54.8, 55.6, 55.3, 55.3, 7000, 42.2, 43.9, 46.9, 51.1, 54.6, 56.3, 57.7, 59.1, 59.2, 59.1, 8000, 45.3, 47.8, 51.4, 55.4, 57.7, 59.1, 60.1, 61.4, 61.9, 62.1, 9000, 48.9, 51.6, 55.7, 58.2, 59.8, 61.4, 62.5, 63.6, 64.3, 64.3, 10000, 52.2, 54.9, 58.5, 60.7, 62.9, 64.1, 64.8, 65.6, 66.8, 66.6, 11000, 55.1, 58.2, 60.9, 62.1, 63.1, 64.5, 65.5, 66.6, 66.7, 67.9, 12000, 58.2, 61.1, 62.2, 63.8, 65.3, 66.9, 68.2, 68.5, 67.9, 68.5, 13000, 60.7, 62.8, 64.9, 66.2, 67.3, 68.6, 69.2, 69.3, 68.8, 69, 14000, 62.7, 64.6, 66.2, 68.4, 68.6, 69.9, 70.6, 70.6, 70.3, 69.4, 15000, 64.7, 66.2, 68.6, 69.4, 70.3, 71.2, 72.4, 71.6, 71, 70.5 }, MinLaunchDistData = { 15, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 1000, 0, 2175, 2725, 3175, 3650, 3950, 4100, 4200, 4350, 4750, 2000, 1975, 2925, 3825, 4650, 5400, 6000, 6525, 7000, 7550, 7850, 3000, 2300, 3500, 4700, 5750, 6650, 7350, 7950, 8600, 9300, 10150, 4000, 2600, 4000, 5400, 6650, 7650, 8450, 9150, 9850, 10750, 11750, 5000, 2800, 4500, 6000, 7300, 8500, 9400, 10200, 11000, 12100, 13200, 6000, 3000, 4750, 6500, 8000, 9250, 10250, 11250, 12250, 13250, 14500, 7000, 3250, 5000, 7000, 8500, 9750, 11000, 12000, 13250, 14500, 15750, 8000, 3250, 5500, 7500, 9000, 10500, 11750, 12750, 14000, 15500, 17000, 9000, 3750, 5750, 7750, 9500, 11000, 12250, 13500, 15000, 16500, 18250, 10000, 3750, 6000, 8250, 10000, 11750, 13000, 14250, 15750, 17750, 19500, 11000, 3500, 6000, 8500, 10000, 11500, 13000, 14500, 16500, 18500, 21000, 12000, 3500, 6500, 8500, 10500, 12000, 14000, 15500, 17500, 19500, 22000, 13000, 4000, 6500, 9000, 11000, 12500, 14500, 16000, 18500, 20500, 23000, 14000, 4000, 6500, 9000, 11500, 13000, 15000, 17000, 19500, 22000, 24000, 15000, 4000, 6500, 9500, 11500, 13500, 15500, 18000, 20500, 23000, 25500 }, MinTOF = { 15, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 1000, 0, 15.2, 14.6, 14, 14, 13.6, 12.9, 12.1, 11.3, 11.1, 2000, 21.2, 21.2, 21.1, 21.2, 21.6, 21.9, 22.2, 22.2, 22.1, 20.8, 3000, 25.9, 26, 26.3, 26.7, 27.3, 27.7, 28, 28.3, 28.4, 28.6, 4000, 29.9, 30.2, 30.6, 31.3, 32, 32.5, 32.9, 33.2, 33.6, 33.9, 5000, 33.6, 34, 34.5, 35.1, 36.1, 36.8, 37.3, 37.6, 38.3, 38.5, 6000, 37, 37.4, 38, 38.9, 39.9, 40.7, 41.5, 42.1, 42.2, 42.4, 7000, 40.2, 40.6, 41.4, 42.2, 43, 44.2, 44.8, 45.8, 46.1, 45.9, 8000, 43.2, 43.8, 44.7, 45.4, 46.5, 47.6, 48, 48.6, 49.1, 49.1, 9000, 46.2, 46.7, 47.5, 48.5, 49.5, 50.3, 51.1, 51.9, 52, 52, 10000, 49, 49.6, 50.6, 51.5, 52.8, 53.5, 54, 54.4, 55, 54.5, 11000, 51.7, 52.2, 53.3, 53.8, 54.6, 55.3, 56, 56.7, 56.7, 57.3, 12000, 54.4, 55.1, 55.7, 56.5, 57.3, 58.5, 58.9, 59.1, 58.5, 58.6, 13000, 57, 57.5, 58.4, 59.2, 59.8, 60.8, 60.9, 61.1, 60.2, 59.8, 14000, 59.4, 59.9, 60.6, 61.7, 62.1, 62.8, 63.2, 62.7, 62.2, 61, 15000, 61.9, 62.3, 63.1, 63.6, 64.3, 64.7, 65.1, 64.1, 63.4, 62.8 }, Name = "Redacted", + RmaxData2 = { -2883852.744, 1660901.699, 1889373.967, -144240.3789, -516207.7218, -183.5606089, 104.5649714, 124.795315, -17.92312518, -28.28512215, 23435.40708, -13524.00271, -15408.30948, 1290.917375, 4165.811611, 14477.1349, -7626.934925, -10564.27691, 1538.71765, 2366.435086, 0.05519391, -0.0314229, -0.03698952, 0.00399749, 0.00922139, -61.16475129, 35.26502398, 40.30086897, -3.47249846, -10.80599263, 349.8453806, -199.3576638, -226.6897706, 16.97311365, 60.49216309, -0.07207219, 0.05609074, 0.03490497, 0.01786464, -0.02531217, -4.37107153, 2.43812234, 3.0052843, -0.33944842, -0.73560898, 26.89024523, -18.24989706, -12.31308713, -3.26606389, 6.00888896, -3.57e-06, 2.03e-06, 2.4e-06, -2.5e-07, -6e-07, 0.05000359, -0.02873136, -0.03303127, 0.00293394, 0.00877467, -5.68515341, 3.22643863, 3.72575828, -0.24674647, -1.03443977, 1.022e-05, -5.83e-06, -6.87e-06, 3.4e-07, 1.98e-06, 0.00025244, -0.00014403, -0.00016997, 1.756e-05, 4.34e-05, 0.00040488, -0.00024261, -0.00025219, -2.33e-06, 8.568e-05, -0.07561615, 0.04689312, 0.04303065, 0.00223037, -0.01501086, -0.02253811, 0.01274051, 0.01484516, -0.00152846, -0.00370505, -0.93366279, 0.52969018, 0.60437106, -0.03896344, -0.16591618, 0.00565333, -0.00306802, -0.00396902, 0.00046385, 0.00093852 }, + RminData2 = { -146356.3127, 82646.75092, 112340.969, -28962.59088, -17739.69543, 175.8557465, -101.0300941, -117.7035086, 14.54850724, 28.56994842, -917.6001276, 577.1380631, 480.1412752, 67.50346081, -199.8996332, -5530.450202, 3272.647993, 3613.246239, -373.7509831, -929.8775256, -0.02262513, 0.01302401, 0.0148642, -0.00130473, -0.00393015, 7.22189171, -4.26769438, -4.48681798, 0.21373875, 1.3113047, 275.7582176, -158.3688755, -183.0353871, 16.39617352, 48.07594727, -0.50249733, 0.28990827, 0.3428393, -0.05251892, -0.07712489, 1.58148141, -0.88909388, -1.02417602, 0.03021565, 0.30443487, 40.22842599, -23.39008641, -26.78275173, 3.39371612, 6.47928897, 1.89e-06, -1.08e-06, -1.24e-06, 9e-08, 3.4e-07, -0.00863639, 0.00506976, 0.00546466, -0.00033295, -0.00154718, -1.28559456, 0.6887125, 0.85791274, -0.06742341, -0.22725797, -1.56e-05, 8.71e-06, 1e-05, 2.5e-07, -3.3e-06, 3.9e-05, -2.33e-05, -2.69e-05, 4.54e-06, 5.85e-06, 0.00075366, -0.0004295, -0.00050622, 5.53e-05, 0.0001267, -0.03012861, 0.01825167, 0.02044013, -0.00397505, -0.00417777, -0.01131633, 0.00627514, 0.00742931, -0.00034369, -0.00212573, -0.74465749, 0.42947508, 0.49519711, -0.04795907, -0.12807253, -0.00640544, 0.00367421, 0.00419582, -0.00024879, -0.00117769 }, VyHold = -100, - display_name = "GBU-24 Paveway III", + display_name = "GBU-24A/B Paveway III", hMax = 40000, hMin = 1000, mass = 934, diff --git a/_G/db/Countries/Abkhazia.lua b/_G/db/Countries/Abkhazia.lua index fa578d35..ff0c7362 100644 --- a/_G/db/Countries/Abkhazia.lua +++ b/_G/db/Countries/Abkhazia.lua @@ -400,37 +400,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Algeria.lua b/_G/db/Countries/Algeria.lua index 3aab52c1..3d5a8e27 100644 --- a/_G/db/Countries/Algeria.lua +++ b/_G/db/Countries/Algeria.lua @@ -602,37 +602,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Argentina.lua b/_G/db/Countries/Argentina.lua index fff2e9bd..240d3143 100644 --- a/_G/db/Countries/Argentina.lua +++ b/_G/db/Countries/Argentina.lua @@ -298,37 +298,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Australia.lua b/_G/db/Countries/Australia.lua index 64cfb3de..b6120410 100644 --- a/_G/db/Countries/Australia.lua +++ b/_G/db/Countries/Australia.lua @@ -482,37 +482,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "M4_Sherman" }, { @@ -529,6 +545,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Churchill_VII" }, { Name = "Tetrarch" + }, { + Name = "Allies_Director" }, { Name = "CCKW_353" }, { diff --git a/_G/db/Countries/Austria.lua b/_G/db/Countries/Austria.lua index 4e36218e..66dee8b2 100644 --- a/_G/db/Countries/Austria.lua +++ b/_G/db/Countries/Austria.lua @@ -200,37 +200,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Bahrain.lua b/_G/db/Countries/Bahrain.lua index 515380a8..a4a6273c 100644 --- a/_G/db/Countries/Bahrain.lua +++ b/_G/db/Countries/Bahrain.lua @@ -232,37 +232,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Belarus.lua b/_G/db/Countries/Belarus.lua index f9ffbc3e..7a4af71a 100644 --- a/_G/db/Countries/Belarus.lua +++ b/_G/db/Countries/Belarus.lua @@ -552,23 +552,39 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_KORD" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_DSHK" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_KORD" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_ZU-23" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_ZU-23" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_B8M1" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_B8M1" + Name = "Electric locomotive" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Belgium.lua b/_G/db/Countries/Belgium.lua index a7148e55..665faff8 100644 --- a/_G/db/Countries/Belgium.lua +++ b/_G/db/Countries/Belgium.lua @@ -308,37 +308,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "M4_Sherman" }, { @@ -361,6 +377,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Churchill_VII" }, { Name = "Tetrarch" + }, { + Name = "Allies_Director" }, { Name = "CCKW_353" }, { diff --git a/_G/db/Countries/Bolivia.lua b/_G/db/Countries/Bolivia.lua index 833b1862..85a57598 100644 --- a/_G/db/Countries/Bolivia.lua +++ b/_G/db/Countries/Bolivia.lua @@ -394,37 +394,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Brazil.lua b/_G/db/Countries/Brazil.lua index 16eb8084..ae58158c 100644 --- a/_G/db/Countries/Brazil.lua +++ b/_G/db/Countries/Brazil.lua @@ -248,37 +248,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "DR_50Ton_Flat_Wagon" }, { diff --git a/_G/db/Countries/Bulgaria.lua b/_G/db/Countries/Bulgaria.lua index c9a31f30..db336c21 100644 --- a/_G/db/Countries/Bulgaria.lua +++ b/_G/db/Countries/Bulgaria.lua @@ -344,37 +344,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Canada.lua b/_G/db/Countries/Canada.lua index b5a24e73..d0511c95 100644 --- a/_G/db/Countries/Canada.lua +++ b/_G/db/Countries/Canada.lua @@ -308,37 +308,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "M4_Sherman" }, { @@ -363,6 +379,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Churchill_VII" }, { Name = "Tetrarch" + }, { + Name = "Allies_Director" }, { Name = "CCKW_353" }, { diff --git a/_G/db/Countries/Chile.lua b/_G/db/Countries/Chile.lua index fe52fb35..29e2d524 100644 --- a/_G/db/Countries/Chile.lua +++ b/_G/db/Countries/Chile.lua @@ -312,37 +312,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/China.lua b/_G/db/Countries/China.lua index abbf663d..f008af9b 100644 --- a/_G/db/Countries/China.lua +++ b/_G/db/Countries/China.lua @@ -445,6 +445,38 @@ _G["db"]["Countries"]["#Index"] = { Name = "PLZ05", in_service = 0, out_of_service = 40000 + }, { + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { Name = "Electric locomotive" }, { @@ -462,21 +494,7 @@ _G["db"]["Countries"]["#Index"] = { }, { Name = "Coach a platform" }, { - Name = "HL_DSHK" - }, { - Name = "HL_KORD" - }, { - Name = "tt_DSHK" - }, { - Name = "tt_KORD" - }, { - Name = "HL_ZU-23" - }, { - Name = "tt_ZU-23" - }, { - Name = "HL_B8M1" - }, { - Name = "tt_B8M1" + Name = "TYPE-59" }, { Name = "DR_50Ton_Flat_Wagon" }, { diff --git a/_G/db/Countries/Combined Joint Task Forces Blue.lua b/_G/db/Countries/Combined Joint Task Forces Blue.lua index 3f3922b6..4091d009 100644 --- a/_G/db/Countries/Combined Joint Task Forces Blue.lua +++ b/_G/db/Countries/Combined Joint Task Forces Blue.lua @@ -195,22 +195,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Coach a passenger" }, { Name = "Coach a platform" - }, { - Name = "HL_DSHK" - }, { - Name = "HL_KORD" - }, { - Name = "tt_DSHK" - }, { - Name = "tt_KORD" - }, { - Name = "HL_ZU-23" - }, { - Name = "tt_ZU-23" - }, { - Name = "HL_B8M1" - }, { - Name = "tt_B8M1" }, { Name = "ES44AH" }, { @@ -803,6 +787,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "QF_37_AA", in_service = 0, out_of_service = 40000 + }, { + Name = "Allies_Director", + in_service = 0, + out_of_service = 40000 }, { Name = "CCKW_353", in_service = 0, @@ -855,6 +843,38 @@ _G["db"]["Countries"]["#Index"] = { Name = "KrAZ6322", in_service = 0, out_of_service = 40000 + }, { + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { Name = "GAZ-3308", in_service = 0, @@ -1179,6 +1199,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "PLZ05", in_service = 0, out_of_service = 40000 + }, { + Name = "TYPE-59", + in_service = 0, + out_of_service = 40000 }, { Name = "Igla manpad INS", in_service = 0, diff --git a/_G/db/Countries/Combined Joint Task Forces Red.lua b/_G/db/Countries/Combined Joint Task Forces Red.lua index 4e1276a0..8aed6d09 100644 --- a/_G/db/Countries/Combined Joint Task Forces Red.lua +++ b/_G/db/Countries/Combined Joint Task Forces Red.lua @@ -195,22 +195,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Coach a passenger" }, { Name = "Coach a platform" - }, { - Name = "HL_DSHK" - }, { - Name = "HL_KORD" - }, { - Name = "tt_DSHK" - }, { - Name = "tt_KORD" - }, { - Name = "HL_ZU-23" - }, { - Name = "tt_ZU-23" - }, { - Name = "HL_B8M1" - }, { - Name = "tt_B8M1" }, { Name = "ES44AH" }, { @@ -803,6 +787,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "QF_37_AA", in_service = 0, out_of_service = 40000 + }, { + Name = "Allies_Director", + in_service = 0, + out_of_service = 40000 }, { Name = "CCKW_353", in_service = 0, @@ -855,6 +843,38 @@ _G["db"]["Countries"]["#Index"] = { Name = "KrAZ6322", in_service = 0, out_of_service = 40000 + }, { + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { Name = "GAZ-3308", in_service = 0, @@ -1179,6 +1199,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "PLZ05", in_service = 0, out_of_service = 40000 + }, { + Name = "TYPE-59", + in_service = 0, + out_of_service = 40000 }, { Name = "Igla manpad INS", in_service = 0, diff --git a/_G/db/Countries/Croatia.lua b/_G/db/Countries/Croatia.lua index 850f069b..6a966610 100644 --- a/_G/db/Countries/Croatia.lua +++ b/_G/db/Countries/Croatia.lua @@ -180,37 +180,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Cuba.lua b/_G/db/Countries/Cuba.lua index 5a2259db..e8e1d93a 100644 --- a/_G/db/Countries/Cuba.lua +++ b/_G/db/Countries/Cuba.lua @@ -348,37 +348,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Cyprus.lua b/_G/db/Countries/Cyprus.lua index 51a28476..139a7ef7 100644 --- a/_G/db/Countries/Cyprus.lua +++ b/_G/db/Countries/Cyprus.lua @@ -248,37 +248,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Czech Republic.lua b/_G/db/Countries/Czech Republic.lua index 82bdf326..921c8b60 100644 --- a/_G/db/Countries/Czech Republic.lua +++ b/_G/db/Countries/Czech Republic.lua @@ -268,37 +268,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "M4_Sherman" }, { @@ -331,6 +347,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Tetrarch" }, { Name = "QF_37_AA" + }, { + Name = "Allies_Director" }, { Name = "CCKW_353" }, { diff --git a/_G/db/Countries/Denmark.lua b/_G/db/Countries/Denmark.lua index 8e69e2b5..f63f2663 100644 --- a/_G/db/Countries/Denmark.lua +++ b/_G/db/Countries/Denmark.lua @@ -296,37 +296,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Egypt.lua b/_G/db/Countries/Egypt.lua index 3f8e75a4..294be973 100644 --- a/_G/db/Countries/Egypt.lua +++ b/_G/db/Countries/Egypt.lua @@ -432,37 +432,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "DR_50Ton_Flat_Wagon" }, { diff --git a/_G/db/Countries/Ethiopia.lua b/_G/db/Countries/Ethiopia.lua index 6a8a9bee..62c1e61c 100644 --- a/_G/db/Countries/Ethiopia.lua +++ b/_G/db/Countries/Ethiopia.lua @@ -256,37 +256,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Finland.lua b/_G/db/Countries/Finland.lua index 32b4f060..db80741e 100644 --- a/_G/db/Countries/Finland.lua +++ b/_G/db/Countries/Finland.lua @@ -308,37 +308,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/France.lua b/_G/db/Countries/France.lua index a008ab55..9636e5a0 100644 --- a/_G/db/Countries/France.lua +++ b/_G/db/Countries/France.lua @@ -320,37 +320,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "M4_Sherman" }, { @@ -377,6 +393,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Tetrarch" }, { Name = "QF_37_AA" + }, { + Name = "Allies_Director" }, { Name = "Willys_MB" }, { diff --git a/_G/db/Countries/GDR.lua b/_G/db/Countries/GDR.lua index 130141d3..57326bc2 100644 --- a/_G/db/Countries/GDR.lua +++ b/_G/db/Countries/GDR.lua @@ -479,22 +479,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Coach a passenger" }, { Name = "Coach a platform" - }, { - Name = "HL_DSHK" - }, { - Name = "HL_KORD" - }, { - Name = "tt_DSHK" - }, { - Name = "tt_KORD" - }, { - Name = "HL_ZU-23" - }, { - Name = "tt_ZU-23" - }, { - Name = "HL_B8M1" - }, { - Name = "tt_B8M1" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Georgia.lua b/_G/db/Countries/Georgia.lua index 41159517..9f72d774 100644 --- a/_G/db/Countries/Georgia.lua +++ b/_G/db/Countries/Georgia.lua @@ -540,21 +540,37 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_KORD" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_DSHK" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_KORD" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_ZU-23" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_ZU-23" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_B8M1" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_B8M1" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Germany.lua b/_G/db/Countries/Germany.lua index c27ad13c..63f612d3 100644 --- a/_G/db/Countries/Germany.lua +++ b/_G/db/Countries/Germany.lua @@ -568,37 +568,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "RPC_5N62V" }, { diff --git a/_G/db/Countries/Ghana.lua b/_G/db/Countries/Ghana.lua index 2887572c..fd35f6e1 100644 --- a/_G/db/Countries/Ghana.lua +++ b/_G/db/Countries/Ghana.lua @@ -200,37 +200,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Greece.lua b/_G/db/Countries/Greece.lua index 9142d5b8..9b0b4615 100644 --- a/_G/db/Countries/Greece.lua +++ b/_G/db/Countries/Greece.lua @@ -500,37 +500,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Honduras.lua b/_G/db/Countries/Honduras.lua index 412cab62..5d31ff29 100644 --- a/_G/db/Countries/Honduras.lua +++ b/_G/db/Countries/Honduras.lua @@ -164,37 +164,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Hungary.lua b/_G/db/Countries/Hungary.lua index bfd11deb..6dbe8489 100644 --- a/_G/db/Countries/Hungary.lua +++ b/_G/db/Countries/Hungary.lua @@ -300,37 +300,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/India.lua b/_G/db/Countries/India.lua index 3c8dfb03..7f543c71 100644 --- a/_G/db/Countries/India.lua +++ b/_G/db/Countries/India.lua @@ -304,37 +304,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Indonesia.lua b/_G/db/Countries/Indonesia.lua index eea25b96..f6a48cd2 100644 --- a/_G/db/Countries/Indonesia.lua +++ b/_G/db/Countries/Indonesia.lua @@ -304,37 +304,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Insurgents.lua b/_G/db/Countries/Insurgents.lua index 984f973f..687926f1 100644 --- a/_G/db/Countries/Insurgents.lua +++ b/_G/db/Countries/Insurgents.lua @@ -320,37 +320,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Iran.lua b/_G/db/Countries/Iran.lua index 38a3634c..85929845 100644 --- a/_G/db/Countries/Iran.lua +++ b/_G/db/Countries/Iran.lua @@ -368,37 +368,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "Land_Rover_101_FC" }, { diff --git a/_G/db/Countries/Iraq.lua b/_G/db/Countries/Iraq.lua index b30bc671..0c0d1d40 100644 --- a/_G/db/Countries/Iraq.lua +++ b/_G/db/Countries/Iraq.lua @@ -352,37 +352,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "Land_Rover_101_FC" }, { diff --git a/_G/db/Countries/Israel.lua b/_G/db/Countries/Israel.lua index cd0319fe..5ab1b8a8 100644 --- a/_G/db/Countries/Israel.lua +++ b/_G/db/Countries/Israel.lua @@ -350,37 +350,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Italian Social Republic.lua b/_G/db/Countries/Italian Social Republic.lua index 4056b117..d0ad5915 100644 --- a/_G/db/Countries/Italian Social Republic.lua +++ b/_G/db/Countries/Italian Social Republic.lua @@ -163,22 +163,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Coach a passenger" }, { Name = "Coach a platform" - }, { - Name = "HL_DSHK" - }, { - Name = "HL_KORD" - }, { - Name = "tt_DSHK" - }, { - Name = "tt_KORD" - }, { - Name = "HL_ZU-23" - }, { - Name = "tt_ZU-23" - }, { - Name = "HL_B8M1" - }, { - Name = "tt_B8M1" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Italy.lua b/_G/db/Countries/Italy.lua index d588004e..1755c7eb 100644 --- a/_G/db/Countries/Italy.lua +++ b/_G/db/Countries/Italy.lua @@ -408,37 +408,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Jordan.lua b/_G/db/Countries/Jordan.lua index e2aeba76..3bb44ebc 100644 --- a/_G/db/Countries/Jordan.lua +++ b/_G/db/Countries/Jordan.lua @@ -248,37 +248,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Kazakhstan.lua b/_G/db/Countries/Kazakhstan.lua index f5ebd2de..0e891d41 100644 --- a/_G/db/Countries/Kazakhstan.lua +++ b/_G/db/Countries/Kazakhstan.lua @@ -564,23 +564,39 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_KORD" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_DSHK" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_KORD" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_ZU-23" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_ZU-23" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_B8M1" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_B8M1" + Name = "Electric locomotive" }, { Name = "S_75M_Volhov" }, { diff --git a/_G/db/Countries/Kuwait.lua b/_G/db/Countries/Kuwait.lua index 2f1bd3a1..41a0f658 100644 --- a/_G/db/Countries/Kuwait.lua +++ b/_G/db/Countries/Kuwait.lua @@ -256,37 +256,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Lebanon.lua b/_G/db/Countries/Lebanon.lua index 0db62780..4b7429f3 100644 --- a/_G/db/Countries/Lebanon.lua +++ b/_G/db/Countries/Lebanon.lua @@ -268,37 +268,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Libya.lua b/_G/db/Countries/Libya.lua index 67b4b6f1..3cf7b993 100644 --- a/_G/db/Countries/Libya.lua +++ b/_G/db/Countries/Libya.lua @@ -268,37 +268,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "rapier_fsa_launcher" }, { diff --git a/_G/db/Countries/Malaysia.lua b/_G/db/Countries/Malaysia.lua index 0edfce43..85696af1 100644 --- a/_G/db/Countries/Malaysia.lua +++ b/_G/db/Countries/Malaysia.lua @@ -180,37 +180,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "Land_Rover_101_FC" }, { diff --git a/_G/db/Countries/Mexico.lua b/_G/db/Countries/Mexico.lua index 5f5fc772..6dcc7a7f 100644 --- a/_G/db/Countries/Mexico.lua +++ b/_G/db/Countries/Mexico.lua @@ -180,37 +180,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Morocco.lua b/_G/db/Countries/Morocco.lua index 276cae10..911e266a 100644 --- a/_G/db/Countries/Morocco.lua +++ b/_G/db/Countries/Morocco.lua @@ -276,37 +276,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Nigeria.lua b/_G/db/Countries/Nigeria.lua index de686dc8..5d687436 100644 --- a/_G/db/Countries/Nigeria.lua +++ b/_G/db/Countries/Nigeria.lua @@ -234,37 +234,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/North Korea.lua b/_G/db/Countries/North Korea.lua index 5bfe1fbe..22263a64 100644 --- a/_G/db/Countries/North Korea.lua +++ b/_G/db/Countries/North Korea.lua @@ -252,37 +252,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Norway.lua b/_G/db/Countries/Norway.lua index a9469d67..1c8b8eb0 100644 --- a/_G/db/Countries/Norway.lua +++ b/_G/db/Countries/Norway.lua @@ -316,37 +316,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Oman.lua b/_G/db/Countries/Oman.lua index 8585e6e0..b9fa4676 100644 --- a/_G/db/Countries/Oman.lua +++ b/_G/db/Countries/Oman.lua @@ -280,37 +280,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "Land_Rover_101_FC" }, { diff --git a/_G/db/Countries/Pakistan.lua b/_G/db/Countries/Pakistan.lua index c9d09e86..7be764d1 100644 --- a/_G/db/Countries/Pakistan.lua +++ b/_G/db/Countries/Pakistan.lua @@ -260,37 +260,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "DR_50Ton_Flat_Wagon" }, { diff --git a/_G/db/Countries/Peru.lua b/_G/db/Countries/Peru.lua index 5d38489a..5c1f9fd3 100644 --- a/_G/db/Countries/Peru.lua +++ b/_G/db/Countries/Peru.lua @@ -256,37 +256,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Philippines.lua b/_G/db/Countries/Philippines.lua index ad15d824..1bee6ee3 100644 --- a/_G/db/Countries/Philippines.lua +++ b/_G/db/Countries/Philippines.lua @@ -191,22 +191,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Coach a passenger" }, { Name = "Coach a platform" - }, { - Name = "HL_DSHK" - }, { - Name = "HL_KORD" - }, { - Name = "tt_DSHK" - }, { - Name = "tt_KORD" - }, { - Name = "HL_ZU-23" - }, { - Name = "tt_ZU-23" - }, { - Name = "HL_B8M1" - }, { - Name = "tt_B8M1" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Poland.lua b/_G/db/Countries/Poland.lua index 6e0ae625..1c383e3e 100644 --- a/_G/db/Countries/Poland.lua +++ b/_G/db/Countries/Poland.lua @@ -428,37 +428,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "M4_Sherman" }, { @@ -477,6 +493,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Churchill_VII" }, { Name = "Tetrarch" + }, { + Name = "Allies_Director" }, { Name = "CCKW_353" }, { diff --git a/_G/db/Countries/Portugal.lua b/_G/db/Countries/Portugal.lua index fc972dc1..e6640f63 100644 --- a/_G/db/Countries/Portugal.lua +++ b/_G/db/Countries/Portugal.lua @@ -304,37 +304,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Qatar.lua b/_G/db/Countries/Qatar.lua index b06de985..54bf1d3d 100644 --- a/_G/db/Countries/Qatar.lua +++ b/_G/db/Countries/Qatar.lua @@ -220,37 +220,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Romania.lua b/_G/db/Countries/Romania.lua index f1202122..6547a911 100644 --- a/_G/db/Countries/Romania.lua +++ b/_G/db/Countries/Romania.lua @@ -276,37 +276,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Russia.lua b/_G/db/Countries/Russia.lua index ea1946a0..f9e2333b 100644 --- a/_G/db/Countries/Russia.lua +++ b/_G/db/Countries/Russia.lua @@ -740,21 +740,37 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_KORD" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_DSHK" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_KORD" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_ZU-23" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_ZU-23" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_B8M1" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_B8M1" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { Name = "ZSU_57_2" }, { diff --git a/_G/db/Countries/Saudi Arabia.lua b/_G/db/Countries/Saudi Arabia.lua index deaac672..37136f97 100644 --- a/_G/db/Countries/Saudi Arabia.lua +++ b/_G/db/Countries/Saudi Arabia.lua @@ -276,37 +276,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Serbia.lua b/_G/db/Countries/Serbia.lua index 92000681..47fc34c4 100644 --- a/_G/db/Countries/Serbia.lua +++ b/_G/db/Countries/Serbia.lua @@ -352,37 +352,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Slovakia.lua b/_G/db/Countries/Slovakia.lua index 342aa87c..f7bd129e 100644 --- a/_G/db/Countries/Slovakia.lua +++ b/_G/db/Countries/Slovakia.lua @@ -296,37 +296,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Slovenia.lua b/_G/db/Countries/Slovenia.lua index 2dfd5c55..48bf4bea 100644 --- a/_G/db/Countries/Slovenia.lua +++ b/_G/db/Countries/Slovenia.lua @@ -328,37 +328,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/South Africa.lua b/_G/db/Countries/South Africa.lua index 0aa612b6..7f0b65a0 100644 --- a/_G/db/Countries/South Africa.lua +++ b/_G/db/Countries/South Africa.lua @@ -330,37 +330,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/South Korea.lua b/_G/db/Countries/South Korea.lua index fdb974b1..d22e850e 100644 --- a/_G/db/Countries/South Korea.lua +++ b/_G/db/Countries/South Korea.lua @@ -256,37 +256,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/South Ossetia.lua b/_G/db/Countries/South Ossetia.lua index 8cd307f6..a9d245b9 100644 --- a/_G/db/Countries/South Ossetia.lua +++ b/_G/db/Countries/South Ossetia.lua @@ -360,37 +360,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Spain.lua b/_G/db/Countries/Spain.lua index 5c612cba..691a54b9 100644 --- a/_G/db/Countries/Spain.lua +++ b/_G/db/Countries/Spain.lua @@ -526,37 +526,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Sudan.lua b/_G/db/Countries/Sudan.lua index ba65dcd7..d6fd088d 100644 --- a/_G/db/Countries/Sudan.lua +++ b/_G/db/Countries/Sudan.lua @@ -228,37 +228,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Sweden.lua b/_G/db/Countries/Sweden.lua index a63d8b88..6ec77df1 100644 --- a/_G/db/Countries/Sweden.lua +++ b/_G/db/Countries/Sweden.lua @@ -196,37 +196,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Switzerland.lua b/_G/db/Countries/Switzerland.lua index eb0baf64..ea84a0b6 100644 --- a/_G/db/Countries/Switzerland.lua +++ b/_G/db/Countries/Switzerland.lua @@ -394,37 +394,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "Land_Rover_101_FC" }, { diff --git a/_G/db/Countries/Syria.lua b/_G/db/Countries/Syria.lua index 55ce8a7c..d6cb42d4 100644 --- a/_G/db/Countries/Syria.lua +++ b/_G/db/Countries/Syria.lua @@ -400,37 +400,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ZSU_57_2" }, { diff --git a/_G/db/Countries/Thailand.lua b/_G/db/Countries/Thailand.lua index c9e6665a..76682a23 100644 --- a/_G/db/Countries/Thailand.lua +++ b/_G/db/Countries/Thailand.lua @@ -204,37 +204,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/The Netherlands.lua b/_G/db/Countries/The Netherlands.lua index f242b03e..47a73e8d 100644 --- a/_G/db/Countries/The Netherlands.lua +++ b/_G/db/Countries/The Netherlands.lua @@ -416,37 +416,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "M4_Sherman" }, { @@ -473,6 +489,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Tetrarch" }, { Name = "QF_37_AA" + }, { + Name = "Allies_Director" }, { Name = "CCKW_353" }, { diff --git a/_G/db/Countries/Third Reich.lua b/_G/db/Countries/Third Reich.lua index b17a030a..56868a76 100644 --- a/_G/db/Countries/Third Reich.lua +++ b/_G/db/Countries/Third Reich.lua @@ -163,22 +163,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Coach a passenger" }, { Name = "Coach a platform" - }, { - Name = "HL_DSHK" - }, { - Name = "HL_KORD" - }, { - Name = "tt_DSHK" - }, { - Name = "tt_KORD" - }, { - Name = "HL_ZU-23" - }, { - Name = "tt_ZU-23" - }, { - Name = "HL_B8M1" - }, { - Name = "tt_B8M1" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Tunisia.lua b/_G/db/Countries/Tunisia.lua index 333c4c1e..c477e6e7 100644 --- a/_G/db/Countries/Tunisia.lua +++ b/_G/db/Countries/Tunisia.lua @@ -172,37 +172,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Turkey.lua b/_G/db/Countries/Turkey.lua index 6cc387fc..e85ca679 100644 --- a/_G/db/Countries/Turkey.lua +++ b/_G/db/Countries/Turkey.lua @@ -360,37 +360,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "Land_Rover_101_FC" }, { diff --git a/_G/db/Countries/UK.lua b/_G/db/Countries/UK.lua index a428d5bf..b15165de 100644 --- a/_G/db/Countries/UK.lua +++ b/_G/db/Countries/UK.lua @@ -352,37 +352,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "M4_Sherman" }, { @@ -401,6 +417,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "soldier_wwii_br_01" }, { Name = "Churchill_VII" + }, { + Name = "Allies_Director" }, { Name = "CCKW_353" }, { diff --git a/_G/db/Countries/USA.lua b/_G/db/Countries/USA.lua index 0a8e64c1..22e5daab 100644 --- a/_G/db/Countries/USA.lua +++ b/_G/db/Countries/USA.lua @@ -1560,37 +1560,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "M4_Sherman" }, { @@ -1609,6 +1625,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Tetrarch" }, { Name = "QF_37_AA" + }, { + Name = "Allies_Director" }, { Name = "soldier_wwii_us" }, { diff --git a/_G/db/Countries/USAF Aggressors.lua b/_G/db/Countries/USAF Aggressors.lua index ea4b2391..abf51f09 100644 --- a/_G/db/Countries/USAF Aggressors.lua +++ b/_G/db/Countries/USAF Aggressors.lua @@ -1291,22 +1291,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Coach a passenger" }, { Name = "Coach a platform" - }, { - Name = "HL_DSHK" - }, { - Name = "HL_KORD" - }, { - Name = "tt_DSHK" - }, { - Name = "tt_KORD" - }, { - Name = "HL_ZU-23" - }, { - Name = "tt_ZU-23" - }, { - Name = "HL_B8M1" - }, { - Name = "tt_B8M1" }, { Name = "ES44AH" }, { @@ -1899,6 +1883,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "QF_37_AA", in_service = 0, out_of_service = 40000 + }, { + Name = "Allies_Director", + in_service = 0, + out_of_service = 40000 }, { Name = "CCKW_353", in_service = 0, @@ -1951,6 +1939,38 @@ _G["db"]["Countries"]["#Index"] = { Name = "KrAZ6322", in_service = 0, out_of_service = 40000 + }, { + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { Name = "GAZ-3308", in_service = 0, @@ -2275,6 +2295,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "PLZ05", in_service = 0, out_of_service = 40000 + }, { + Name = "TYPE-59", + in_service = 0, + out_of_service = 40000 }, { Name = "Igla manpad INS", in_service = 0, diff --git a/_G/db/Countries/USSR.lua b/_G/db/Countries/USSR.lua index 694ebfb7..701ccb2a 100644 --- a/_G/db/Countries/USSR.lua +++ b/_G/db/Countries/USSR.lua @@ -599,22 +599,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "TZ-22_TANK", in_service = 0, out_of_service = 40000 - }, { - Name = "HL_DSHK" - }, { - Name = "HL_KORD" - }, { - Name = "tt_DSHK" - }, { - Name = "tt_KORD" - }, { - Name = "HL_ZU-23" - }, { - Name = "tt_ZU-23" - }, { - Name = "HL_B8M1" - }, { - Name = "tt_B8M1" }, { Name = "M4_Sherman" }, { @@ -639,6 +623,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Daimler_AC" }, { Name = "QF_37_AA" + }, { + Name = "Allies_Director" }, { Name = "CCKW_353" }, { diff --git a/_G/db/Countries/Ukraine.lua b/_G/db/Countries/Ukraine.lua index ae30344d..d585dc79 100644 --- a/_G/db/Countries/Ukraine.lua +++ b/_G/db/Countries/Ukraine.lua @@ -648,21 +648,37 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_KORD" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_DSHK" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_KORD" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_ZU-23" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_ZU-23" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_B8M1" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "tt_B8M1" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { Name = "S_75M_Volhov" }, { diff --git a/_G/db/Countries/United Arab Emirates.lua b/_G/db/Countries/United Arab Emirates.lua index 205d1a80..7bf43750 100644 --- a/_G/db/Countries/United Arab Emirates.lua +++ b/_G/db/Countries/United Arab Emirates.lua @@ -268,37 +268,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "Land_Rover_101_FC" }, { diff --git a/_G/db/Countries/United Nations Peacekeepers.lua b/_G/db/Countries/United Nations Peacekeepers.lua index 8554c817..45111a66 100644 --- a/_G/db/Countries/United Nations Peacekeepers.lua +++ b/_G/db/Countries/United Nations Peacekeepers.lua @@ -195,22 +195,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Coach a passenger" }, { Name = "Coach a platform" - }, { - Name = "HL_DSHK" - }, { - Name = "HL_KORD" - }, { - Name = "tt_DSHK" - }, { - Name = "tt_KORD" - }, { - Name = "HL_ZU-23" - }, { - Name = "tt_ZU-23" - }, { - Name = "HL_B8M1" - }, { - Name = "tt_B8M1" }, { Name = "ES44AH" }, { @@ -803,6 +787,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "QF_37_AA", in_service = 0, out_of_service = 40000 + }, { + Name = "Allies_Director", + in_service = 0, + out_of_service = 40000 }, { Name = "CCKW_353", in_service = 0, @@ -855,6 +843,38 @@ _G["db"]["Countries"]["#Index"] = { Name = "KrAZ6322", in_service = 0, out_of_service = 40000 + }, { + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { Name = "GAZ-3308", in_service = 0, @@ -1179,6 +1199,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "PLZ05", in_service = 0, out_of_service = 40000 + }, { + Name = "TYPE-59", + in_service = 0, + out_of_service = 40000 }, { Name = "Igla manpad INS", in_service = 0, diff --git a/_G/db/Countries/Venezuela.lua b/_G/db/Countries/Venezuela.lua index d2716119..e7430307 100644 --- a/_G/db/Countries/Venezuela.lua +++ b/_G/db/Countries/Venezuela.lua @@ -276,37 +276,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Vietnam.lua b/_G/db/Countries/Vietnam.lua index 7badbb94..ff417e4a 100644 --- a/_G/db/Countries/Vietnam.lua +++ b/_G/db/Countries/Vietnam.lua @@ -308,37 +308,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Yemen.lua b/_G/db/Countries/Yemen.lua index d6d2b6d3..873a598f 100644 --- a/_G/db/Countries/Yemen.lua +++ b/_G/db/Countries/Yemen.lua @@ -272,37 +272,53 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "Electric locomotive" + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Locomotive" + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo" + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach cargo open" + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank blue" + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a tank yellow" + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a passenger" + Name = "HL_B8M1", + in_service = 0, + out_of_service = 40000 }, { - Name = "Coach a platform" + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 }, { - Name = "HL_DSHK" + Name = "Electric locomotive" }, { - Name = "HL_KORD" + Name = "Locomotive" }, { - Name = "tt_DSHK" + Name = "Coach cargo" }, { - Name = "tt_KORD" + Name = "Coach cargo open" }, { - Name = "HL_ZU-23" + Name = "Coach a tank blue" }, { - Name = "tt_ZU-23" + Name = "Coach a tank yellow" }, { - Name = "HL_B8M1" + Name = "Coach a passenger" }, { - Name = "tt_B8M1" + Name = "Coach a platform" }, { Name = "ES44AH" }, { diff --git a/_G/db/Countries/Yugoslavia.lua b/_G/db/Countries/Yugoslavia.lua index 200acb0e..6ce52fa3 100644 --- a/_G/db/Countries/Yugoslavia.lua +++ b/_G/db/Countries/Yugoslavia.lua @@ -215,6 +215,22 @@ _G["db"]["Countries"]["#Index"] = { Name = "ZIL-135", in_service = 0, out_of_service = 40000 + }, { + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_B8M1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 }, { Name = "Electric locomotive" }, { @@ -233,22 +249,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Coach a platform" }, { Name = "Scud_B" - }, { - Name = "HL_DSHK" - }, { - Name = "HL_KORD" - }, { - Name = "tt_DSHK" - }, { - Name = "tt_KORD" - }, { - Name = "HL_ZU-23" - }, { - Name = "tt_ZU-23" - }, { - Name = "HL_B8M1" - }, { - Name = "tt_B8M1" }, { Name = "M4_Sherman" }, { @@ -279,6 +279,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Tetrarch" }, { Name = "QF_37_AA" + }, { + Name = "Allies_Director" }, { Name = "CCKW_353" }, { diff --git a/_G/db/Units/Cars/Car/2B11 mortar.lua b/_G/db/Units/Cars/Car/2B11 mortar.lua index 50ae7f64..413abc16 100644 --- a/_G/db/Units/Cars/Car/2B11 mortar.lua +++ b/_G/db/Units/Cars/Car/2B11 mortar.lua @@ -12,6 +12,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { LN = { { BR = { { connector_name = "POINT_GUN", + muzzleBrakeType = 2, pos = {} } }, PL = { { @@ -21,7 +22,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { shell_name = {} } }, connectorFire = false, - sensor = {} + sensor = {}, + xc = 0.967 } }, angles = { { 3.1415926535898, -3.1415926535898, 0.78539816339745, 1.3962634015955 } }, center = "CENTER_TOWER", diff --git a/_G/db/Units/Cars/Car/AAV7.lua b/_G/db/Units/Cars/Car/AAV7.lua index 63637300..e03c5274 100644 --- a/_G/db/Units/Cars/Car/AAV7.lua +++ b/_G/db/Units/Cars/Car/AAV7.lua @@ -121,7 +121,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "APC" }, - turbine = false, type = "AAV7", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/Allies_Director.lua b/_G/db/Units/Cars/Car/Allies_Director.lua new file mode 100644 index 00000000..7787f1c4 --- /dev/null +++ b/_G/db/Units/Cars/Car/Allies_Director.lua @@ -0,0 +1,145 @@ +_G["db"]["Units"]["Cars"]["Car"]["#Index"] = { + AddPropVehicle = { { + arg = 60, + control = "comboList", + defValue = 2, + id = "Tent", + label = "Tent", + values = { { + dispName = "Full covered", + id = 1, + value = 0 + }, { + dispName = "Only body", + id = 2, + value = 0.1 + }, { + dispName = "Removed", + id = 3, + value = 0.2 + } }, + wCtrl = 150 + } }, + Countries = { "Australia", "Belgium", "Canada", "Czech Republic", "France", "Italia", "Poland", "The Netherlands", "UK", "USA", "USSR", "Yugoslavia" }, + DetectionRange = 30000, + DisplayName = "Allies_Director", + DisplayNameShort = "DRT", + IR_emission_coeff = 0.03, + MaxSpeed = 0, + Name = "Allies_Director", + Rate = 3, + Sensors = { + OPTIC = { "long-range air defence optics" } + }, + ThreatRange = 0, + WS = { { + LN = { { + distanceMax = 30000, + distanceMin = 0, + max_trg_alt = 18000, + min_trg_alt = 50, + reactionTime = 4, + reflection_limit = 0.01, + type = 103, + typeForTargetPriority = 11 + } }, + angles = { { 3.1415926535898, -3.1415926535898, 0, 1.5620696805349 } }, + drawArgument1 = 0, + drawArgument2 = 1, + omegaY = 0.34906585039887, + omegaZ = 0.34906585039887, + pidY = { + d = 10, + i = 0, + inn = 20, + p = 20 + }, + pidZ = { + d = 10, + i = 0, + inn = 20, + p = 20 + }, + pos = { 0, 2, 0 } + }, { + LN = { { + PL = { { + ammo_capacity = 80, + reload_time = 1200, + shell_display_name = 'QF 3,7" HE', + shell_name = { "QF94_AA_HE" }, + shot_delay = 6, + switch_on_delay = 0.1 + } }, + aiming_director = true, + depends_on_unit = { { { "self", 1 } } }, + distanceMax = 9000, + distanceMin = 0, + max_trg_alt = 9000, + name = "QF 3.7inch AA gun", + reactionTime = 15, + reflection_limit = 0.22, + sensor = {}, + sightMaxTanVel = 200, + type = 11 + } }, + angles = { { 3.1415926535898, -3.1415926535898, 0, 1.5620696805349 } }, + omegaY = 1, + omegaZ = 1, + pos = { 0, 2, 0 } + }, + maxTargetDetectionRange = 30000 + }, + Waypoint_Custom_Panel = true, + _file = "./Mods/tech/WWII Units/Database/db_units_cars.lua", + _origin = "WWII Armour and Technics", + animation_arguments = { + alarm_state = -1 + }, + armour_scheme = { + hull_azimuth = { {} }, + hull_elevation = { {} }, + turret_azimuth = { {} }, + turret_elevation = { {} } + }, + attribute = { 2, 16, 26, "Redacted", "AA_flak", "Static AAA", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "Armed Air Defence", "Rocket Attack Valid AirDefence", "AAA", "All", "Ground Units", "Vehicles", "Ground vehicles" }, + category = "Air Defence", + chassis = { + life = 1.5 + }, + enablePlayerCanDrive = false, + mapclasskey = "P0091000015", + sensor = { + height = 2, + max_alt_finding_target = 18000, + max_range_finding_target = 30000 + }, + shape_table_data = { { + classname = "lLandVehicle", + desrt = "Bedford_MWD_p_1", + file = "Bedford_MWD", + life = 6, + name = "Bedford_MWD", + positioning = "BYNORMAL", + username = "Allies_Director" + }, { + file = "Bedford_MWD_p_1", + name = "Bedford_MWD_p_1" + } }, + snd = {}, + swapped_names = true, + tags = { "Air Defence", "AAA", "Optical Tracker" }, + type = "Allies_Director", + visual = { + IR = { + coeffs = { { 0.031, 0.0022 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0.27, 0.00049090909090909 } } + }, + agony_explosion_size = 0, + fire_pos = {}, + fire_size = 0, + fire_time = 0, + max_time_agony = -1, + shape = "Bedford_MWD", + shape_dstr = "Bedford_MWD_p_1" + } +} \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/BMP-1.lua b/_G/db/Units/Cars/Car/BMP-1.lua index 1d6ba317..02a1ac4c 100644 --- a/_G/db/Units/Cars/Car/BMP-1.lua +++ b/_G/db/Units/Cars/Car/BMP-1.lua @@ -89,7 +89,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "IFV" }, - turbine = false, type = "BMP-1", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/BMP-2.lua b/_G/db/Units/Cars/Car/BMP-2.lua index 3bd39e5e..d2c91f33 100644 --- a/_G/db/Units/Cars/Car/BMP-2.lua +++ b/_G/db/Units/Cars/Car/BMP-2.lua @@ -136,7 +136,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "IFV" }, - turbine = false, type = "BMP-2", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/BMP-3.lua b/_G/db/Units/Cars/Car/BMP-3.lua index 11243151..6a3600ea 100644 --- a/_G/db/Units/Cars/Car/BMP-3.lua +++ b/_G/db/Units/Cars/Car/BMP-3.lua @@ -180,7 +180,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "IFV" }, - turbine = false, type = "BMP-3", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/BTR-80.lua b/_G/db/Units/Cars/Car/BTR-80.lua index 39a00ee2..40f0604d 100644 --- a/_G/db/Units/Cars/Car/BTR-80.lua +++ b/_G/db/Units/Cars/Car/BTR-80.lua @@ -111,7 +111,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "APC" }, - turbine = false, type = "BTR-80", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/BTR-82A.lua b/_G/db/Units/Cars/Car/BTR-82A.lua index 66ed586a..a38cc5f0 100644 --- a/_G/db/Units/Cars/Car/BTR-82A.lua +++ b/_G/db/Units/Cars/Car/BTR-82A.lua @@ -117,7 +117,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "IFV" }, - turbine = false, type = "BTR-82A", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/Challenger2.lua b/_G/db/Units/Cars/Car/Challenger2.lua index 450ba5ec..63bf09bd 100644 --- a/_G/db/Units/Cars/Car/Challenger2.lua +++ b/_G/db/Units/Cars/Car/Challenger2.lua @@ -126,6 +126,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 17, 26, "Redacted", "Tanks", "Modern Tanks", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, category = "Armor", chassis = { + gearRatios = {}, life = 32 }, crew_locale = "ENG", @@ -148,7 +149,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "MBT" }, - turbine = true, type = "Challenger2", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/Chieftain_mk3.lua b/_G/db/Units/Cars/Car/Chieftain_mk3.lua index c2bf8671..a9a77ef4 100644 --- a/_G/db/Units/Cars/Car/Chieftain_mk3.lua +++ b/_G/db/Units/Cars/Car/Chieftain_mk3.lua @@ -144,7 +144,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, beamWidth = 0.017453292519943, reactionTime = 2, - sensor = {} + sensor = {}, + sightIndicationMode = 1, + sightMasterMode = 1 }, { BR = { {} }, PL = { { @@ -234,6 +236,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, angles = { { 2.4434609527921, -2.4434609527921, -0.15707963267949, 0.33161255787892 }, { -2.4434609527921, 2.4434609527921, 0, 0.33161255787892 } }, center = "CENTER_TOWER", + cockpit = { "Chieftain_mk3/Chieftain_mk3_reticle", { 0, 0, 0 } }, drawArgument1 = 0, drawArgument2 = 1, laser = true, diff --git a/_G/db/Units/Cars/Car/Daimler_AC.lua b/_G/db/Units/Cars/Car/Daimler_AC.lua index 93a49bb7..33f2040d 100644 --- a/_G/db/Units/Cars/Car/Daimler_AC.lua +++ b/_G/db/Units/Cars/Car/Daimler_AC.lua @@ -86,6 +86,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, angles = { { 3.1415926535898, -3.1415926535898, -0.17453292519943, 0.34906585039887 } }, center = "CENTER_TOWER", + cockpit = { "Daimler_MK1/Daimler_MK1", { 0, 0, 0 } }, drawArgument1 = 0, drawArgument2 = 1, omegaY = 0.2757620218151, @@ -102,6 +103,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { inn = 0.2, p = 10 }, + pointer = "POINT_SIGHT_01", pos = { -0.06, 1.639, 0 } }, maxTargetDetectionRange = 5000 diff --git a/_G/db/Units/Cars/Car/HL_B8M1.lua b/_G/db/Units/Cars/Car/HL_B8M1.lua index c415e204..0596ad42 100644 --- a/_G/db/Units/Cars/Car/HL_B8M1.lua +++ b/_G/db/Units/Cars/Car/HL_B8M1.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + Countries = { "Japan" }, Crew = 2, DetectionRange = 5000, DisplayName = "MLRS HL with B8M1 80mm", diff --git a/_G/db/Units/Cars/Car/HL_DSHK.lua b/_G/db/Units/Cars/Car/HL_DSHK.lua index 3cfcc40a..fe504b9e 100644 --- a/_G/db/Units/Cars/Car/HL_DSHK.lua +++ b/_G/db/Units/Cars/Car/HL_DSHK.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + Countries = { "Japan" }, Crew = 2, DetectionRange = 5000, DisplayName = "Scout HL with DSHK 12.7mm", diff --git a/_G/db/Units/Cars/Car/HL_KORD.lua b/_G/db/Units/Cars/Car/HL_KORD.lua index ac860dd7..44f04096 100644 --- a/_G/db/Units/Cars/Car/HL_KORD.lua +++ b/_G/db/Units/Cars/Car/HL_KORD.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + Countries = { "Japan" }, Crew = 2, DetectionRange = 5000, DisplayName = "Scout HL with KORD 12.7mm", diff --git a/_G/db/Units/Cars/Car/HL_ZU-23.lua b/_G/db/Units/Cars/Car/HL_ZU-23.lua index a0718a33..69a47361 100644 --- a/_G/db/Units/Cars/Car/HL_ZU-23.lua +++ b/_G/db/Units/Cars/Car/HL_ZU-23.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + Countries = { "Japan" }, Crew = 2, DetectionRange = 5000, DisplayName = "SPAAA HL with ZU-23", diff --git a/_G/db/Units/Cars/Car/Hummer.lua b/_G/db/Units/Cars/Car/Hummer.lua index bb3cf441..2dcb7ded 100644 --- a/_G/db/Units/Cars/Car/Hummer.lua +++ b/_G/db/Units/Cars/Car/Hummer.lua @@ -45,7 +45,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Unarmed", "Scout/Recon" }, - turbine = true, type = "Hummer", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/LAV-25.lua b/_G/db/Units/Cars/Car/LAV-25.lua index e3231f2d..9e072d04 100644 --- a/_G/db/Units/Cars/Car/LAV-25.lua +++ b/_G/db/Units/Cars/Car/LAV-25.lua @@ -149,7 +149,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "IFV" }, - turbine = false, type = "LAV-25", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/Leclerc.lua b/_G/db/Units/Cars/Car/Leclerc.lua index 9fbf20be..08d891d1 100644 --- a/_G/db/Units/Cars/Car/Leclerc.lua +++ b/_G/db/Units/Cars/Car/Leclerc.lua @@ -99,6 +99,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { category = "Armor", chassis = { X_gear_2 = -2.3, + gearRatios = {}, life = 32 }, crew_locale = "ENG", @@ -120,7 +121,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "MBT" }, - turbine = true, type = "Leclerc", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/Leopard-2.lua b/_G/db/Units/Cars/Car/Leopard-2.lua index fe592c5e..d428b243 100644 --- a/_G/db/Units/Cars/Car/Leopard-2.lua +++ b/_G/db/Units/Cars/Car/Leopard-2.lua @@ -326,7 +326,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "Tanks", "Modern Tanks", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, category = "Armor", - chassis = {}, + chassis = { + gearRatios = {} + }, crew_locale = "ENG", crew_members = { "commander", "gunner" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", @@ -361,7 +363,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swing_on_run = false, tags = { "Armor", "MBT" }, toggle_alarm_state_interval = 4, - turbine = false, type = "Leopard-2", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/Leopard-2A5.lua b/_G/db/Units/Cars/Car/Leopard-2A5.lua index ec2a07dd..b273bff1 100644 --- a/_G/db/Units/Cars/Car/Leopard-2A5.lua +++ b/_G/db/Units/Cars/Car/Leopard-2A5.lua @@ -326,7 +326,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "Tanks", "Modern Tanks", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, category = "Armor", - chassis = {}, + chassis = { + gearRatios = {} + }, crew_locale = "ENG", crew_members = { "commander", "gunner" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", @@ -361,7 +363,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swing_on_run = false, tags = { "Armor", "MBT" }, toggle_alarm_state_interval = 4, - turbine = false, type = "Leopard-2A5", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/Leopard1A3.lua b/_G/db/Units/Cars/Car/Leopard1A3.lua index 7ac42fa0..48a6e025 100644 --- a/_G/db/Units/Cars/Car/Leopard1A3.lua +++ b/_G/db/Units/Cars/Car/Leopard1A3.lua @@ -123,7 +123,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "MBT" }, - turbine = false, type = "Leopard1A3", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/M-1 Abrams.lua b/_G/db/Units/Cars/Car/M-1 Abrams.lua index 6b9af2ba..70a946c0 100644 --- a/_G/db/Units/Cars/Car/M-1 Abrams.lua +++ b/_G/db/Units/Cars/Car/M-1 Abrams.lua @@ -344,7 +344,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "Tanks", "Modern Tanks", "Datalink", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, category = "Armor", - chassis = {}, + chassis = { + gearRatios = {} + }, crew_locale = "ENG", crew_members = { "commander", "gunner" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", @@ -366,7 +368,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "MBT" }, - turbine = true, type = "M-1 Abrams", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/M-113.lua b/_G/db/Units/Cars/Car/M-113.lua index 792ef208..ced7148f 100644 --- a/_G/db/Units/Cars/Car/M-113.lua +++ b/_G/db/Units/Cars/Car/M-113.lua @@ -148,7 +148,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "APC" }, - turbine = false, type = "M-113", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/M-2 Bradley.lua b/_G/db/Units/Cars/Car/M-2 Bradley.lua index 9a4f2ddb..09aa2c63 100644 --- a/_G/db/Units/Cars/Car/M-2 Bradley.lua +++ b/_G/db/Units/Cars/Car/M-2 Bradley.lua @@ -126,7 +126,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swing_on_run = false, tags = { "Armor", "IFV" }, toggle_alarm_state_interval = 4, - turbine = false, type = "M-2 Bradley", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua b/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua index 78ba0358..10babbaf 100644 --- a/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua +++ b/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua @@ -116,7 +116,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "IFV" }, - turbine = false, type = "M1126 Stryker ICV", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua b/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua index 21ead931..ebdf033d 100644 --- a/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua +++ b/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua @@ -147,7 +147,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swing_on_run = false, tags = { "Armor", "SP ATGM" }, toggle_alarm_state_interval = 4, - turbine = false, type = "M1134 Stryker ATGM", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/MCV-80.lua b/_G/db/Units/Cars/Car/MCV-80.lua index 38a627d0..f9f4cbb1 100644 --- a/_G/db/Units/Cars/Car/MCV-80.lua +++ b/_G/db/Units/Cars/Car/MCV-80.lua @@ -259,7 +259,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "IFV" }, - turbine = false, type = "MCV-80", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/Marder.lua b/_G/db/Units/Cars/Car/Marder.lua index 670f56fd..cb07b047 100644 --- a/_G/db/Units/Cars/Car/Marder.lua +++ b/_G/db/Units/Cars/Car/Marder.lua @@ -122,7 +122,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "IFV" }, - turbine = false, type = "Marder", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/Merkava_Mk4.lua b/_G/db/Units/Cars/Car/Merkava_Mk4.lua index c2716d5b..ab686c99 100644 --- a/_G/db/Units/Cars/Car/Merkava_Mk4.lua +++ b/_G/db/Units/Cars/Car/Merkava_Mk4.lua @@ -259,7 +259,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "MBT" }, - turbine = false, type = "Merkava_Mk4", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/QF_37_AA.lua b/_G/db/Units/Cars/Car/QF_37_AA.lua index 5566443e..c82d3c40 100644 --- a/_G/db/Units/Cars/Car/QF_37_AA.lua +++ b/_G/db/Units/Cars/Car/QF_37_AA.lua @@ -25,6 +25,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { switch_on_delay = 0.1 } }, connectorFire = true, + depends_on_unit = { { { "Allies_Director", 2 } }, { { "none" } } }, distanceMax = 9000, distanceMin = 0, max_trg_alt = 9000, diff --git a/_G/db/Units/Cars/Car/SAU 2-C9.lua b/_G/db/Units/Cars/Car/SAU 2-C9.lua index be26ab88..3daec93c 100644 --- a/_G/db/Units/Cars/Car/SAU 2-C9.lua +++ b/_G/db/Units/Cars/Car/SAU 2-C9.lua @@ -19,6 +19,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { LN = { { BR = { { connector_name = "POINT_GUN", + muzzleBrakeType = 2, recoilArgument = 23, recoilTime = 0.15 } }, diff --git a/_G/db/Units/Cars/Car/SAU Msta.lua b/_G/db/Units/Cars/Car/SAU Msta.lua index 4c3e0244..0f97dbdf 100644 --- a/_G/db/Units/Cars/Car/SAU Msta.lua +++ b/_G/db/Units/Cars/Car/SAU Msta.lua @@ -120,6 +120,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { X_gear_2 = -2.35, armour_thickness = 0.012, canCrossRiver = false, + gearRatios = {}, life = 4, r_max = 0.44 }, diff --git a/_G/db/Units/Cars/Car/Scud_B.lua b/_G/db/Units/Cars/Car/Scud_B.lua index a549c2b0..d27c45db 100644 --- a/_G/db/Units/Cars/Car/Scud_B.lua +++ b/_G/db/Units/Cars/Car/Scud_B.lua @@ -189,7 +189,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swing_on_run = false, tags = { "MissilesSS", "SSM" }, toggle_alarm_state_interval = 20, - turbine = false, type = "Scud_B", verticalDeviationCompensationPeriod = 10, visual = { diff --git a/_G/db/Units/Cars/Car/T-55.lua b/_G/db/Units/Cars/Car/T-55.lua index c933e98a..ab7f75b4 100644 --- a/_G/db/Units/Cars/Car/T-55.lua +++ b/_G/db/Units/Cars/Car/T-55.lua @@ -180,7 +180,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "MBT" }, - turbine = false, type = "T-55", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/T-72B.lua b/_G/db/Units/Cars/Car/T-72B.lua index df93a14d..df367efa 100644 --- a/_G/db/Units/Cars/Car/T-72B.lua +++ b/_G/db/Units/Cars/Car/T-72B.lua @@ -171,7 +171,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "Tanks", "Modern Tanks", "CustomAimPoint", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, category = "Armor", - chassis = {}, + chassis = { + gearRatios = {} + }, crew_locale = "RUS", crew_members = { "gunner" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", @@ -191,7 +193,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "MBT" }, - turbine = false, type = "T-72B", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/T-72B3.lua b/_G/db/Units/Cars/Car/T-72B3.lua index 20e83365..e6ac7883 100644 --- a/_G/db/Units/Cars/Car/T-72B3.lua +++ b/_G/db/Units/Cars/Car/T-72B3.lua @@ -290,7 +290,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "MBT" }, - turbine = false, type = "T-72B3", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/T-80UD.lua b/_G/db/Units/Cars/Car/T-80UD.lua index c6ea0dca..eb69975d 100644 --- a/_G/db/Units/Cars/Car/T-80UD.lua +++ b/_G/db/Units/Cars/Car/T-80UD.lua @@ -164,7 +164,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "Tanks", "Modern Tanks", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, category = "Armor", - chassis = {}, + chassis = { + gearRatios = {} + }, crew_locale = "RUS", crew_members = { "gunner" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", @@ -184,7 +186,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "MBT" }, - turbine = false, type = "T-80UD", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/T-90.lua b/_G/db/Units/Cars/Car/T-90.lua index e1a51766..072a7884 100644 --- a/_G/db/Units/Cars/Car/T-90.lua +++ b/_G/db/Units/Cars/Car/T-90.lua @@ -165,7 +165,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 17, 26, "Redacted", "Tanks", "Modern Tanks", "CustomAimPoint", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, category = "Armor", chassis = { - life = 30 + engine_power = 1000, + gearRatios = {}, + life = 30, + turbine = true }, crew_locale = "RUS", crew_members = { "gunner" }, @@ -188,7 +191,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "MBT" }, - turbine = true, type = "T-90", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/TYPE-59.lua b/_G/db/Units/Cars/Car/TYPE-59.lua new file mode 100644 index 00000000..3c0bb340 --- /dev/null +++ b/_G/db/Units/Cars/Car/TYPE-59.lua @@ -0,0 +1,215 @@ +_G["db"]["Units"]["Cars"]["Car"]["#Index"] = { + CanopyGeometry = { + azimuth = {}, + elevation = {} + }, + Countries = { "China" }, + DetectionRange = 0, + DisplayName = "MT Type 59", + DisplayNameShort = "MT59", + IR_emission_coeff = 0.1, + MaxSpeed = 43.2, + Name = "MT Type 59", + Rate = 10, + Sensors = { + OPTIC = { "TPKU-2B", "TPN1" } + }, + ThreatRange = 2500, + WS = { { + LN = { { + BR = { { + connector_name = "PNT_CANNON", + recoilArgument = 23, + recoilTime = 0.5 + } }, + PL = { { + ammo_capacity = 6, + reload_time = 90, + shell_name = { "3UBM11_100mm_AP" }, + shot_delay = 8.5, + virtualStwID = 1 + }, { + ammo_capacity = 26, + automaticLoader = false, + reload_time = 390, + shell_name = { "3UBM11_100mm_AP" }, + shot_delay = 13.5, + virtualStwID = 2 + } }, + sensor = {}, + sightIndicationMode = 1, + sightMasterMode = 1 + }, { + BR = { {} }, + PL = { { + ammo_capacity = 2, + reload_time = 30, + shell_name = { "UOF412_100HE" }, + shot_delay = 8.5, + virtualStwID = 1 + }, { + ammo_capacity = 9, + reload_time = 135, + shell_name = { "UOF412_100HE" }, + shot_delay = 13.5, + virtualStwID = 2 + } }, + distanceMax = 8000, + distanceMin = 20, + sensor = {}, + sightIndicationMode = 1, + sightMasterMode = 1, + type = 6 + }, { + BR = { { + connector_name = "PNT_MGUN_COAX", + pos = {} + } }, + PL = { { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + } }, + fireAnimationArgument = 45, + secondary = true, + sensor = {} + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.069813170079773, 0.29670597283904 } }, + center = "CENTER_TOWER", + cockpit = { "TSh2B-32P/TSh2B-32P", { 0.1, 0, 0 } }, + drawArgument1 = 0, + drawArgument2 = 1, + omegaY = 0.29670597283904, + omegaZ = 0.17453292519943, + pointer = "PNT_SIGHT_1", + stabilizer = true + }, { + LN = { { + BR = { { + connector_name = "PNT_MGUN", + pos = {} + } }, + PL = { { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + }, { + shell_name = {} + } }, + customViewPoint = { "genericAAA", { -2, 0.2, 0 } }, + fireAnimationArgument = 44, + sensor = {}, + type = 10 + } }, + angles = { { 3.1415926535898, 1.5009831567151, -0.13962634015955, 0.69813170079773 }, { 1.5009831567151, 1.0297442586767, 0.34906585039887, 0.69813170079773 }, { 1.0297442586767, -3.1415926535898, -0.13962634015955, 0.69813170079773 } }, + base = 1, + center = "CENTER_MGUN", + drawArgument1 = 25, + drawArgument2 = 26, + omegaY = 0.69813170079773, + omegaZ = 0.5235987755983, + pidY = { + d = 8, + i = 0.1, + inn = 5.5, + p = 60 + }, + pidZ = { + d = 8, + i = 0.1, + inn = 5.5, + p = 60 + }, + reference_angle_Y = 3.1415926535898 + }, + maxTargetDetectionRange = 6000 + }, + Waypoint_Custom_Panel = true, + _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/type59.lua", + _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", + airWeaponDist = 1200, + animation_arguments = {}, + armour_scheme = { + hull_azimuth = { { 0, 30, 1.2 }, { 30, 150, 1 }, { 150, 180, 0.56 } }, + hull_elevation = { { -90, -45, 0.2 }, { -45, 30, 0.8 }, { 30, 90, 0.4 } }, + turret_azimuth = { { 0, 30, 2 }, { 30, 150, 1.6 }, { 150, 180, 0.65 } }, + turret_elevation = { { -90, 23, 1 }, { 23, 90, 0.2 } } + }, + attribute = { 2, 17, 26, "Redacted", "Tanks", "Old Tanks", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, + category = "Armor", + chassis = {}, + crew_locale = "CHN", + crew_members = { "gunner" }, + driverCockpit = "DriverCockpit/DriverCockpitWithIR", + driverViewConnectorName = { "PNT_DRIVER", + offset = { 0.05, 0, 0 } + }, + enablePlayerCanDrive = true, + mapclasskey = "P0091000001", + sensor = { + height = 2.723 + }, + shape_table_data = { { + classname = "lLandVehicle", + desrt = "ztz59_dstr", + file = "ztz59", + life = 18, + name = "ztz59", + positioning = "BYNORMAL", + username = "TYPE-59" + }, { + file = "ztz59_dstr", + name = "ztz59_dstr" + } }, + snd = { + engine_pitch = { {}, {}, {} }, + engine_vol_a = { {}, {}, {} }, + engine_vol_v = { {}, {}, {} }, + move_pitch = { {}, {} }, + move_vol = { {}, {}, {} } + }, + swapped_names = true, + swing_on_run = false, + tags = { "Armor", "MBT" }, + turbine = false, + type = "TYPE-59", + visual = { + IR = { + coeffs = { { 0.02, 0.0012 }, { 0.008, 0.002 }, { 0.0032, 0.0015 }, { 0, 0 }, { 0.29, 0.00020714285714286 } } + }, + agony_explosion_size = 5, + dirt_pos = { -2.8, 0.5, -1.3 }, + dust_pos = { 2.9, 0.1, -1.3 }, + fire_pos = { -0.7, 1.1, 0 }, + fire_size = 0.8, + fire_time = 750, + max_time_agony = 70, + min_time_agony = 10, + shape = "ztz59", + shape_dstr = "ztz59_dstr" + } +} \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/Tetrarch.lua b/_G/db/Units/Cars/Car/Tetrarch.lua index 304b0bd1..f6b40aae 100644 --- a/_G/db/Units/Cars/Car/Tetrarch.lua +++ b/_G/db/Units/Cars/Car/Tetrarch.lua @@ -86,7 +86,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, angles = { { 3.1415926535898, -3.1415926535898, -0.17453292519943, 0.34906585039887 } }, center = "CENTER_TOWER", - cockpit = { "TZF_5e/TZF_5e", { 0, 0, 0 } }, + cockpit = { "Daimler_MK1/Daimler_MK1", { 0, 0, 0 } }, drawArgument1 = 0, drawArgument2 = 1, omegaY = 0.2757620218151, diff --git a/_G/db/Units/Cars/Car/Tigr_233036.lua b/_G/db/Units/Cars/Car/Tigr_233036.lua index 4c22407c..156fe767 100644 --- a/_G/db/Units/Cars/Car/Tigr_233036.lua +++ b/_G/db/Units/Cars/Car/Tigr_233036.lua @@ -30,7 +30,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 25, "Redacted", "APC", "human_vehicle", "Infantry carriers", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "NonAndLightArmoredUnits", "LightArmoredUnits" }, category = "Unarmed", - chassis = {}, + chassis = { + gearRatios = {} + }, driverViewConnectorName = "DRIVER_POINT", enablePlayerCanDrive = true, mapclasskey = "P0091000005", @@ -44,7 +46,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Unarmed", "Scout/Recon" }, - turbine = true, type = "Tigr_233036", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/VAB_Mephisto.lua b/_G/db/Units/Cars/Car/VAB_Mephisto.lua index 5c87deb0..034531ed 100644 --- a/_G/db/Units/Cars/Car/VAB_Mephisto.lua +++ b/_G/db/Units/Cars/Car/VAB_Mephisto.lua @@ -165,7 +165,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swapped_names = true, swing_on_run = false, tags = { "Armor", "SP ATGM" }, - turbine = false, type = "VAB_Mephisto", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/leopard-2A4.lua b/_G/db/Units/Cars/Car/leopard-2A4.lua index d21988ff..5d56da9e 100644 --- a/_G/db/Units/Cars/Car/leopard-2A4.lua +++ b/_G/db/Units/Cars/Car/leopard-2A4.lua @@ -321,7 +321,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "Tanks", "Modern Tanks", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, category = "Armor", - chassis = {}, + chassis = { + gearRatios = {} + }, crew_locale = "ENG", crew_members = { "commander", "gunner" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", @@ -356,7 +358,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { swing_on_run = false, tags = { "Armor", "MBT" }, toggle_alarm_state_interval = 4, - turbine = false, type = "leopard-2A4", visual = { IR = { diff --git a/_G/db/Units/Cars/Car/leopard-2A4_trs.lua b/_G/db/Units/Cars/Car/leopard-2A4_trs.lua index 792f9c08..c85b317d 100644 --- a/_G/db/Units/Cars/Car/leopard-2A4_trs.lua +++ b/_G/db/Units/Cars/Car/leopard-2A4_trs.lua @@ -321,7 +321,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "Tanks", "Modern Tanks", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, category = "Armor", - chassis = {}, + chassis = { + gearRatios = {} + }, crew_locale = "ENG", crew_members = { "commander", "gunner" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", diff --git a/_G/db/Units/Cars/Car/tt_B8M1.lua b/_G/db/Units/Cars/Car/tt_B8M1.lua index 2273106f..6c3fdbed 100644 --- a/_G/db/Units/Cars/Car/tt_B8M1.lua +++ b/_G/db/Units/Cars/Car/tt_B8M1.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + Countries = { "Japan" }, Crew = 2, DetectionRange = 5000, DisplayName = "MLRS LC with B8M1 80mm", @@ -105,6 +106,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 17, 27, "Redacted", "", "MLRS", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "Indirect fire", "NonAndLightArmoredUnits", "LightArmoredUnits", "Artillery" }, category = "Artillery", chassis = { + gearRatios = {}, mass = 2545 }, driverCockpit = "DriverCockpit/DriverCockpit", diff --git a/_G/db/Units/Cars/Car/tt_DSHK.lua b/_G/db/Units/Cars/Car/tt_DSHK.lua index 3381b190..733731ed 100644 --- a/_G/db/Units/Cars/Car/tt_DSHK.lua +++ b/_G/db/Units/Cars/Car/tt_DSHK.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + Countries = { "Japan" }, Crew = 2, DetectionRange = 5000, DisplayName = "Scout LC with DSHK 12.7mm", @@ -64,6 +65,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 17, 26, "Redacted", "APC", "Infantry carriers", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "NonAndLightArmoredUnits", "LightArmoredUnits" }, category = "Armor", chassis = { + gearRatios = {}, mass = 2155 }, driverCockpit = "DriverCockpit/DriverCockpit", diff --git a/_G/db/Units/Cars/Car/tt_KORD.lua b/_G/db/Units/Cars/Car/tt_KORD.lua index f6a71f9a..4509c49a 100644 --- a/_G/db/Units/Cars/Car/tt_KORD.lua +++ b/_G/db/Units/Cars/Car/tt_KORD.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + Countries = { "Japan" }, Crew = 2, DetectionRange = 5000, DisplayName = "Scout LC with KORD 12.7mm", @@ -64,6 +65,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 17, 26, "Redacted", "APC", "Infantry carriers", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "NonAndLightArmoredUnits", "LightArmoredUnits" }, category = "Armor", chassis = { + gearRatios = {}, mass = 2155 }, driverCockpit = "DriverCockpit/DriverCockpit", diff --git a/_G/db/Units/Cars/Car/tt_ZU-23.lua b/_G/db/Units/Cars/Car/tt_ZU-23.lua index 190b1f63..7811a5a5 100644 --- a/_G/db/Units/Cars/Car/tt_ZU-23.lua +++ b/_G/db/Units/Cars/Car/tt_ZU-23.lua @@ -3,6 +3,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, + Countries = { "Japan" }, Crew = 2, DetectionRange = 0, DisplayName = "SPAAA LC with ZU-23", @@ -63,6 +64,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 16, 26, "Redacted", "AA_flak", "Mobile AAA", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "Armed Air Defence", "Rocket Attack Valid AirDefence", "AAA", "All", "Ground Units", "Vehicles", "Ground vehicles" }, category = "Air Defence", chassis = { + gearRatios = {}, mass = 3025 }, driverCockpit = "DriverCockpit/DriverCockpit", diff --git a/_G/db/Units/GT_t/LN_t/AK74.lua b/_G/db/Units/GT_t/LN_t/AK74.lua index e8d3fc3b..becf9f30 100644 --- a/_G/db/Units/GT_t/LN_t/AK74.lua +++ b/_G/db/Units/GT_t/LN_t/AK74.lua @@ -11,9 +11,9 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["AK74"] = { switch_on_delay = 3 } }, additionalShotDispersion = { - azimuth = 0, + azimuth = -0.0098174770424681, compensationK = 5, - elevation = 0.0098174770424681 + elevation = 0 }, display_name = "AK-74", distanceMax = 500, diff --git a/_G/db/Units/GT_t/LN_t/DANA_howitzer.lua b/_G/db/Units/GT_t/LN_t/DANA_howitzer.lua index 9e716e85..a9f5d1b0 100644 --- a/_G/db/Units/GT_t/LN_t/DANA_howitzer.lua +++ b/_G/db/Units/GT_t/LN_t/DANA_howitzer.lua @@ -21,6 +21,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["DANA_howitzer"] = { reactionTime = 100, reactionTimeLOFAC = 3, sensor = {}, - type = 6, - xc = 1.072 + type = 6 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/M192.lua b/_G/db/Units/GT_t/LN_t/M192.lua index 7ed3b14e..b71a0a3b 100644 --- a/_G/db/Units/GT_t/LN_t/M192.lua +++ b/_G/db/Units/GT_t/LN_t/M192.lua @@ -27,6 +27,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["M192"] = { reflection_limit = 0.1, sensor = {}, show_external_missile = true, - type = 4, - xc = -0.529 + type = 4 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/M901.lua b/_G/db/Units/GT_t/LN_t/M901.lua index d267218a..9adc2adc 100644 --- a/_G/db/Units/GT_t/LN_t/M901.lua +++ b/_G/db/Units/GT_t/LN_t/M901.lua @@ -15,6 +15,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["M901"] = { reactionTime = 2, reflection_limit = 0.049, sensor = {}, - type = 4, - xc = -1.109 + type = 4 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/Malutka.lua b/_G/db/Units/GT_t/LN_t/Malutka.lua index b0a3289d..71b245b6 100644 --- a/_G/db/Units/GT_t/LN_t/Malutka.lua +++ b/_G/db/Units/GT_t/LN_t/Malutka.lua @@ -23,6 +23,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["Malutka"] = { reactionTime = 10, sensor = {}, show_external_missile = true, - type = 33, - xc = 0.512 + type = 33 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/_9A310M1.lua b/_G/db/Units/GT_t/LN_t/_9A310M1.lua index 060b9c23..556ca70d 100644 --- a/_G/db/Units/GT_t/LN_t/_9A310M1.lua +++ b/_G/db/Units/GT_t/LN_t/_9A310M1.lua @@ -29,6 +29,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["_9A310M1"] = { reflection_limit = 0.02, sensor = {}, show_external_missile = true, - type = 4, - xc = -3.26 + type = 4 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/_9M117.lua b/_G/db/Units/GT_t/LN_t/_9M117.lua index 44b55eb6..13377f7e 100644 --- a/_G/db/Units/GT_t/LN_t/_9M117.lua +++ b/_G/db/Units/GT_t/LN_t/_9M117.lua @@ -23,6 +23,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["_9M117"] = { radialDisperse = 2.7, reactionTime = 10, sensor = {}, - type = 33, - xc = 0.585 + type = 33 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/_9M120.lua b/_G/db/Units/GT_t/LN_t/_9M120.lua index 210cddf5..258e1976 100644 --- a/_G/db/Units/GT_t/LN_t/_9M120.lua +++ b/_G/db/Units/GT_t/LN_t/_9M120.lua @@ -19,6 +19,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["_9M120"] = { radialDisperse = 2, reactionTime = 2, sensor = {}, - type = 33, - xc = 0.585 + type = 33 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/_9M311.lua b/_G/db/Units/GT_t/LN_t/_9M311.lua index b7d2ae57..8ade19f4 100644 --- a/_G/db/Units/GT_t/LN_t/_9M311.lua +++ b/_G/db/Units/GT_t/LN_t/_9M311.lua @@ -37,6 +37,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["_9M311"] = { reactionTime = 5, reflection_limit = 0.05, sensor = {}, - type = 33, - xc = -1.072 + type = 33 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/automatic_gun_KPVT.lua b/_G/db/Units/GT_t/LN_t/automatic_gun_KPVT.lua index df8895ba..a353f332 100644 --- a/_G/db/Units/GT_t/LN_t/automatic_gun_KPVT.lua +++ b/_G/db/Units/GT_t/LN_t/automatic_gun_KPVT.lua @@ -34,6 +34,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["automatic_gun_KPVT"] = { name = "KPVT", reactionTime = 1.8, sensor = {}, - type = 12, - xc = 1.251 + type = 12 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/howitzer_2A18.lua b/_G/db/Units/GT_t/LN_t/howitzer_2A18.lua index 3af69339..b3e1b4a2 100644 --- a/_G/db/Units/GT_t/LN_t/howitzer_2A18.lua +++ b/_G/db/Units/GT_t/LN_t/howitzer_2A18.lua @@ -21,6 +21,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["howitzer_2A18"] = { reactionTime = 100, reactionTimeLOFAC = 3, sensor = {}, - type = 6, - xc = 0.716 + type = 6 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/howitzer_2A33.lua b/_G/db/Units/GT_t/LN_t/howitzer_2A33.lua index 56f4ab21..7b9da3ad 100644 --- a/_G/db/Units/GT_t/LN_t/howitzer_2A33.lua +++ b/_G/db/Units/GT_t/LN_t/howitzer_2A33.lua @@ -21,6 +21,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["howitzer_2A33"] = { reactionTime = 100, reactionTimeLOFAC = 3, sensor = {}, - type = 6, - xc = 1.072 + type = 6 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/howitzer_2A60.lua b/_G/db/Units/GT_t/LN_t/howitzer_2A60.lua index b9b4d61b..eaa524d1 100644 --- a/_G/db/Units/GT_t/LN_t/howitzer_2A60.lua +++ b/_G/db/Units/GT_t/LN_t/howitzer_2A60.lua @@ -14,6 +14,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["howitzer_2A60"] = { reactionTime = 100, reactionTimeLOFAC = 3, sensor = {}, - type = 6, - xc = 0.967 + type = 6 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/howitzer_2A64.lua b/_G/db/Units/GT_t/LN_t/howitzer_2A64.lua index a39b15ac..dec0a1de 100644 --- a/_G/db/Units/GT_t/LN_t/howitzer_2A64.lua +++ b/_G/db/Units/GT_t/LN_t/howitzer_2A64.lua @@ -21,6 +21,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["howitzer_2A64"] = { reactionTime = 100, reactionTimeLOFAC = 3, sensor = {}, - type = 6, - xc = 0.608 + type = 6 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/roland.lua b/_G/db/Units/GT_t/LN_t/roland.lua index 147a38d1..20ffb153 100644 --- a/_G/db/Units/GT_t/LN_t/roland.lua +++ b/_G/db/Units/GT_t/LN_t/roland.lua @@ -19,6 +19,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["roland"] = { maxTrackingSpeed = 0, reactionTime = 8, sensor = {}, - type = 4, - xc = -3.255 + type = 4 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/tank_gun_105mm.lua b/_G/db/Units/GT_t/LN_t/tank_gun_105mm.lua index a5f99116..9406911f 100644 --- a/_G/db/Units/GT_t/LN_t/tank_gun_105mm.lua +++ b/_G/db/Units/GT_t/LN_t/tank_gun_105mm.lua @@ -13,6 +13,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["tank_gun_105mm"] = { max_trg_alt = 500, reactionTime = 2, sensor = {}, - type = 2, - xc = 1.059 + type = 2 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/tank_gun_2A28.lua b/_G/db/Units/GT_t/LN_t/tank_gun_2A28.lua index 2fd2af98..3c8ef796 100644 --- a/_G/db/Units/GT_t/LN_t/tank_gun_2A28.lua +++ b/_G/db/Units/GT_t/LN_t/tank_gun_2A28.lua @@ -14,6 +14,5 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["tank_gun_2A28"] = { max_trg_alt = 300, reactionTime = 2, sensor = {}, - type = 2, - xc = 0.512 + type = 2 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/WS_t/igla_comm_manpad/LN/1.lua b/_G/db/Units/GT_t/WS_t/igla_comm_manpad/LN/1.lua index d782a42d..7d835ac0 100644 --- a/_G/db/Units/GT_t/WS_t/igla_comm_manpad/LN/1.lua +++ b/_G/db/Units/GT_t/WS_t/igla_comm_manpad/LN/1.lua @@ -5,6 +5,5 @@ _G["db"]["Units"]["GT_t"]["WS_t"]["igla_comm_manpad"]["LN"]["#Index"] = { min_trg_alt = 10, reactionTime = 5, reflection_limit = 0.22, - type = 102, - xc = 0 + type = 102 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/WS_t/ship_FMC5/LN/1.lua b/_G/db/Units/GT_t/WS_t/ship_FMC5/LN/1.lua index 0af9c965..1fadd7b7 100644 --- a/_G/db/Units/GT_t/WS_t/ship_FMC5/LN/1.lua +++ b/_G/db/Units/GT_t/WS_t/ship_FMC5/LN/1.lua @@ -11,6 +11,5 @@ _G["db"]["Units"]["GT_t"]["WS_t"]["ship_FMC5"]["LN"]["#Index"] = { max_trg_alt = 7500, reactionTime = 15, sensor = {}, - type = 6, - xc = 3 + type = 6 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/WS_t/stinger_comm_manpad/LN/1.lua b/_G/db/Units/GT_t/WS_t/stinger_comm_manpad/LN/1.lua index 87aea404..6ac9528a 100644 --- a/_G/db/Units/GT_t/WS_t/stinger_comm_manpad/LN/1.lua +++ b/_G/db/Units/GT_t/WS_t/stinger_comm_manpad/LN/1.lua @@ -5,6 +5,5 @@ _G["db"]["Units"]["GT_t"]["WS_t"]["stinger_comm_manpad"]["LN"]["#Index"] = { min_trg_alt = 10, reactionTime = 5, reflection_limit = 0.22, - type = 102, - xc = 0 + type = 102 } \ No newline at end of file diff --git a/_G/db/Units/Helicopters/Helicopter/AH-64A.lua b/_G/db/Units/Helicopters/Helicopter/AH-64A.lua index 836d1bbb..6b98a3f1 100644 --- a/_G/db/Units/Helicopters/Helicopter/AH-64A.lua +++ b/_G/db/Units/Helicopters/Helicopter/AH-64A.lua @@ -426,12 +426,29 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, { lights = { { lights = { { + angle_max = 1.0471975511966, argument = 209, connector = "MAIN_SPOT_PTR", dir_correction = { azimuth = 1.0471975511966 }, proto = <4>{ + angle_change_rate = -0.11780972450962, + angle_max = 0.47123889803847, + angle_min = 0.37699111843078, + color = { 255, 201, 125, 0.1608210510119 }, + power_up_t = 0.75, + range = 192 + }, + typename = "spotlight" + }, { + angle_max = 0.39269908169872, + argument = 209, + connector = "MAIN_SPOT_PTR", + dir_correction = { + azimuth = 1.0821041362365 + }, + proto = <5>{ angle_change_rate = 0.043633231299858, angle_max = 0.17453292519943, angle_min = 0.10471975511966, @@ -493,13 +510,23 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { [6] = { lights = { { lights = { { + angle_max = 1.0471975511966, argument = 209, connector = "MAIN_SPOT_PTR", dir_correction = { - azimuth = 1.0471975511966 + azimuth = 1.3962634015955 }, proto = , typename = "spotlight" + }, { + angle_max = 0.39269908169872, + argument = 209, + connector = "MAIN_SPOT_PTR", + dir_correction = { + azimuth = 1.4137166941154 + }, + proto =
, + typename = "spotlight" } }, typename = "collection" } }, @@ -515,7 +542,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, period = 2, phase_shift = 0, - proto = <5>{ + proto = <6>{ angle_max = 3.1415926535898, angle_min = 0.5235987755983, color = { 0.92, 0.92, 1, 0.20784609690827 }, @@ -532,7 +559,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, period = 2, phase_shift = 0.5, - proto =
, + proto =
, typename = "natostrobelight" } }, typename = "Collection" diff --git a/_G/db/Units/Helicopters/Helicopter/AH-64D.lua b/_G/db/Units/Helicopters/Helicopter/AH-64D.lua index 79a6963b..88b37021 100644 --- a/_G/db/Units/Helicopters/Helicopter/AH-64D.lua +++ b/_G/db/Units/Helicopters/Helicopter/AH-64D.lua @@ -476,12 +476,29 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, { lights = { { lights = { { + angle_max = 1.0471975511966, argument = 209, connector = "MAIN_SPOT_PTR", dir_correction = { azimuth = 1.0471975511966 }, proto = <4>{ + angle_change_rate = -0.11780972450962, + angle_max = 0.47123889803847, + angle_min = 0.37699111843078, + color = { 255, 201, 125, 0.1608210510119 }, + power_up_t = 0.75, + range = 192 + }, + typename = "spotlight" + }, { + angle_max = 0.39269908169872, + argument = 209, + connector = "MAIN_SPOT_PTR", + dir_correction = { + azimuth = 1.0821041362365 + }, + proto = <5>{ angle_change_rate = 0.043633231299858, angle_max = 0.17453292519943, angle_min = 0.10471975511966, @@ -543,13 +560,23 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { [6] = { lights = { { lights = { { + angle_max = 1.0471975511966, argument = 209, connector = "MAIN_SPOT_PTR", dir_correction = { - azimuth = 1.0471975511966 + azimuth = 1.3962634015955 }, proto =
, typename = "spotlight" + }, { + angle_max = 0.39269908169872, + argument = 209, + connector = "MAIN_SPOT_PTR", + dir_correction = { + azimuth = 1.4137166941154 + }, + proto =
, + typename = "spotlight" } }, typename = "collection" } }, @@ -565,7 +592,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, period = 2, phase_shift = 0, - proto = <5>{ + proto = <6>{ angle_max = 3.1415926535898, angle_min = 0.5235987755983, color = { 0.92, 0.92, 1, 0.20784609690827 }, @@ -582,7 +609,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, period = 2, phase_shift = 0.5, - proto =
, + proto =
, typename = "natostrobelight" } }, typename = "Collection" diff --git a/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua b/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua index 7a9b4e02..7b3b544c 100644 --- a/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua +++ b/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua @@ -82,6 +82,16 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { defValue = true, id = "OperatorNVG", label = "Allow Operators NVG" + }, { + control = "checkbox", + defValue = true, + id = "R60equipment", + label = "R-60 equipment", + weaponRestricted = { + ["{275A2855-4A79-4B2D-B082-91EA2ADF4691}"] = true, + ["{APU-60-1_R_60M}"] = true, + ["{B0DBC591-0F52-4F7D-AD7B-51E67725FB81}"] = true + } } }, AmmoWeight = 207.5, CanopyGeometry = { -0.93969262078591, -0.95280922353749, -0.96592582628907, 0.0094409633615699, 0.98480775301221 }, @@ -854,8 +864,8 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, IR_emission_coeff = 0.5, InternalCargo = { - maximalCapacity = 2400, - nominalCapacity = 2400 + maximalCapacity = 800, + nominalCapacity = 800 }, LandRWCategories = { { Name = "AircraftCarrier" @@ -894,42 +904,47 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { connector = "hardpoint-1", use_full_connector_position = true }, { - Launchers = <8>{ { + Launchers = { <8>{ CLSID = "B_8V20A_CM" - }, { + }, <9>{ CLSID = "B_8V20A_OFP2" - }, { + }, <10>{ CLSID = "B_8V20A_OM" - }, { + }, <11>{ CLSID = "{UB-32A-24}" - }, { + }, <12>{ CLSID = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}" - }, { + }, <13>{ CLSID = "{2x9M120_Ataka_V}" - }, { + }, <14>{ CLSID = "{2x9M120F_Ataka_V}" - }, { + }, <15>{ CLSID = "{2x9M220_Ataka_V}" - }, { + }, <16>{ CLSID = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}" - }, { + }, <17>{ CLSID = "{PTB_450}" - }, { + }, <18>{ CLSID = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}" - }, { + }, <19>{ CLSID = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}" - }, { + }, <20>{ CLSID = "{FAB_250_M62}" - }, { + }, <21>{ CLSID = "{FB3CE165-BF07-4979-887C-92B87F13276B}" - }, { + }, <22>{ CLSID = "{4203753F-8198-4E85-9924-6F8FF679F9FF}" - }, { + }, <23>{ CLSID = "{RBK_250_275_AO_1SCH}" - }, { + }, <24>{ CLSID = "{APU_68_S-24}" - }, { + }, <25>{ CLSID = "GUV_VOG" + }, <26>{ + CLSID = "{APU-60-1_R_60M}", + Type = 1 + }, { + CLSID = "{B0DBC591-0F52-4F7D-AD7B-51E67725FB81}" } }, Number = 2, Order = 2, @@ -941,7 +956,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { use_full_connector_position = true }, { FiZ = 0, - Launchers = <9>{ { + Launchers = <27>{ { CLSID = "B_8V20A_CM" }, { CLSID = "B_8V20A_OFP2" @@ -992,7 +1007,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { use_full_connector_position = true }, { FiZ = 0, - Launchers =
, + Launchers =
, Number = 4, Order = 4, Type = 0, @@ -1002,7 +1017,9 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { connector = "hardpoint-4", use_full_connector_position = true }, { - Launchers =
, + Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { + CLSID = "{275A2855-4A79-4B2D-B082-91EA2ADF4691}" + } }, Number = 5, Order = 5, Type = 0, @@ -1267,6 +1284,222 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { x_trans = 0, y_trans = 0, z_trans = 0 + } }, { { + hAngle = 15, + rollAngle = 0, + vAngle = -20.067383, + viewAngle = 67.452896, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = 51.644135, + rollAngle = 0, + vAngle = -51.870411, + viewAngle = 37.846794, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = -1.912186, + rollAngle = 0, + vAngle = -34.446247, + viewAngle = 36.178646, + x_trans = 0, + y_trans = -0.025421, + z_trans = 0.073226 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = -90, + viewAngle = 90.348198, + x_trans = -4, + y_trans = 0, + z_trans = 0 + }, { + hAngle = -90.361992, + rollAngle = 0, + vAngle = -44.103138, + viewAngle = 73.605141, + x_trans = 0.169696, + y_trans = -0.073508, + z_trans = 0 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = -4.47801, + viewAngle = 42.512844, + x_trans = 0.154018, + y_trans = 0, + z_trans = 0 + }, { + hAngle = -108.85202, + rollAngle = 0, + vAngle = 0.085984, + viewAngle = 91.348198, + x_trans = 0.190306, + y_trans = 0.044778, + z_trans = 0.139404 + }, { + hAngle = 16.411518, + rollAngle = 0, + vAngle = -27.209915, + viewAngle = 89.777542, + x_trans = 0, + y_trans = 0, + z_trans = -0.218292 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = 34.042202, + viewAngle = 88.727844, + x_trans = 0.142145, + y_trans = 0, + z_trans = 0 + }, { + hAngle = -32.128311, + rollAngle = 0, + vAngle = -5.720805, + viewAngle = 59.208893, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = 14.80306, + rollAngle = 0, + vAngle = 3.332499, + viewAngle = 56.03204, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = -14.414484, + rollAngle = 0, + vAngle = 3.332499, + viewAngle = 56.03204, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = 0, + viewAngle = 89.777542, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + x_trans = -0.12, + y_trans = 0.03, + z_trans = 0 + } }, { { + hAngle = 15, + rollAngle = 0, + vAngle = -20.067383, + viewAngle = 67.452896, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = 51.644135, + rollAngle = 0, + vAngle = -51.870411, + viewAngle = 37.846794, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = -1.912186, + rollAngle = 0, + vAngle = -34.446247, + viewAngle = 36.178646, + x_trans = 0, + y_trans = -0.025421, + z_trans = 0.073226 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = -90, + viewAngle = 90.348198, + x_trans = -4, + y_trans = 0, + z_trans = 0 + }, { + hAngle = -90.361992, + rollAngle = 0, + vAngle = -44.103138, + viewAngle = 73.605141, + x_trans = 0.169696, + y_trans = -0.073508, + z_trans = 0 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = -4.47801, + viewAngle = 42.512844, + x_trans = 0.154018, + y_trans = 0, + z_trans = 0 + }, { + hAngle = -108.85202, + rollAngle = 0, + vAngle = 0.085984, + viewAngle = 91.348198, + x_trans = 0.190306, + y_trans = 0.044778, + z_trans = 0.139404 + }, { + hAngle = 16.411518, + rollAngle = 0, + vAngle = -27.209915, + viewAngle = 89.777542, + x_trans = 0, + y_trans = 0, + z_trans = -0.218292 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = 34.042202, + viewAngle = 88.727844, + x_trans = 0.142145, + y_trans = 0, + z_trans = 0 + }, { + hAngle = -32.128311, + rollAngle = 0, + vAngle = -5.720805, + viewAngle = 59.208893, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = 14.80306, + rollAngle = 0, + vAngle = 3.332499, + viewAngle = 56.03204, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = -14.414484, + rollAngle = 0, + vAngle = 3.332499, + viewAngle = 56.03204, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = 0, + viewAngle = 89.777542, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + x_trans = -0.12, + y_trans = 0.03, + z_trans = 0 } } }, TakeOffRWCategories = { { Name = "AircraftCarrier" @@ -1333,6 +1566,34 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { y = { -0.3, 0.1 }, z = { -0.3, 0.3 } } + }, { + Allow360rotation = false, + CameraAngleLimits = { 90, -45, 60 }, + CameraAngleRestriction = { false, 60, 0.4 }, + CameraViewAngleLimits = { 20, 100 }, + CockpitLocalPoint = { 0, 0, 0 }, + CockpitLocalPointAzimuth = 90, + EyePoint = { 0.09, 0, 0 }, + limits_6DOF = { + roll = 45, + x = { -5, 5 }, + y = { -5, 5 }, + z = { -5, 5 } + } + }, { + Allow360rotation = false, + CameraAngleLimits = { 90, -45, 60 }, + CameraAngleRestriction = { false, 60, 0.4 }, + CameraViewAngleLimits = { 20, 100 }, + CockpitLocalPoint = { 0, 0, 0 }, + CockpitLocalPointAzimuth = -90, + EyePoint = { 0.09, 0, 0 }, + limits_6DOF = { + roll = 45, + x = { -5, 5 }, + y = { -5, 5 }, + z = { -5, 5 } + } }, CockpitAnchorPoint = { 3.176, 0.586, -0.007 } } diff --git a/_G/db/Units/Helicopters/Helicopter/Mi-28N.lua b/_G/db/Units/Helicopters/Helicopter/Mi-28N.lua index d09ddc42..5c410d9b 100644 --- a/_G/db/Units/Helicopters/Helicopter/Mi-28N.lua +++ b/_G/db/Units/Helicopters/Helicopter/Mi-28N.lua @@ -12,15 +12,15 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, [3] = { args = { 65 }, - critical_damage = 20 + critical_damage = 10 }, [4] = { args = { 150 }, - critical_damage = 13 + critical_damage = 7.5 }, [5] = { args = { 149 }, - critical_damage = 13 + critical_damage = 7.5 }, [7] = { args = { 249 }, @@ -28,11 +28,11 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, [9] = { args = { 154, 299 }, - critical_damage = 14 + critical_damage = 7 }, [10] = { args = { 153, 303 }, - critical_damage = 14 + critical_damage = 7 }, [11] = { args = { 167 }, diff --git a/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua b/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua index 070e971e..2119e2e3 100644 --- a/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua +++ b/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua @@ -3202,7 +3202,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { Z = 3.26, use_full_connector_position = true }, { - DisplayName = "KORD", + DisplayName = "L MG", Launchers = { { CLSID = "KORD_12_7", arg_value = 1 @@ -3218,7 +3218,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { connector = "Gunner_Point", use_full_connector_position = true }, { - DisplayName = "PKT", + DisplayName = "R MG", Launchers = { { CLSID = "PKT_7_62", arg_value = -1 diff --git a/_G/db/Units/Planes/Plane/AV8BNA.lua b/_G/db/Units/Planes/Plane/AV8BNA.lua index 9389297b..ba05a50f 100644 --- a/_G/db/Units/Planes/Plane/AV8BNA.lua +++ b/_G/db/Units/Planes/Plane/AV8BNA.lua @@ -2490,7 +2490,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "Bailout" } } } }, - net_animation = { 290, 291, 292, 293, 104, 342, 343, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 906, 907, 910, 911, 999, 802, 903, 905, 934, 935, 936, 83, 190, 191, 192, 200, 201, 208, 209, 22, 182, 325 }, + net_animation = { 290, 291, 292, 293, 104, 342, 343, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 906, 907, 910, 911, 999, 802, 903, 905, 934, 935, 936, 83, 190, 191, 192, 200, 201, 208, 209, 22, 182, 325, 3080, 3090 }, nose_gear_amortizer_direct_stroke = 0.2032, nose_gear_amortizer_normal_weight_stroke = 0, nose_gear_amortizer_reversal_stroke = -0.1397, diff --git a/_G/db/Units/Planes/Plane/F-16C_50.lua b/_G/db/Units/Planes/Plane/F-16C_50.lua index ea3db6c2..d2bd8cce 100644 --- a/_G/db/Units/Planes/Plane/F-16C_50.lua +++ b/_G/db/Units/Planes/Plane/F-16C_50.lua @@ -1177,103 +1177,106 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", Cx_gain = 0.959 }, <34>{ + CLSID = "{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}", + Cx_gain = 3.04 + }, <35>{ CLSID = "{CBU-87}", Cx_gain = 3.398 - }, <35>{ + }, <36>{ CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", Cx_gain = 3.398 - }, <36>{ + }, <37>{ + CLSID = "{CBU_105}", + Cx_gain = 3.396 + }, <38>{ + CLSID = "{BRU57_2*CBU-105}", + Cx_gain_empty = 0.347, + Cx_gain_item = 4.151 + }, <39>{ + CLSID = "{CBU_103}", + Cx_gain = 3.396 + }, <40>{ + CLSID = "{BRU57_2*CBU-103}", + Cx_gain_empty = 0.347, + Cx_gain_item = 4.151 + }, <41>{ CLSID = "{TER_9A_3*MK-82}", Cx_gain_empty = 0.625, Cx_gain_item = 2.813 - }, <37>{ + }, <42>{ CLSID = "{TER_9A_3*MK-82_Snakeye}", Cx_gain_empty = 0.478, Cx_gain_item = 2.957 - }, <38>{ + }, <43>{ CLSID = "{TER_9A_3*MK-82AIR}", Cx_gain_empty = 0.478, Cx_gain_item = 2.957 - }, <39>{ + }, <44>{ CLSID = "{TER_9A_3*BDU-33}", Cx_gain_empty = 0.389, Cx_gain_item = 3.45 - }, <40>{ + }, <45>{ CLSID = "{444BA8AE-82A7-4345-842E-76154EFCCA46}", Cx_gain_item = 0.41 - }, <41>{ + }, <46>{ CLSID = "LAU_117_AGM_65G", Cx_gain_item = 0.41 - }, <42>{ + }, <47>{ CLSID = "LAU_117_AGM_65H", Cx_gain_item = 0.41 - }, <43>{ + }, <48>{ CLSID = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}", Cx_gain_item = 0.41 - }, <44>{ + }, <49>{ CLSID = "LAU_88_AGM_65D_ONE", Cx_gain_empty = 0.371, Cx_gain_item = 0.665 - }, <45>{ + }, <50>{ CLSID = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", Cx_gain_empty = 0.371, Cx_gain_item = 0.665 - }, <46>{ + }, <51>{ CLSID = "LAU_88_AGM_65H", Cx_gain_empty = 0.371, Cx_gain_item = 0.665 - }, <47>{ + }, <52>{ CLSID = "LAU_88_AGM_65H_3", Cx_gain_empty = 0.371, Cx_gain_item = 0.665 - }, <48>{ + }, <53>{ CLSID = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", Cx_gain_item = 0.4 - }, <49>{ + }, <54>{ CLSID = "{GBU-31}", Cx_gain = 0.17 - }, <50>{ + }, <55>{ CLSID = "{GBU-31V3B}", Cx_gain = 0.265 - }, <51>{ + }, <56>{ CLSID = "{GBU-38}", Cx_gain = 0.473 - }, <52>{ + }, <57>{ CLSID = "{BRU57_2*GBU-38}", Cx_gain_empty = 0.572 - }, <53>{ + }, <58>{ CLSID = "{AGM-154A}", Cx_gain = 0.486, Type = 1 - }, <54>{ + }, <59>{ CLSID = "{BRU57_2*AGM-154A}", Cx_gain_empty = 0.445, Cx_gain_item = 0.6657, Type = 1 - }, <55>{ - CLSID = "{CBU_105}", - Cx_gain = 3.396 - }, <56>{ - CLSID = "{BRU57_2*CBU-105}", - Cx_gain_empty = 0.347, - Cx_gain_item = 4.151 - }, <57>{ - CLSID = "{CBU_103}", - Cx_gain = 3.396 - }, <58>{ - CLSID = "{BRU57_2*CBU-103}", - Cx_gain_empty = 0.347, - Cx_gain_item = 4.151 - }, <59>{ - CLSID = "MXU-648-TP" }, <60>{ + CLSID = "MXU-648-TP" + }, <61>{ CLSID = "ALQ_184", Cx_gain = 1.281 - }, <61>{ + }, <62>{ CLSID = "ALQ_184_Long", Cx_gain = 1.281, DrawArgs = { { 57, 1 } } - }, <62>{ + }, <63>{ CLSID = "", add_mass = -131.1, arg_value = 1 @@ -1322,134 +1325,139 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mass = 131.1, use_full_connector_position = true }, { - Launchers = { <63>{ + Launchers = { <64>{ CLSID = "LAU3_WP156", Cx_gain_empty = 0.478, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <64>{ + }, <65>{ CLSID = "LAU3_WP1B", Cx_gain_empty = 0.478, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <65>{ + }, <66>{ CLSID = "LAU3_WP61", Cx_gain_empty = 0.478, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <66>{ + }, <67>{ CLSID = "LAU3_HE5", Cx_gain_empty = 0.478, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <67>{ + }, <68>{ CLSID = "LAU3_HE151", Cx_gain_empty = 0.478, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <68>{ + }, <69>{ CLSID = "{BDU-50LD}", Cx_gain = 1.388, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <69>{ + }, <70>{ CLSID = "{BDU-50LGB}", Cx_gain = 1.667, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <70>{ + }, <71>{ CLSID = "{BDU-50HD}", Cx_gain = 1.668, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <71>{ + }, <72>{ CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", Cx_gain = 1.563, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <72>{ + }, <73>{ CLSID = "{Mk82SNAKEYE}", Cx_gain = 1.882, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <73>{ + }, <74>{ CLSID = "{Mk82AIR}", Cx_gain = 1.882, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <74>{ + }, <75>{ CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", Cx_gain = 1.26, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <75>{ + }, <76>{ CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", Cx_gain = 1.673, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <76>{ + }, <77>{ CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", Cx_gain = 0.959, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <77>{ + }, <78>{ + CLSID = "{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}", + Cx_gain = 3.04, + add_mass = -2.7, + arg_value = 0.5 + }, <79>{ CLSID = "{CBU-87}", Cx_gain = 3.398, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <78>{ + }, <80>{ CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", Cx_gain = 3.398, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <79>{ + }, <81>{ CLSID = "{TER_9A_3*MK-82}", Cx_gain_empty = 0.625, Cx_gain_item = 2.813, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <80>{ + }, <82>{ CLSID = "{TER_9A_3*MK-82_Snakeye}", Cx_gain_empty = 0.478, Cx_gain_item = 2.957, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <81>{ + }, <83>{ CLSID = "{TER_9A_3*MK-82AIR}", Cx_gain_empty = 0.478, Cx_gain_item = 2.957, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <82>{ + }, <84>{ CLSID = "{TER_9A_3*BDU-33}", Cx_gain_empty = 0.389, Cx_gain_item = 3.45, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <83>{ + }, <85>{ CLSID = "{TER_9A_3*CBU-87}", Cx_gain_empty = 0.156, Cx_gain_item = 4.152, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <84>{ + }, <86>{ CLSID = "{TER_9A_3*CBU-97}", Cx_gain_empty = 0.156, Cx_gain_item = 4.152, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <85>{ + }, <87>{ CLSID = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", Cx_gain_item = 0.4, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <86>{ + }, <88>{ CLSID = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}" - }, <87>{ + }, <89>{ CLSID = "MXU-648-TP", - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 - }, <88>{ + }, <90>{ CLSID = "", add_mass = -133.8, arg_value = 1 @@ -1457,31 +1465,31 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{TER_9A_2L*MK-82}", Cx_gain_empty = 0.714, Cx_gain_item = 2.813, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 }, { CLSID = "{TER_9A_2L*MK-82_Snakeye}", Cx_gain_empty = 0.578, Cx_gain_item = 2.957, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 }, { CLSID = "{TER_9A_2L*MK-82AIR}", Cx_gain_empty = 0.578, Cx_gain_item = 2.957, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 }, { CLSID = "{TER_9A_2L*CBU-87}", Cx_gain_empty = 0.164, Cx_gain_item = 4.152, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 }, { CLSID = "{TER_9A_2L*CBU-97}", Cx_gain_empty = 0.164, Cx_gain_item = 4.152, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 } }, Number = 4, @@ -1526,35 +1534,35 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { DisplayName = "6", - Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { + Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { CLSID = "{TER_9A_2R*MK-82}", Cx_gain_empty = 0.714, Cx_gain_item = 2.813, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 }, { CLSID = "{TER_9A_2R*MK-82_Snakeye}", Cx_gain_empty = 0.578, Cx_gain_item = 2.957, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 }, { CLSID = "{TER_9A_2R*MK-82AIR}", Cx_gain_empty = 0.578, Cx_gain_item = 2.957, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 }, { CLSID = "{TER_9A_2R*CBU-87}", Cx_gain_empty = 0.164, Cx_gain_item = 4.152, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 }, { CLSID = "{TER_9A_2R*CBU-97}", Cx_gain_empty = 0.164, Cx_gain_item = 4.152, - add_mass = -82.5, + add_mass = -2.7, arg_value = 0.5 } }, Number = 6, @@ -1570,7 +1578,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { DisplayName = "7", - Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { + Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { CLSID = "{TER_9A_2R*MK-82}", Cx_gain_empty = 0.714, Cx_gain_item = 2.813 @@ -1686,7 +1694,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { cy_flap = 0.52, kjx = 2.75, kjz = 0.00125, - table_data = { { 0, 0.0165, 0.07, 0.132, 0.032, 0.5, 30, 1.2 }, { 0.2, 0.0165, 0.07, 0.132, 0.032, 1.5, 30, 1.2 }, { 0.4, 0.0165, 0.07, 0.133, 0.032, 2.5, 30, 1.2 }, { 0.6, 0.0165, 0.073, 0.133, 0.043, 3.5, 30, 1.2 }, { 0.7, 0.017, 0.076, 0.134, 0.045, 3.5, 28.666666666667, 1.18 }, { 0.8, 0.024, 0.079, 0.137, 0.052, 3.5, 27.333333333333, 1.16 }, { 0.9, 0.041, 0.083, 0.143, 0.058, 3.5, 26, 1.14 }, { 1, 0.062, 0.085, 0.18, 0.1, 3.5, 24.666666666667, 1.12 }, { 1.05, 0.061, 0.0855, 0.1975, 0.095, 3.5, 24, 1.11 }, { 1.1, 0.06, 0.086, 0.215, 0.09, 3.15, 18, 1.1 }, { 1.2, 0.051, 0.083, 0.228, 0.12, 2.45, 17, 1.05 }, { 1.3, 0.046, 0.077, 0.237, 0.17, 1.75, 16, 1 }, { 1.49, 0.044, 0.062, 0.251, 0.2, 1.5125, 13.15, 0.905 }, { 1.5, 0.043903225806452, 0.061483870967742, 0.25064516129032, 0.2058064516129, 1.5, 13, 0.9 }, { 1.7, 0.041967741935484, 0.051161290322581, 0.24354838709677, 0.32193548387097, 0.9, 12, 0.7 }, { 1.8, 0.041, 0.046, 0.24, 0.38, 0.86, 11.4, 0.64 }, { 2, 0.042, 0.039, 0.222, 2.5, 0.78, 10.2, 0.52 }, { 2.2, 0.041, 0.034, 0.227, 3.2, 0.7, 9, 0.4 }, { 2.5, 0.039, 0.033, 0.25, 4.5, 0.7, 9, 0.4 }, { 3.9, 0.035, 0.033, 0.35, 6, 0.7, 9, 0.4 } } + table_data = { { 0, 0.0165, 0.07, 0.132, 0.032, 0.5, 30, 1.45 }, { 0.2, 0.0165, 0.07, 0.132, 0.032, 1.5, 30, 1.45 }, { 0.4, 0.0165, 0.07, 0.133, 0.032, 2.5, 30, 1.45 }, { 0.6, 0.0165, 0.073, 0.133, 0.043, 3.5, 30, 1.45 }, { 0.7, 0.017, 0.076, 0.134, 0.045, 3.5, 28.666666666667, 1.45 }, { 0.8, 0.024, 0.079, 0.137, 0.052, 3.5, 27.333333333333, 1.35 }, { 0.9, 0.041, 0.083, 0.143, 0.058, 3.5, 26, 1.3 }, { 1, 0.062, 0.085, 0.18, 0.1, 3.5, 24.666666666667, 1.12 }, { 1.05, 0.061, 0.0855, 0.1975, 0.095, 3.5, 24, 1.11 }, { 1.1, 0.06, 0.086, 0.215, 0.09, 3.15, 18, 1.1 }, { 1.2, 0.051, 0.083, 0.228, 0.12, 2.45, 17, 1.05 }, { 1.3, 0.046, 0.077, 0.237, 0.17, 1.75, 16, 1 }, { 1.49, 0.044, 0.062, 0.251, 0.2, 1.5125, 13.15, 0.905 }, { 1.5, 0.043903225806452, 0.061483870967742, 0.25064516129032, 0.2058064516129, 1.5, 13, 0.9 }, { 1.7, 0.041967741935484, 0.051161290322581, 0.24354838709677, 0.32193548387097, 0.9, 12, 0.7 }, { 1.8, 0.041, 0.046, 0.24, 0.38, 0.86, 11.4, 0.64 }, { 2, 0.042, 0.039, 0.222, 2.5, 0.78, 10.2, 0.52 }, { 2.2, 0.041, 0.034, 0.227, 3.2, 0.7, 9, 0.4 }, { 2.5, 0.039, 0.033, 0.25, 4.5, 0.7, 9, 0.4 }, { 3.9, 0.035, 0.033, 0.35, 6, 0.7, 9, 0.4 } } }, engine = { ForsRUD = 0.91, @@ -1985,7 +1993,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mode = "1 Flash", period = 0.5, position = { -6.8, 3.25, 0 }, - proto = <89>{ + proto = <91>{ angle_max = 3.1415926535898, angle_min = 0.5235987755983, color = { 0.92, 0.92, 1, 0.20784609690827 }, @@ -2006,7 +2014,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mode = "1 Flash", period = 0.5, position = { -6.8, 3.25, 0 }, - proto =
, + proto =
, range = 64, typename = "Spot" } }, diff --git a/_G/db/Units/Planes/Plane/FA-18C_hornet.lua b/_G/db/Units/Planes/Plane/FA-18C_hornet.lua index f10435d3..7b22dd7e 100644 --- a/_G/db/Units/Planes/Plane/FA-18C_hornet.lua +++ b/_G/db/Units/Planes/Plane/FA-18C_hornet.lua @@ -1567,194 +1567,198 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Cx_gain_empty = 0.7435, Cx_gain_item = 0.734 }, <19>{ + CLSID = "{LAU-115 - AIM-7P}", + Cx_gain_empty = 0.7435, + Cx_gain_item = 0.734 + }, <20>{ CLSID = "LAU-115_2*LAU-127_AIM-120B", Cx_gain_empty = 0.786, Cx_gain_item = 0.543 - }, <20>{ + }, <21>{ CLSID = "LAU-115_2*LAU-127_AIM-120C", Cx_gain_empty = 0.786, Cx_gain_item = 0.543 - }, <21>{ + }, <22>{ CLSID = "{F16A4DE0-116C-4A71-97F0-2CF85B0313EC}", Cx_gain_empty = 0.794, Cx_gain_item = 0.677 - }, <22>{ + }, <23>{ CLSID = "LAU_117_AGM_65F", Cx_gain_empty = 0.794, Cx_gain_item = 0.677 - }, <23>{ + }, <24>{ CLSID = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", Cx_gain_empty = 1.987, Cx_gain_item = 0.621 - }, <24>{ + }, <25>{ CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", Cx_gain = 1.24 - }, <25>{ + }, <26>{ CLSID = "{Mk82SNAKEYE}", Cx_gain = 1.773 - }, <26>{ + }, <27>{ CLSID = "{Mk_82Y}", Cx_gain = 0.943 - }, <27>{ + }, <28>{ CLSID = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}", Cx_gain = 1.466 - }, <28>{ + }, <29>{ CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", Cx_gain = 1.296 - }, <29>{ + }, <30>{ CLSID = "{BDU_45}", Cx_gain = 0.944 - }, <30>{ + }, <31>{ CLSID = "{BDU_45B}", Cx_gain = 0.566 - }, <31>{ + }, <32>{ CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", Cx_gain = 1.951 - }, <32>{ + }, <33>{ CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", Cx_gain = 0.996 - }, <33>{ + }, <34>{ CLSID = "{0D33DDAE-524F-4A4E-B5B8-621754FE3ADE}", Cx_gain = 1.53 - }, <34>{ + }, <35>{ CLSID = "{CBU_99}", Cx_gain = 1.201 - }, <35>{ + }, <36>{ CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", Cx_gain = 1.871 - }, <36>{ + }, <37>{ CLSID = "{BRU33_2X_MK-82}", Cx_gain_empty = 0.335, Cx_gain_item = 1.653 - }, <37>{ + }, <38>{ CLSID = "{BRU33_2X_MK-82_Snakeye}", Cx_gain_empty = 0.328, Cx_gain_item = 2.128 - }, <38>{ + }, <39>{ CLSID = "{BRU33_2X_MK-82Y}", Cx_gain_empty = 0.379, Cx_gain_item = 1.132 - }, <39>{ + }, <40>{ CLSID = "{BRU33_2X_MK-83}", Cx_gain_empty = 0.339, Cx_gain_item = 1.76 - }, <40>{ + }, <41>{ CLSID = "{BRU33_2X_BDU-45}", Cx_gain_empty = 0.379, Cx_gain_item = 1.132 - }, <41>{ + }, <42>{ CLSID = "{BRU33_2X_BDU-45B}", Cx_gain_empty = 0.398, Cx_gain_item = 0.755 - }, <42>{ + }, <43>{ CLSID = "{BRU33_2X_GBU-12}", Cx_gain_empty = 0.373, Cx_gain_item = 1.178 - }, <43>{ + }, <44>{ CLSID = "{BRU33_2X_CBU-99}", Cx_gain_empty = 0.325, Cx_gain_item = 1.44 - }, <44>{ + }, <45>{ CLSID = "{BRU33_2X_ROCKEYE}", Cx_gain_empty = 0.341, Cx_gain_item = 1.496 - }, <45>{ + }, <46>{ CLSID = "{BRU33_LAU68}", Cx_gain = 0.406 - }, <46>{ + }, <47>{ CLSID = "{BRU33_2*LAU68}", Cx_gain = 0.443 - }, <47>{ + }, <48>{ CLSID = "{BRU33_LAU68_MK5}", Cx_gain = 0.406 - }, <48>{ + }, <49>{ CLSID = "{BRU33_2*LAU68_MK5}", Cx_gain = 0.443 - }, <49>{ + }, <50>{ CLSID = "{BRU33_LAU10}", Cx_gain = 0.589 - }, <50>{ + }, <51>{ CLSID = "{BRU33_2*LAU10}", Cx_gain = 0.699 - }, <51>{ + }, <52>{ CLSID = "{BRU33_LAU61}", Cx_gain = 0.692 - }, <52>{ + }, <53>{ CLSID = "{BRU33_2*LAU61}", Cx_gain = 0.846 - }, <53>{ + }, <54>{ CLSID = "{BRU41_6X_BDU-33}", Cx_gain_empty = 6.024, Cx_gain_item = 3.636 - }, <54>{ + }, <55>{ CLSID = "{AGM-154A}", Cx_gain = 0.277, Type = 1 - }, <55>{ + }, <56>{ CLSID = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", Cx_gain = 0.277, Type = 1 - }, <56>{ + }, <57>{ CLSID = "{BRU55_2*AGM-154A}", Cx_gain_empty = 0.371, Cx_gain_item = 0.277, Type = 1 - }, <57>{ + }, <58>{ CLSID = "{BRU55_2*AGM-154C}", Cx_gain_empty = 0.371, Cx_gain_item = 0.277, Type = 1 - }, <58>{ + }, <59>{ CLSID = "{GBU-31}", Cx_gain = 0.188 - }, <59>{ + }, <60>{ CLSID = "{GBU-31V3B}", Cx_gain = 0.292 - }, <60>{ + }, <61>{ CLSID = "{GBU_31_V_2B}", Cx_gain = 0.188 - }, <61>{ + }, <62>{ CLSID = "{GBU_31_V_4B}", Cx_gain = 0.188 - }, <62>{ - CLSID = "{GBU_32_V_2B}" }, <63>{ + CLSID = "{GBU_32_V_2B}" + }, <64>{ CLSID = "{GBU-24}", Cx_gain = 2.073 - }, <64>{ + }, <65>{ CLSID = "{GBU-38}", Cx_gain = 0.268 - }, <65>{ + }, <66>{ CLSID = "{BRU55_2*GBU-38}", Cx_gain_empty = 0.477, Cx_gain_item = 0.357 - }, <66>{ + }, <67>{ CLSID = "{C40A1E3A-DD05-40D9-85A4-217729E37FAE}", Cx_gain = 1.175 - }, <67>{ + }, <68>{ CLSID = "{BDU_45LG}", Cx_gain = 0.996 - }, <68>{ + }, <69>{ CLSID = "{BRU33_2X_BDU_45LG}", Cx_gain_empty = 0.373, Cx_gain_item = 1.178 - }, <69>{ + }, <70>{ CLSID = "{AGM_84D}", Cx_gain = 0.355, Type = 1 - }, <70>{ + }, <71>{ CLSID = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}", Cx_gain = 0.519, Type = 1 - }, <71>{ + }, <72>{ CLSID = "{AGM_84H}", Cx_gain = 0.467, Type = 1 - }, <72>{ + }, <73>{ CLSID = "{AWW-13}", Cx_gain = 0.784, arg_value = 0.1 - }, <73>{ + }, <74>{ CLSID = "", add_mass = -140.6, arg_value = 1 @@ -1795,206 +1799,210 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mass = 140.6, use_full_connector_position = true }, { - Launchers = { <74>{ + Launchers = { <75>{ CLSID = "{LAU-115 - AIM-7M}", Cx_gain_empty = 0.7435, Cx_gain_item = 0.734 - }, <75>{ + }, <76>{ CLSID = "{LAU-115 - AIM-7F}", Cx_gain_empty = 0.7435, Cx_gain_item = 0.734 - }, <76>{ + }, <77>{ CLSID = "{LAU-115 - AIM-7H}", Cx_gain_empty = 0.7435, Cx_gain_item = 0.734 - }, <77>{ + }, <78>{ + CLSID = "{LAU-115 - AIM-7P}", + Cx_gain_empty = 0.7435, + Cx_gain_item = 0.734 + }, <79>{ CLSID = "LAU-115_2*LAU-127_AIM-120B", Cx_gain_empty = 0.786, Cx_gain_item = 0.543 - }, <78>{ + }, <80>{ CLSID = "LAU-115_2*LAU-127_AIM-120C", Cx_gain_empty = 0.786, Cx_gain_item = 0.543 - }, <79>{ + }, <81>{ CLSID = "{F16A4DE0-116C-4A71-97F0-2CF85B0313EC}", Cx_gain_empty = 0.794, Cx_gain_item = 0.677 - }, <80>{ + }, <82>{ CLSID = "LAU_117_AGM_65F", Cx_gain_empty = 0.794, Cx_gain_item = 0.677 - }, <81>{ + }, <83>{ CLSID = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", Cx_gain_empty = 1.987, Cx_gain_item = 0.621 - }, <82>{ + }, <84>{ CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", Cx_gain = 1.24 - }, <83>{ + }, <85>{ CLSID = "{Mk82SNAKEYE}", Cx_gain = 1.773 - }, <84>{ + }, <86>{ CLSID = "{Mk_82Y}", Cx_gain = 0.943 - }, <85>{ + }, <87>{ CLSID = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}", Cx_gain = 1.466 - }, <86>{ + }, <88>{ CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", Cx_gain = 1.296 - }, <87>{ + }, <89>{ CLSID = "{BDU_45}", Cx_gain = 0.944 - }, <88>{ + }, <90>{ CLSID = "{BDU_45B}", Cx_gain = 0.566 - }, <89>{ + }, <91>{ CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", Cx_gain = 1.951 - }, <90>{ + }, <92>{ CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", Cx_gain = 0.996 - }, <91>{ + }, <93>{ CLSID = "{0D33DDAE-524F-4A4E-B5B8-621754FE3ADE}", Cx_gain = 1.53 - }, <92>{ + }, <94>{ CLSID = "{CBU_99}", Cx_gain = 1.201 - }, <93>{ + }, <95>{ CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", Cx_gain = 1.871 - }, <94>{ + }, <96>{ CLSID = "{BRU33_2X_MK-82}", Cx_gain_empty = 0.335, Cx_gain_item = 1.653 - }, <95>{ + }, <97>{ CLSID = "{BRU33_2X_MK-82_Snakeye}", Cx_gain_empty = 0.328, Cx_gain_item = 2.128 - }, <96>{ + }, <98>{ CLSID = "{BRU33_2X_MK-82Y}", Cx_gain_empty = 0.379, Cx_gain_item = 1.132 - }, <97>{ + }, <99>{ CLSID = "{BRU33_2X_MK-83}", Cx_gain_empty = 0.339, Cx_gain_item = 1.76 - }, <98>{ + }, <100>{ CLSID = "{BRU33_2X_BDU-45}", Cx_gain_empty = 0.379, Cx_gain_item = 1.132 - }, <99>{ + }, <101>{ CLSID = "{BRU33_2X_BDU-45B}", Cx_gain_empty = 0.398, Cx_gain_item = 0.755 - }, <100>{ + }, <102>{ CLSID = "{BRU33_2X_GBU-12}", Cx_gain_empty = 0.373, Cx_gain_item = 1.178 - }, <101>{ + }, <103>{ CLSID = "{BRU33_2X_CBU-99}", Cx_gain_empty = 0.325, Cx_gain_item = 1.44 - }, <102>{ + }, <104>{ CLSID = "{BRU33_2X_ROCKEYE}", Cx_gain_empty = 0.341, Cx_gain_item = 1.496 - }, <103>{ + }, <105>{ CLSID = "{BRU33_LAU68}", Cx_gain = 0.406 - }, <104>{ + }, <106>{ CLSID = "{BRU33_2*LAU68}", Cx_gain = 0.443 - }, <105>{ + }, <107>{ CLSID = "{BRU33_LAU68_MK5}", Cx_gain = 0.406 - }, <106>{ + }, <108>{ CLSID = "{BRU33_2*LAU68_MK5}", Cx_gain = 0.443 - }, <107>{ + }, <109>{ CLSID = "{BRU33_LAU10}", Cx_gain = 0.589 - }, <108>{ + }, <110>{ CLSID = "{BRU33_2*LAU10}", Cx_gain = 0.699 - }, <109>{ + }, <111>{ CLSID = "{BRU33_LAU61}", Cx_gain = 0.692 - }, <110>{ + }, <112>{ CLSID = "{BRU33_2*LAU61}", Cx_gain = 0.846 - }, <111>{ + }, <113>{ CLSID = "{BRU41_6X_BDU-33}", Cx_gain_empty = 6.024, Cx_gain_item = 3.636 - }, <112>{ + }, <114>{ CLSID = "{AGM-154A}", Cx_gain = 0.277, Type = 1 - }, <113>{ + }, <115>{ CLSID = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", Cx_gain = 0.277, Type = 1 - }, <114>{ + }, <116>{ CLSID = "{BRU55_2*AGM-154A}", Cx_gain_empty = 0.371, Cx_gain_item = 0.277, Type = 1 - }, <115>{ + }, <117>{ CLSID = "{BRU55_2*AGM-154C}", Cx_gain_empty = 0.371, Cx_gain_item = 0.277, Type = 1 - }, <116>{ + }, <118>{ CLSID = "{GBU-31}", Cx_gain = 0.188 - }, <117>{ + }, <119>{ CLSID = "{GBU-31V3B}", Cx_gain = 0.292 - }, <118>{ + }, <120>{ CLSID = "{GBU_31_V_2B}", Cx_gain = 0.188 - }, <119>{ + }, <121>{ CLSID = "{GBU_31_V_4B}", Cx_gain = 0.188 - }, <120>{ + }, <122>{ CLSID = "{GBU_32_V_2B}" - }, <121>{ + }, <123>{ CLSID = "{GBU-24}", Cx_gain = 2.073 - }, <122>{ + }, <124>{ CLSID = "{GBU-38}", Cx_gain = 0.268 - }, <123>{ + }, <125>{ CLSID = "{BRU55_2*GBU-38}", Cx_gain_empty = 0.477, Cx_gain_item = 0.357 - }, <124>{ + }, <126>{ CLSID = "{BDU_45LG}", Cx_gain = 0.996 - }, <125>{ + }, <127>{ CLSID = "{BRU33_2X_BDU_45LG}", Cx_gain_empty = 0.373, Cx_gain_item = 1.178 - }, <126>{ + }, <128>{ CLSID = "{AGM_84D}", Cx_gain = 0.355, Type = 1 - }, <127>{ + }, <129>{ CLSID = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}", Cx_gain = 0.519, Type = 1 - }, <128>{ + }, <130>{ CLSID = "{AGM_84H}", Cx_gain = 0.467, Type = 1 - }, <129>{ + }, <131>{ CLSID = "{AWW-13}", Cx_gain = 0.784, arg_value = 0.1 - }, <130>{ + }, <132>{ CLSID = "{FPU_8A_FUEL_TANK}" - }, <131>{ + }, <133>{ CLSID = "", add_mass = -140.6, arg_value = 1 @@ -2028,6 +2036,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "{AIM-7H}", Cx_gain = 0.49 + }, { + CLSID = "{AIM-7P}", + Cx_gain = 0.49 }, { CLSID = "{C8E06185-7CD6-4C90-959F-044679E90751}", Cx_gain = 0.435 @@ -2159,6 +2170,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "{AIM-7H}", Cx_gain = 0.49 + }, { + CLSID = "{AIM-7P}", + Cx_gain = 0.49 }, { CLSID = "{C8E06185-7CD6-4C90-959F-044679E90751}", Cx_gain = 0.435 @@ -2178,7 +2192,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mass = 29.5, use_full_connector_position = true }, { - Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { + Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { CLSID = "{LAU-115 - AIM-120B_R}", Cx_gain_empty = 0.786, Cx_gain_item = 0.543 @@ -2199,7 +2213,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mass = 140.6, use_full_connector_position = true }, { - Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { + Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { CLSID = "LAU-115_LAU-127_AIM-9X_R", Cx_gain_empty = 0.786, Cx_gain_item = 0.863 diff --git a/_G/db/Units/Planes/Plane/JF-17.lua b/_G/db/Units/Planes/Plane/JF-17.lua index 30df8069..aaab36bb 100644 --- a/_G/db/Units/Planes/Plane/JF-17.lua +++ b/_G/db/Units/Planes/Plane/JF-17.lua @@ -3496,7 +3496,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, crew_size = 1, date_of_introduction = 2003.8, - detection_range_max = 256000, + detection_range_max = 180, effects_presets = { { effect = "OVERWING_VAPOR", file = "./CoreMods/aircraft/ChinaAssetPack/Effects/JF-17_overwingVapor.lua", diff --git a/_G/db/Units/Ships/Ship/Stennis.lua b/_G/db/Units/Ships/Ship/Stennis.lua index c1659614..2e7bbb49 100644 --- a/_G/db/Units/Ships/Ship/Stennis.lua +++ b/_G/db/Units/Ships/Ship/Stennis.lua @@ -42,10 +42,6 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Countries = { "USA" }, DM = { { area_arg = 70, - area_fire = { - connector = "FIRE_NOSE_R_01", - size = 0.5 - }, area_life = 150, area_name = "NOSE_R_01" }, { @@ -65,7 +61,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { area_life = 150, area_name = "CENTER_R_01" }, { - area_arg = 96, + area_arg = 72, area_fire = { connector = "FIRE_CENTER_R_02", size = 0.5 @@ -73,206 +69,237 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { area_life = 150, area_name = "CENTER_R_02" }, { - area_arg = 72, + area_arg = 73, area_fire = { connector = "FIRE_BACK_R", size = 0.5 }, - area_life = 300, + area_life = 150, area_name = "BACK_R" }, { - area_arg = 73, - area_fire = { - connector = "FIRE_NOSE_L_01", - size = 0.5 - }, + area_arg = 74, area_life = 150, area_name = "NOSE_L_01" }, { area_arg = 95, area_fire = { - connector = "FIRE_NOSE_L_02", + connector = "FIRE_NOSE_L_03", size = 0.5 }, area_life = 150, area_name = "NOSE_L_02" }, { - area_arg = 74, - area_fire = { - connector = "FIRE_CENTER_L_01", - size = 0.3 - }, + area_arg = 75, area_life = 150, area_name = "CENTER_L_01" }, { - area_arg = 97, + area_arg = 76, + area_fire = { + connector = "FIRE_CENTER_L_01", + size = 0.5 + }, area_life = 150, area_name = "CENTER_L_02" }, { - area_arg = 98, - area_life = 150, - area_name = "CENTER_L_03" - }, { - area_arg = 75, + area_arg = 77, area_fire = { connector = "FIRE_BACK_L", size = 0.5 }, - area_life = 300, + area_life = 150, area_name = "BACK_L" }, { - area_arg = 76, + area_arg = 78, + area_life = 150, + area_name = "BACK_74" + }, { + area_arg = 79, area_fire = { connector = "FIRE_PALUBA_NOSE", size = 0.8 }, - area_life = 100, + area_life = 300, area_name = "PALUBA_NOSE", + armour = { + width = 0.03 + }, belongsToRunway = true }, { - area_arg = 77, + area_arg = 80, area_fire = { connector = "FIRE_PALUBA_MIDLE_01", size = 0.8 }, - area_life = 100, + area_life = 300, area_name = "PALUBA_MIDLE_01", + armour = { + width = 0.03 + }, belongsToRunway = true }, { - area_arg = 92, + area_arg = 81, area_fire = { - connector = "FIRE_PALUBA_MIDLE_02", + connector = "FIRE_PALUBA_MIDLE_04", size = 0.8 }, - area_life = 100, + area_life = 300, area_name = "PALUBA_MIDLE_02", + armour = { + width = 0.03 + }, belongsToRunway = true }, { - area_arg = 78, + area_arg = 82, area_fire = { connector = "FIRE_PALUBA_BACK_01", size = 0.8 }, - area_life = 100, - area_name = "PALUBA_BACK_01", + area_life = 300, + area_name = "PALUBA_BACK", + armour = { + width = 0.03 + }, belongsToRunway = true }, { - area_arg = 93, + area_arg = 83, + area_life = 75, + area_name = "Col_Island_74_Front" + }, { + area_arg = 84, area_fire = { - connector = "FIRE_PALUBA_BACK_02", - size = 0.8 + connector = "FIRE_RUBKA_73_02", + size = 0.3 }, - area_life = 100, - area_name = "PALUBA_BACK_02", - belongsToRunway = true + area_life = 75, + area_name = "Col_Island_74_R" }, { - area_arg = 79, - area_life = 100, - area_name = "BACK" + area_arg = 85, + area_life = 75, + area_name = "Col_Island_74_Back" }, { - area_arg = 80, + area_arg = 86, area_fire = { - connector = "FIRE_RUBKA", - size = 0.8 + connector = "FIRE_RUBKA_73_04", + size = 0.3 }, - area_life = 100, - area_name = "RUBKA" + area_life = 75, + area_name = "Col_Island_74_L" }, { - area_arg = 81, - area_life = 100, - area_name = "MACHTA" + area_arg = 87, + area_fire = { + connector = "FIRE_RUBKA_73_05", + size = 0.4 + }, + area_life = 75, + area_name = "Col_Island_74_Top" }, { - area_arg = 82, - area_life = 100, - area_name = "TOWER" + area_arg = 88, + area_life = 50, + area_name = "MACHTA_74" }, { - area_arg = 99, - area_life = 30, + area_arg = 89, + area_life = 80, + area_name = "TOWER_74" + }, { + area_arg = 96, + area_life = 2, + area_name = "ZRK_NR" + }, { + area_arg = 97, + area_life = 2, area_name = "ZA_NR" + }, { + area_arg = 98, + area_life = 2, + area_name = "ZRK_NL" + }, { + area_arg = 99, + area_life = 2, + area_name = "ZRK_BR" }, { area_arg = 100, - area_life = 30, - area_name = "ZA_BR" + area_life = 2, + area_name = "ZRK_BL" }, { area_arg = 101, - area_life = 30, + area_life = 2, area_name = "ZA_BL" }, { area_arg = 102, - area_life = 30, - area_name = "NADSTROYKA_NR" - }, { - area_arg = 103, - area_life = 30, - area_name = "NADSTROYKA_BL" - }, { - area_arg = 104, - area_life = 30, - area_name = "NADSTROYKA_NL" - }, { - area_arg = 105, - area_life = 30, - area_name = "ZRK_BR" + area_life = 2, + area_name = "ZA_BR" }, { area_arg = 109, area_life = 50, - area_name = "LIFT_01" + area_name = "ELEVATOR_01" }, { area_arg = 110, area_life = 50, - area_name = "LIFT_02" + area_name = "ELEVATOR_02" }, { area_arg = 111, area_life = 50, - area_name = "LIFT_03" + area_name = "ELEVATOR_03" }, { area_arg = 112, area_life = 50, - area_name = "LIFT_04" + area_name = "ELEVATOR_04" + }, { + area_life = 2, + area_name = "Rad_74_4" + }, { + area_life = 2, + area_name = "Rad_74_3" + }, { + area_life = 2, + area_name = "Rad_74_11" + }, { + area_life = 2, + area_name = "Rad_74_13" } }, - DeckLevel = 19.06, - DetectionRange = 30000, + DeckLevel = 20.1494, + DetectionRange = 50000, DisplayName = "CVN-74 John C. Stennis", DisplayNameShort = "CVN-74", Elevators = { { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 10, 8.45, 33 }, 1 }, { { 10, 8.45, 4 }, 1 }, { { 0, 8.45, -10 }, 1 } }, + Points = { { { 23.5, 8.45, 34 }, 1 }, { { 23.5, 8.45, 0 }, 1 }, { { 15, 8.45, -9 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 21, 8.45, 33 }, 1 }, { { 15, 8.45, 0 }, 1 }, { { 23, 8.45, -10 }, 1 } }, + Points = { { { 35, 8.45, 34 }, 1 }, { { 30, 8.45, 20 }, 1 }, { { 33, 8.45, 0 }, 1 }, { { 40, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 2, - ElevatorType = 0, - Points = { { { -34, 8.45, 33 }, 1 }, { { -34, 8.45, 0 }, 1 }, { { -44, 8.45, -5 }, 1 } }, + ElevatorType = 1, + Points = { { { -25, 8.45, 33 }, 1 }, { { -25, 8.45, 0 }, 1 }, { { -44, 8.45, -9 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 2, - ElevatorType = 0, - Points = { { { -22, 8.45, 33 }, 1 }, { { -29, 8.45, 0 }, 1 }, { { -12, 8.45, -5 }, 1 } }, + ElevatorType = 1, + Points = { { { -13, 8.45, 33 }, 1 }, { { -26, 8.45, 10 }, 1 }, { { -20, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 3, - ElevatorType = 0, - Points = { { { -103.5, 8.45, 32.7 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, + ElevatorType = 1, + Points = { { { -103.5, 8.45, 34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -112, 8.45, -7 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 3, - ElevatorType = 0, - Points = { { { -91.7, 8.45, 32.5 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + ElevatorType = 1, + Points = { { { -92, 8.45, 34 }, 1 }, { { -96.7, 8.45, 20 }, 1 }, { { -93.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -103.5, 8.45, 32.7 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, + Points = { { { -96, 8.45, -34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -91.7, 8.45, 32.5 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + Points = { { { -108, 8.45, -34 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, TerminalIdx = 2 }, ElevatorsNumber = 8 @@ -280,28 +307,28 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Gamma_max = 1, Height = 57.8, HelicopterSpawnTerminal = { { - Points = { { { 135, 19.06, 2 }, 0 } }, + Points = { { { 147, 20.1494, -0.18 }, 0 } }, TerminalIdx = 1 }, { - Points = { { { 100, 19.06, -8 }, 0 } }, + Points = { { { 113, 20.1494, -10.3 }, 0 } }, TerminalIdx = 2 }, { - Points = { { { 49, 19.06, -30 }, 0 } }, + Points = { { { 55, 20.1494, -31.45 }, 0 } }, TerminalIdx = 3 }, { - Points = { { { 21.8, 19.06, -26 }, 0 } }, + Points = { { { 20.6, 20.1494, -28.75 }, 0 } }, TerminalIdx = 4 }, { - Points = { { { -2, 19.06, -26 }, 0 } }, + Points = { { { -8.9, 20.1494, -28.75 }, 0 } }, TerminalIdx = 5 }, { - Points = { { { -29.5, 19.06, -26 }, 0 } }, + Points = { { { -39.7, 20.1494, -28.75 }, 0 } }, TerminalIdx = 6 }, { - Points = { { { -52, 19.06, -26 }, 0 } }, + Points = { { { -100.6, 20.1494, -31 }, 0 } }, TerminalIdx = 7 }, { - Points = { { { -97, 19.06, -27.7 }, 0 } }, + Points = { { { -94.8, 20.1494, 32.2 }, 0 } }, TerminalIdx = 8 }, TerminalNumber = 8 @@ -333,7 +360,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { RCS = 2000000, R_min = 665.8, Rate = 5500, - RunWays = { { { -44.54, 19.06, -10.49 }, 350.8641, 240, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { 45.643, 19.06, 14.893 }, 355.9, 111.3, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { 42.181, 19.06, -3.726 }, 358.36, 114.7, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { -46.41, 19.06, -18.988 }, 355.7, 115.3, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { -62.651, 19.06, -30.17 }, 0, 127.7, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, + RunWays = { { { -45, 20.1494, -10.49 }, 350.8641, 240, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { 59.954, 20.1494, 18.02 }, 354.3, 107.8, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { 58.8, 20.1494, -3.752 }, 358, 108.8, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { -37.374, 20.1494, -20.162 }, 355.002, 112, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { -56.176, 20.1494, -32.9 }, 359.957, 130, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, RunwaysNumber = 5 }, Sensors = { @@ -345,42 +372,60 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { TACAN_position = { -55, 55, 29 }, Tail_Width = 22, TaxiForTORoutes = { { - Points = { { { 18, 19.06, 6.5 }, 1, 20 }, { { 12, 19.06, 0 }, 1 }, { { 5, 19.06, -4 }, 1 }, { { 13, 19.06, -10 }, 1 }, { { 20, 19.06, 8 }, 2 }, { { 41, 19.06, 15.4 }, 1 }, { { 42.177, 19.06, 15.193 }, 1 } }, + Points = { { { 24.5, 20.1494, 9.5 }, 1, 20 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { - Points = { { { 4, 19.06, 8 }, 1, 20 }, { { -2.7, 19.06, 1.5 }, 1 }, { { -10, 19.06, -4 }, 2 }, { { 9, 19.06, -8 }, 1 }, { { 20, 19.06, -2.3 }, 1 }, { { 38.475, 19.06, -3.53 }, 1 } }, + Points = { { { 7.6, 20.1494, 10.5 }, 1, 20 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 2 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { -11, 19.06, 10 }, 1, 20 }, { { -23, 19.06, -4 }, 1 }, { { -75, 19.06, -1.5 }, 3 }, { { -65, 19.06, -16 }, 2 }, { { -55, 19.06, -18.2 }, 2 }, { { -50.06, 19.06, -18.57 }, 1 } }, + Points = { { { -9.9, 20.1494, 10.8 }, 1, 20 }, { { -18.5, 20.1494, -1 }, 1 }, { { -62, 20.1494, -1.5 }, 3 }, { { -67, 20.1494, -17 }, 2 }, { { -55, 20.1494, -18.8 }, 1 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -31, 19.06, 12 }, 3, 20 }, { { -44, 19.06, 4 }, 3 }, { { -91, 19.06, -4.7 }, 2 }, { { -85, 19.06, -18 }, 2 }, { { -77, 19.06, -27.67 }, 2 }, { { -72.3, 19.06, -29.9 }, 1 }, { { -66, 19.06, -30.28 }, 1 } }, + Points = { { { -26, 20.1494, 12 }, 3, 20 }, { { -39, 20.1494, 4 }, 3 }, { { -81, 20.1494, -2.7 }, 2 }, { { -83, 20.1494, -20 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { - Points = { { { -22, 19.06, 31 }, 2, 20 }, { { -22, 19.06, 9 }, 2 }, { { 20, 19.06, 8 }, 2 }, { { 41, 19.06, 15.4 }, 2 }, { { 42.177, 19.06, 15.193 }, 1 } }, + Points = { { { -11, 20.1494, 34 }, 2 }, { { -11, 20.1494, 8 }, 2 }, { { 20, 20.1494, 8 }, 2 }, { { 39, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { - Points = { { { -34, 19.06, 31 }, 1 }, { { -34, 19.06, 10 }, 2 }, { { -10, 19.06, -3.8 }, 2 }, { { 38.475, 19.06, -3.53 }, 1 } }, + Points = { { { -23, 20.1494, 34 }, 1 }, { { -23, 20.1494, 11 }, 2 }, { { 7, 20.1494, 3 }, 2 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { -95, 19.06, -32 }, 1 }, { { -95, 19.06, -15 }, 2 }, { { -75, 19.06, -15.5 }, 2 }, { { -65, 19.06, -16 }, 2 }, { { -53, 19.06, -18.9 }, 2 }, { { -50.06, 19.06, -18.57 }, 1 } }, + Points = { { { -96, 20.1494, -34 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -107, 19.06, -32 }, 1 }, { { -107, 19.06, -15 }, 2 }, { { -95, 19.06, -15 }, 2 }, { { -79, 19.06, -27.67 }, 2 }, { { -72.3, 19.06, -29.9 }, 1 }, { { -66, 19.06, -30.28 }, 1 } }, + Points = { { { -108, 20.1494, -34 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { - Points = { { { -91.7, 19.06, 31 }, 1 }, { { -91.7, 19.06, 12.5 }, 2 }, { { -40, 19.06, -5.2 }, 3 }, { { -25, 19.06, 8 }, 3 }, { { 15, 19.06, 8 }, 3 }, { { 41, 19.06, 15.4 }, 2 }, { { 42.177, 19.06, 15.193 }, 1 } }, + Points = { { { -90, 20.1494, 34 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 22, 20.1494, 8 }, 2 }, { { 40, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + RunwayIdx = 1 + }, { + Points = { { { -102.5, 20.1494, 34 }, 1 }, { { -102.5, 20.1494, 12.7 }, 2 }, { { -60, 20.1494, 8 }, 3 }, { { -10, 20.1494, 3.8 }, 3 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, + RunwayIdx = 2 + }, { + Points = { { { 35, 20.1494, 34 }, 1 }, { { 34.5, 20.1494, 24 }, 1 }, { { 24, 20.1494, 9.5 }, 1 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { - Points = { { { -103.5, 19.06, 31 }, 1 }, { { -103.5, 19.06, 12.7 }, 2 }, { { -60, 19.06, -4.2 }, 3 }, { { -10, 19.06, -3.8 }, 3 }, { { 38.475, 19.06, -3.53 }, 1 } }, + Points = { { { 23, 20.1494, 34 }, 1 }, { { 23, 20.1494, 23 }, 1 }, { { 8.6, 20.1494, 10.5 }, 1 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, + RunwayIdx = 2 + }, { + Points = { { { 6, 20.1494, 32.5 }, 1 }, { { 6, 20.1494, 10.5 }, 1 }, { { 13, 20.1494, 0 }, 1 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 + }, { + Points = { { { -118, 20.1494, 28 }, 1 }, { { -118, 20.1494, 16 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 20, 20.1494, 8 }, 2 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + RunwayIdx = 1 + }, { + Points = { { { -129.2, 20.1494, 26.2 }, 1 }, { { -121, 20.1494, 10 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, + RunwayIdx = 3 + }, { + Points = { { { -141.15, 20.1494, 24.2 }, 1 }, { { -137, 20.1494, 21.2 }, 1 }, { { -130, 20.1494, 4 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, + RunwayIdx = 4 }, - RoutesForTONumber = 10 + RoutesForTONumber = 16 }, - TaxiRoutes = { { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 5 }, 3 }, { { -10, 19.06, 7 }, 3 }, { { -105, 19.06, 24 }, 3 }, { { -125, 19.06, 14.5 }, 2 }, { { -140, 19.06, 22.5 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 5 }, 3 }, { { -10, 19.06, 7 }, 3 }, { { -105, 19.06, 24 }, 3 }, { { -125, 19.06, 11 }, 2 }, { { -126, 19.06, 25 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 5 }, 3 }, { { -10, 19.06, 7 }, 3 }, { { -105, 19.06, 24 }, 3 }, { { -115, 19.06, 11 }, 2 }, { { -115, 19.06, 26 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 5 }, 3 }, { { -10, 19.06, 7 }, 3 }, { { -95, 19.06, 23 }, 3 }, { { -105.5, 19.06, 14 }, 2 }, { { -103.5, 19.06, 32.7 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 5 }, 3 }, { { -10, 19.06, 7 }, 3 }, { { -85, 19.06, 23 }, 3 }, { { -93.5, 19.06, 14 }, 2 }, { { -91.7, 19.06, 32.5 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 5 }, 3 }, { { -10, 19.06, 7 }, 3 }, { { -70, 19.06, 19 }, 3 }, { { -77, 19.06, 10 }, 2 }, { { -77, 19.06, 22.5 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 5 }, 3 }, { { -10, 19.06, 7 }, 3 }, { { -55, 19.06, 15 }, 3 }, { { -71, 19.06, 5 }, 2 }, { { -66, 19.06, 17.5 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 5 }, 3 }, { { -10, 19.06, 7 }, 3 }, { { -45, 19.06, 14 }, 3 }, { { -60, 19.06, 5 }, 2 }, { { -56, 19.06, 17 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 5 }, 3 }, { { -10, 19.06, 7 }, 3 }, { { -40, 19.06, 12 }, 3 }, { { -50, 19.06, 2 }, 2 }, { { -46, 19.06, 16 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 5 }, 3 }, { { -10, 19.06, 7 }, 3 }, { { -20, 19.06, 14 }, 3 }, { { -34, 19.06, 10 }, 2 }, { { -34, 19.06, 33 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 20, 19.06, 10 }, 2 }, { { -21, 19.06, 10 }, 2 }, { { -23, 19.06, -2 }, 2 }, { { -22, 19.06, 33 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 5 }, 3 }, { { -6, 19.06, 24 }, 3 }, { { -6, 19.06, 10 }, 2 }, { { -6, 19.06, 32.5 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 25, 19.06, 10 }, 3 }, { { 35, 19.06, 27 }, 2 }, { { 52, 19.06, 31 }, -2 } }, { { { 5, 19.06, -17.8 }, 3 }, { { 10, 19.06, 10 }, 3 }, { { 20, 19.06, 25 }, 2 }, { { 30, 19.06, 21 }, 2 }, { { 35, 19.06, 32.5 }, -2 } }, { { { 15, 19.06, -19.3 }, 3 }, { { 30, 19.06, 10 }, 2 }, { { 10, 19.06, 0 }, 2 }, { { 10, 19.06, 33 }, -2, 180 } }, { { { 15, 19.06, -19.3 }, 3 }, { { 40, 19.06, 10 }, 2 }, { { 22, 19.06, -4 }, 2 }, { { 21, 19.06, 33 }, -2, 180 } }, + TaxiRoutes = { { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -125, 20.1494, 17.5 }, 2 }, { { -143, 20.1494, 26 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -124, 20.1494, 15 }, 2 }, { { -130, 20.1494, 27.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 4 }, { { -118, 20.1494, 11 }, 2 }, { { -118, 20.1494, 29 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 23 }, 6 }, { { -106, 20.1494, 15 }, 2 }, { { -103.5, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -85, 20.1494, 23 }, 6 }, { { -95, 20.1494, 15 }, 2 }, { { -92, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -70, 20.1494, 19 }, 6 }, { { -79, 20.1494, 10 }, 2 }, { { -77, 20.1494, 26.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 15 }, 4 }, { { -66, 20.1494, 5 }, 2 }, { { -63, 20.1494, 17.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -45, 20.1494, 14 }, 4 }, { { -56, 20.1494, 5 }, 2 }, { { -52, 20.1494, 17 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -40, 20.1494, 12 }, 4 }, { { -45, 20.1494, 2 }, 2 }, { { -41, 20.1494, 16 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 25, 20.1494, 0 }, 5 }, { { 6, 20.1494, 24 }, 3 }, { { 6, 20.1494, 10 }, 2 }, { { 6, 20.1494, 32.5 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 4 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 34 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 3 }, { { 41, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 35 }, -2 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -20, 20.1494, 14 }, 3 }, { { -25, 20.1494, 10 }, 2 }, { { -25, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 20, 20.1494, 10 }, 5 }, { { -21, 20.1494, 10 }, 2 }, { { -14, 20.1494, -2 }, 2 }, { { -13, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 34, 20.1494, 11 }, 2 }, { { 20, 20.1494, 0 }, 2 }, { { 23.5, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 40, 20.1494, -3 }, 2 }, { { 40, 20.1494, 10 }, 2 }, { { 34, 20.1494, -4 }, 2 }, { { 35, 20.1494, 34 }, -2, 180 } }, RoutesNumber = 16 }, - ThreatRange = 15000, + ThreatRange = 25000, WS = { { LN = { { BR = { { @@ -414,6 +459,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { } }, angles = { { 0.17453292519943, 0, 0.1221730476396, 1.4835298641952 }, { 0, -2.6179938779915, -0.087266462599716, 1.4835298641952 }, { -2.6179938779915, 0.17453292519943, 0.33161255787892, 1.4835298641952 } }, angles_mech = { { 3.1415926535898, -3.1415926535898, -0.087266462599716, 1.4835298641952 } }, + area = "ZA_NR", center = "CENTER_TOWER_ZA_FR", drawArgument1 = 17, drawArgument2 = 18, @@ -423,7 +469,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, { LN = { { BR = { { - connector_name = "POINT_GUN_ZA_BR", + connector_name = "POINT_GUN_ZA_BL", pos = {} } }, PL = { { @@ -447,12 +493,13 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, { shell_name = {} } }, - fireAnimationArgument = 120, + createMuzzleFlashEffect = true, + fireAnimationArgument = 121, sensor = {} } }, - angles = { { -1.3264502315157, -1.3962634015955, -0.087266462599716, 0.4014257279587 }, { -1.3962634015955, 1.7453292519943, -0.087266462599716, 1.4835298641952 } }, - angles_mech = { { 3.1415926535898, -3.1415926535898, -0.087266462599716, 1.4835298641952 } }, - center = "CENTER_TOWER_ZA_BR", + angles = { { -2.3561944901923, -2.4434609527921, -0.087266462599716, 0.78539816339745 }, { -2.4434609527921, 0.78539816339745, -0.087266462599716, 1.4835298641952 } }, + area = "ZA_BL", + center = "CENTER_TOWER_ZA_BL", drawArgument1 = 19, drawArgument2 = 20, pidY = {}, @@ -461,7 +508,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, { LN = { { BR = { { - connector_name = "POINT_GUN_ZA_BL", + connector_name = "POINT_GUN_ZA_BR_74", pos = {} } }, PL = { { @@ -485,12 +532,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, { shell_name = {} } }, - fireAnimationArgument = 121, + fireAnimationArgument = 120, sensor = {} } }, angles = { { -2.3561944901923, -2.4434609527921, -0.087266462599716, 0.78539816339745 }, { -2.4434609527921, 0.78539816339745, -0.087266462599716, 1.4835298641952 } }, angles_mech = { { 3.1415926535898, -3.1415926535898, -0.087266462599716, 1.4835298641952 } }, - center = "CENTER_TOWER_ZA_BL", + center = "CENTER_TOWER_ZA_BR_74", drawArgument1 = 21, drawArgument2 = 22, pidY = {}, @@ -511,10 +558,10 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { type = 102 } }, angles = { { 3.1415926535898, -1.5707963267949, -1.5707963267949, 1.3962634015955 } }, - area = "RUBKA", - center = "CENTER_RADAR_9", - drawArgument1 = 6, - drawArgument2 = 7, + area = "Rad_74_11", + center = "CENTER_RADAR_74_03", + drawArgument1 = 8, + drawArgument2 = 9, omegaY = 1, omegaZ = 1, pidY = { @@ -534,10 +581,10 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { LN = { { frequencyRange = {} } }, - angles = { { 1.5707963267949, -2.9670597283904, -1.5707963267949, 1.3962634015955 }, { -2.9670597283904, 2.9670597283904, -1.5707963267949, 1.3962634015955 } }, - center = "CENTER_RADAR_10", - drawArgument1 = 8, - drawArgument2 = 9, + angles = { { 1.5707963267949, -3.1415926535898, -1.5707963267949, 1.3962634015955 } }, + center = "CENTER_RADAR_74_01", + drawArgument1 = 6, + drawArgument2 = 7, pidY = {}, pidZ = {}, reference_angle_Y = -1.5707963267949 @@ -546,10 +593,10 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { frequencyRange = {} } }, angles = { { -0.087266462599716, 2.0943951023932, -1.5707963267949, 1.3962634015955 } }, - area = "TOWER", - center = "CENTER_RADAR_11", - drawArgument1 = 10, - drawArgument2 = 11, + area = "Rad_74_13", + center = "CENTER_RADAR_74_11", + drawArgument1 = 12, + drawArgument2 = 13, pidY = {}, pidZ = {}, reference_angle_Y = -1.5707963267949 @@ -560,8 +607,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { angles = { { -2.9670597283904, 0.34906585039887, -1.5707963267949, 1.3962634015955 } }, area = "TOWER", center = "CENTER_RADAR_12", - drawArgument1 = 316, - drawArgument2 = 317, + drawArgument1 = 10, + drawArgument2 = 11, pidY = {}, pidZ = {}, reference_angle_Y = 1.5707963267949 @@ -600,7 +647,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { } }, angles = { { 3.1415926535898, 0.69813170079773, 0.78539816339745, 1.3962634015955 }, { 0.69813170079773, -2.9670597283904, -0.087266462599716, 1.3962634015955 } }, angles_mech = { { 3.1415926535898, -3.1415926535898, -0.087266462599716, 1.4835298641952 } }, - area = "NADSTROYKA_NR", + area = "ZRK_NR", center = "CENTER_TOWER_ZRK_FR", drawArgument1 = 49, drawArgument2 = 50, @@ -640,13 +687,169 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { } }, angles = { { -2.8797932657906, 0.78539816339745, -0.087266462599716, 1.3962634015955 }, { 0.78539816339745, 0, 0.17453292519943, 1.3962634015955 } }, angles_mech = { { 3.1415926535898, -3.1415926535898, -0.087266462599716, 1.6580627893946 } }, - area = "NADSTROYKA_BL", + area = "ZRK_BL", center = "CENTER_TOWER_ZRK_BL", drawArgument1 = 51, drawArgument2 = 52, reference_angle_Y = 1.5707963267949 + }, { + LN = { { + BR = { { + connector_name = "Rocket_Point_17", + drawArgument = 177 + }, { + connector_name = "Rocket_Point_18", + drawArgument = 178 + }, { + connector_name = "Rocket_Point_19", + drawArgument = 179 + }, { + connector_name = "Rocket_Point_20", + drawArgument = 180 + }, { + connector_name = "Rocket_Point_21", + drawArgument = 181 + }, { + connector_name = "Rocket_Point_22", + drawArgument = 182 + }, { + connector_name = "Rocket_Point_23", + drawArgument = 183 + }, { + connector_name = "Rocket_Point_24", + drawArgument = 184 + }, { + connector_name = "Rocket_Point_25", + drawArgument = 185 + }, { + connector_name = "Rocket_Point_26", + drawArgument = 186 + }, { + connector_name = "Rocket_Point_27", + drawArgument = 187 + }, { + connector_name = "Rocket_Point_28", + drawArgument = 188 + }, { + connector_name = "Rocket_Point_29", + drawArgument = 189 + }, { + connector_name = "Rocket_Point_30", + drawArgument = 190 + }, { + connector_name = "Rocket_Point_31", + drawArgument = 191 + }, { + connector_name = "Rocket_Point_32", + drawArgument = 192 + }, { + connector_name = "Rocket_Point_33", + drawArgument = 193 + }, { + connector_name = "Rocket_Point_34", + drawArgument = 194 + }, { + connector_name = "Rocket_Point_35", + drawArgument = 195 + }, { + connector_name = "Rocket_Point_36", + drawArgument = 196 + }, { + connector_name = "Rocket_Point_37", + drawArgument = 197 + } }, + PL = { { + type_ammunition = {} + } }, + sensor = {} + } }, + angles = { { 0.27925268031909, -0.17453292519943, 0.10471975511966, 1.3962634015955 }, { 2.5830872929516, 0.27925268031909, -0.087266462599716, 1.3962634015955 }, { 3.1415926535898, 2.5830872929516, 0.31415926535898, 1.3962634015955 } }, + area = "ZRK_NL", + center = "CENTER_TOWER_ZRK_FL", + drawArgument1 = 23, + drawArgument2 = 24, + reference_angle_Y = 1.5707963267949, + reference_angle_Z = 0.5235987755983 + }, { + LN = { { + BR = { { + connector_name = "Rocket_Point_38", + drawArgument = 198 + }, { + connector_name = "Rocket_Point_39", + drawArgument = 199 + }, { + connector_name = "Rocket_Point_40", + drawArgument = 200 + }, { + connector_name = "Rocket_Point_41", + drawArgument = 201 + }, { + connector_name = "Rocket_Point_42", + drawArgument = 202 + }, { + connector_name = "Rocket_Point_43", + drawArgument = 203 + }, { + connector_name = "Rocket_Point_44", + drawArgument = 204 + }, { + connector_name = "Rocket_Point_45", + drawArgument = 205 + }, { + connector_name = "Rocket_Point_46", + drawArgument = 206 + }, { + connector_name = "Rocket_Point_47", + drawArgument = 207 + }, { + connector_name = "Rocket_Point_48", + drawArgument = 208 + }, { + connector_name = "Rocket_Point_49", + drawArgument = 209 + }, { + connector_name = "Rocket_Point_50", + drawArgument = 210 + }, { + connector_name = "Rocket_Point_51", + drawArgument = 211 + }, { + connector_name = "Rocket_Point_52", + drawArgument = 212 + }, { + connector_name = "Rocket_Point_53", + drawArgument = 213 + }, { + connector_name = "Rocket_Point_54", + drawArgument = 214 + }, { + connector_name = "Rocket_Point_55", + drawArgument = 215 + }, { + connector_name = "Rocket_Point_56", + drawArgument = 216 + }, { + connector_name = "Rocket_Point_57", + drawArgument = 217 + }, { + connector_name = "Rocket_Point_58", + drawArgument = 218 + } }, + PL = { { + type_ammunition = {} + } }, + sensor = {} + } }, + angles = { { 3.1415926535898, -0.78539816339745, 0.78539816339745, 1.3962634015955 }, { -0.78539816339745, -3.1415926535898, -0.087266462599716, 1.3962634015955 } }, + area = "ZRK_BR", + center = "CENTER_TOWER_ZRK_BR", + drawArgument1 = 25, + drawArgument2 = 26, + reference_angle_Y = -1.5707963267949, + reference_angle_Z = 0.5235987755983 }, - maxTargetDetectionRange = 30000, + maxTargetDetectionRange = 60000, radar_type = 104, searchRadarMaxElevation = 0.87266462599716 }, @@ -654,17 +857,23 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Width = 96, X_nose = 141, X_tail = -140, - _file = "./CoreMods/tech/USS John C Stennis/entry.lua", - _origin = "USS John C Stennis", - airFindDist = 30000, - airWeaponDist = 15000, + _file = "./CoreMods/tech/USS_Nimitz/Database/db_ships.lua", + _origin = "USS_Nimitz", + airFindDist = 50000, + airWeaponDist = 25000, animation_arguments = { - arresting_wires = { 400, 401, 402, 403 }, + arresting_wires = { 141, 142, 143, 144 }, blast_fences = {}, + bubbles = { 138, 139 }, catapult_shuttles = { 145, 146, 147, 148 }, elevators = { 57, 58, 59, 60 }, elevators_doors = { 47, 48, 53, 54 }, - landing_strip_illumination = 150 + elevators_fences_bottom = { 28, 30, 32, 34 }, + elevators_fences_top = { 27, 29, 31, 33 }, + holdback_bars_angle = { 808, 809, 810, 811 }, + holdback_bars_color = { 812, 813, 814, 815 }, + holdback_bars_deck_cleat = { 804, 805, 806, 807 }, + holdback_bars_pos = { 817, 818, 819, 820 } }, armour_scheme = { hull_azimuth = { {} }, @@ -673,12 +882,82 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { turret_elevation = { {} } }, attribute = { 3, 12, 12, "Redacted", "Aircraft Carriers", "Arresting Gear", "catapult", "RADAR_BAND1_FOR_ARM", "RADAR_BAND2_FOR_ARM", "Datalink", "Link4", "ACLS", "AircraftCarrier", "AircraftCarrier With Catapult", "Armed Ship", "AircraftCarrier With Arresting Gear", "Naval", "All", "Ships", "Armed ships", "Armed Air Defence", "HeavyArmoredUnits", "Heavy armed ships" }, - carrierIlluminationStates = { { { 69, 0, 1 } }, { { 801, 0, 1 } }, { { 150, 0, 1 } } }, + carrierIlluminationStates = { { { 69, 0, 1 }, { 795, 0, 1 }, { 797, 0, 1 }, { 801, 0, 1 } }, { { 790, 0, 1 }, { 791, 0, 1 }, { 792, 0, 1 }, { 793, 0, 1 }, { 794, 0, 1 }, { 795, 0, 1 }, { 796, 0, 1 }, { 797, 0, 1 }, { 801, 0, 1 } }, { { 150, 0, 1 }, { 152, 0, 1, 3, true }, { 790, 0, 0 }, { 792, 0, 1 }, { 795, 0, 0 }, { 797, 0, 0 }, { 801, 1, 0 } } }, chassis = {}, distFindObstacles = 1048.7, economy_distance = 74080000, economy_velocity = 15.4333, enablePlayerCanDrive = false, + encyclopediaAnimation = { + args = { + [17] = -0.5, + [19] = 0.5, + [23] = 0.5, + [24] = 0.25, + [25] = -0.5, + [26] = 0.25, + [49] = -0.5, + [51] = 0.5, + [153] = 1, + [154] = 1, + [155] = 1, + [156] = 1, + [157] = 1, + [158] = 1, + [159] = 1, + [160] = 1, + [161] = 1, + [162] = 1, + [163] = 1, + [164] = 1, + [165] = 1, + [166] = 1, + [167] = 1, + [168] = 1, + [177] = 1, + [178] = 1, + [179] = 1, + [180] = 1, + [181] = 1, + [182] = 1, + [183] = 1, + [184] = 1, + [185] = 1, + [186] = 1, + [187] = 1, + [188] = 1, + [189] = 1, + [190] = 1, + [191] = 1, + [192] = 1, + [193] = 1, + [194] = 1, + [195] = 1, + [196] = 1, + [197] = 1, + [198] = 1, + [199] = 1, + [200] = 1, + [201] = 1, + [202] = 1, + [203] = 1, + [204] = 1, + [205] = 1, + [206] = 1, + [207] = 1, + [208] = 1, + [209] = 1, + [210] = 1, + [211] = 1, + [212] = 1, + [213] = 1, + [214] = 1, + [215] = 1, + [216] = 1, + [217] = 1, + [218] = 1 + } + }, life = 7300, mapclasskey = "P0091000065", mass = 72916000, @@ -689,8 +968,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shape_table_data = { { classname = "lLandShip", desrt = "", - file = "cvn74", - name = "cvn74", + file = "nimitz_cvn_74", + name = "nimitz_cvn_74", positioning = "BYNORMAL", username = "Stennis" }, { @@ -704,7 +983,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { tags = { "Carrier" }, type = "Stennis", visual = { - shape = "cvn74", + shape = "nimitz_cvn_74", shape_dstr = "" } } \ No newline at end of file diff --git a/_G/db/Units/Ships/Ship/TICONDEROG.lua b/_G/db/Units/Ships/Ship/TICONDEROG.lua index a3ffd2e7..7863bee8 100644 --- a/_G/db/Units/Ships/Ship/TICONDEROG.lua +++ b/_G/db/Units/Ships/Ship/TICONDEROG.lua @@ -414,7 +414,21 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, { connector_name = "Rocket_Point_126", drawArgument = 156 - }, { + } }, + PL = { { + ammo_capacity = 4, + type_ammunition = {} + } }, + max_number_of_missiles_channels = 4, + sensor = {} + } }, + angles = { { 3.1415926535898, 0, -1.5707963267949, 1.5707963267949 } }, + area = "KORMA_TOP", + canSetTacticalDir = true, + pos = { -83.594, 7.002, -4.54 } + }, { + LN = { { + BR = { { connector_name = "Rocket_Point_127", drawArgument = 157 }, { @@ -428,14 +442,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { drawArgument = 160 } }, PL = { { - ammo_capacity = 8, type_ammunition = {} } }, sensor = {} } }, - angles = { {} }, - area = "KORMA_TOP", - pos = { -83.594, 7.002, -4.54 } + angles = { { 0, -3.1415926535898, -1.5707963267949, 1.5707963267949 } }, + pos = {} }, { LN = { { ECM_K = 0.5, @@ -853,7 +865,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { ammo_capacity = 45, type_ammunition = {} } }, - depends_on_unit = <1>{ { { "self", 11 } }, { { "self", 12 } }, { { "self", 13 } }, { { "self", 14 } }, { { "self", 15 } }, { { "self", 16 } }, { { "self", 17 } }, { { "self", 18 } }, { { "self", 19 } } }, + depends_on_unit = <1>{ { { "self", 12 } }, { { "self", 13 } }, { { "self", 14 } }, { { "self", 15 } }, { { "self", 16 } }, { { "self", 17 } }, { { "self", 18 } }, { { "self", 19 } }, { { "self", 20 } } }, sensor = {} } }, angles = { {} }, diff --git a/_G/launcher/KORD_12_7_MI24_L.lua b/_G/launcher/KORD_12_7_MI24_L.lua new file mode 100644 index 00000000..e5d04bd2 --- /dev/null +++ b/_G/launcher/KORD_12_7_MI24_L.lua @@ -0,0 +1,215 @@ +_G["launcher"]["KORD_12_7_MI24_L"] = { + CLSID = "KORD_12_7_MI24_L", + Cx_pil = 0.001220703125, + Elements = { { + Position = { 0, 0, 0 }, + ShapeName = "mi-24p_kord1" + } }, + Picture = "M60.png", + PictureBlendColor = "0xffffffff", + Weight = 95, + _file = "./CoreMods/aircraft/Mi-24P/Mi-24P.lua", + _origin = "Mi-24P AI by Eagle Dynamics", + attribute = { 4, 15, 46, "Redacted" }, + category = 6, + control_container_data = { + arg_c_num = 0, + arg_x = 0, + arg_x_ch_range = { 0, 1 }, + arg_y = 423, + arg_y_ch_range = { 0.225, -0.218 }, + arg_z = 424, + arg_z_ch_range = { -0.444, 0.111 }, + init_c = -0.6, + init_state = true, + rate_x = 0, + rate_y = 60, + rate_z = 60, + rot_x = { 0, 0 }, + rot_y = { -40, 40 }, + rot_z = { -40, 10 } + }, + displayName = "Kord 12.7mm HMG", + gun_mounts = { { + aft_gun_mount = false, + azimuth_initial = 0, + barrel_circular_error = 0.0007, + display_name = "KORD-12.7", + drop_cartridge = 204, + effective_fire_distance = 1300, + effects = { { + arg = 46, + attenuation = 2, + duration = 0.05, + light_pos = { 0.5, 0, 0 }, + name = "FireEffect" + }, { + name = "SmokeEffect" + }, { + arg_v = 46, + full_load = 600, + name = "FeedBeltBox" + } }, + ejector_dir = { 3, 0, 0 }, + ejector_pos = { -1.2, 0, 0.05 }, + elevation_initial = 0, + gun = { + impulse_vec_rot = { + x = 0, + y = 0, + z = 0 + }, + max_burst_length = 7, + rates = { 600 }, + recoil_coeff = 0.65, + trigger = { + name = "GunTrigger" + } + }, + muzzle_pos = { 3.11, -1.2, 0 }, + muzzle_pos_connector = "POINT_MGUN", + short_name = "KORD_12_7", + supply = { + count = 600, + get_mass = , + get_mass_ = , + mixes = { { 1, 2 } }, + reload_arg = 500, + reload_every = 50, + reload_time = 7, + shells = { { + AP_cap_caliber = 12.7, + Da0 = 0.00085, + Da1 = 0, + Dv0 = 0.008, + _unique_resource_name = "weapons.shells.YakB_12_7_T", + caliber = 12.7, + cartridge = 0, + cartridge_mass = 0, + charTime = 0, + cumulative_mass = 0, + cumulative_thickness = 0, + cx = { 0.5, 0.61, 0.8, 0.27, 1.9 }, + damage_factor = 639, + display_name = "12.7mm", + explosive = 0, + full_scale_time = -1, + j = 0, + k1 = 1.2e-08, + l = 0, + life_time = 7, + mass = 0.048, + model_name = "tracer_bullet_green", + name = "YakB_12_7_T", + payload = 0, + piercing_mass = 0.048, + rebound_concrete = <1>{ + angle0 = 50, + angle100 = 75, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_ground = { + angle0 = 55, + angle100 = 73, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_object =
, + rebound_water = { + angle0 = 65, + angle100 = 83, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rotation_freq = 7, + round_mass = 0.154, + s = 0, + silent_self_destruction = false, + smoke_tail_life_time = -1, + subcalibre = false, + tracer_off = 4, + tracer_on = 0, + type_name = "shell", + v0 = 810, + visual_effect_correction = 0, + visual_effect_correction_rebound = 0.1 + }, { + AP_cap_caliber = 12.7, + Da0 = 0.00085, + Da1 = 0, + Dv0 = 0.008, + _unique_resource_name = "weapons.shells.YakB_12_7", + caliber = 12.7, + cartridge = 0, + cartridge_mass = 0, + charTime = 0, + cumulative_mass = 0, + cumulative_thickness = 0, + cx = { 0.5, 0.61, 0.8, 0.27, 1.9 }, + damage_factor = 639, + display_name = "12.7mm", + explosive = 0, + full_scale_time = -1, + j = 0, + k1 = 1.2e-08, + l = 0, + life_time = 7, + mass = 0.048, + model_name = "tracer_bullet_green", + name = "YakB_12_7", + payload = 0, + piercing_mass = 0.048, + rebound_concrete = <2>{ + angle0 = 50, + angle100 = 75, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_ground = { + angle0 = 55, + angle100 = 73, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_object =
, + rebound_water = { + angle0 = 65, + angle100 = 83, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rotation_freq = 7, + round_mass = 0.154, + s = 0, + silent_self_destruction = false, + smoke_tail_life_time = -1, + subcalibre = false, + tracer_off = -100, + tracer_on = 0, + type_name = "shell", + v0 = 810, + visual_effect_correction = 0, + visual_effect_correction_rebound = 0.1 + } } + }, + supply_position = { 0, 0, 0 }, + turret = { + name = "KORD_side_gun" + } + } }, + kind_of_shipping = 2, + name = "KORD_12_7_MI24_L", + shape_table_data = { { + file = "mi-24p_kord1", + index = "Redacted", + name = "mi-24p_kord1", + username = "MI24Gunner" + } } +} \ No newline at end of file diff --git a/_G/launcher/KORD_12_7_MI24.lua b/_G/launcher/KORD_12_7_MI24_R.lua similarity index 96% rename from _G/launcher/KORD_12_7_MI24.lua rename to _G/launcher/KORD_12_7_MI24_R.lua index a2dcf8a2..28742f2c 100644 --- a/_G/launcher/KORD_12_7_MI24.lua +++ b/_G/launcher/KORD_12_7_MI24_R.lua @@ -1,5 +1,5 @@ -_G["launcher"]["KORD_12_7_MI24"] = { - CLSID = "KORD_12_7_MI24", +_G["launcher"]["KORD_12_7_MI24_R"] = { + CLSID = "KORD_12_7_MI24_R", Cx_pil = 0.001220703125, Elements = { { Position = { 0, 0, 0 }, @@ -8,8 +8,8 @@ _G["launcher"]["KORD_12_7_MI24"] = { Picture = "M60.png", PictureBlendColor = "0xffffffff", Weight = 95, - _file = "./CoreMods/aircraft/AircraftWeaponPack/gunpods.lua", - _origin = "AircraftWeaponPack", + _file = "./CoreMods/aircraft/Mi-24P/Mi-24P.lua", + _origin = "Mi-24P AI by Eagle Dynamics", attribute = { 4, 15, 46, "Redacted" }, category = 6, control_container_data = { @@ -205,7 +205,7 @@ _G["launcher"]["KORD_12_7_MI24"] = { } } }, kind_of_shipping = 2, - name = "KORD_12_7_MI24", + name = "KORD_12_7_MI24_R", shape_table_data = { { file = "mi-24p_kord", index = "Redacted", diff --git a/_G/launcher/LAU-115_2LAU-127_AIM-120B.lua b/_G/launcher/LAU-115_2LAU-127_AIM-120B.lua index 52da9095..41b64abd 100644 --- a/_G/launcher/LAU-115_2LAU-127_AIM-120B.lua +++ b/_G/launcher/LAU-115_2LAU-127_AIM-120B.lua @@ -14,13 +14,13 @@ _G["launcher"]["LAU-115_2*LAU-127_AIM-120B"] = { } }, Picture = "us_AIM-120B.png", PictureBlendColor = "0xffffffff", - Weight = 457, + Weight = 460.7, Weight_Empty = 145, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "LAU-115 with 2 x LAU-127 AIM-120B AMRAAM - Active Rdr AAM", + displayName = "LAU-115 with 2 x LAU-127 AIM-120B AMRAAM - Active Radar AAM", name = "LAU-115_2*LAU-127_AIM-120B", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/LAU-115_2LAU-127_AIM-120C.lua b/_G/launcher/LAU-115_2LAU-127_AIM-120C.lua index 6093f657..55e7fef6 100644 --- a/_G/launcher/LAU-115_2LAU-127_AIM-120C.lua +++ b/_G/launcher/LAU-115_2LAU-127_AIM-120C.lua @@ -14,13 +14,13 @@ _G["launcher"]["LAU-115_2*LAU-127_AIM-120C"] = { } }, Picture = "us_AIM-120C.png", PictureBlendColor = "0xffffffff", - Weight = 468, + Weight = 467.96, Weight_Empty = 145, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "LAU-115 with 2 x LAU-127 AIM-120C-5 AMRAAM - Active Rdr AAM", + displayName = "LAU-115 with 2 x LAU-127 AIM-120C AMRAAM - Active Radar AAM", name = "LAU-115_2*LAU-127_AIM-120C", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/LAU3_HE151.lua b/_G/launcher/LAU3_HE151.lua index 9c1e034c..b51afbbb 100644 --- a/_G/launcher/LAU3_HE151.lua +++ b/_G/launcher/LAU3_HE151.lua @@ -64,7 +64,8 @@ _G["launcher"]["LAU3_HE151"] = { connector_name = "tube_19" } }, Picture = "LAU61.png", - Weight = 234, + Weight = 234.19, + Weight_Empty = 34.5, _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 7, 32, "Redacted" }, displayName = 'LAU-3 pod - 19 x 2.75" Hydra, UnGd Rkts M151, HE', diff --git a/_G/launcher/LAU3_HE5.lua b/_G/launcher/LAU3_HE5.lua index 53f466ed..1ae00dba 100644 --- a/_G/launcher/LAU3_HE5.lua +++ b/_G/launcher/LAU3_HE5.lua @@ -64,7 +64,8 @@ _G["launcher"]["LAU3_HE5"] = { connector_name = "tube_19" } }, Picture = "LAU61.png", - Weight = 234, + Weight = 201.89, + Weight_Empty = 34.5, _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 7, 32, "Redacted" }, displayName = 'LAU-3 pod - 19 x 2.75" Hydra, UnGd Rkts Mk5, HEAT', diff --git a/_G/launcher/LAU3_WP156.lua b/_G/launcher/LAU3_WP156.lua index e384ac2d..947455ad 100644 --- a/_G/launcher/LAU3_WP156.lua +++ b/_G/launcher/LAU3_WP156.lua @@ -64,7 +64,8 @@ _G["launcher"]["LAU3_WP156"] = { connector_name = "tube_19" } }, Picture = "LAU61.png", - Weight = 234, + Weight = 155.91, + Weight_Empty = 34.5, _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 7, 32, "Redacted" }, displayName = 'LAU-3 pod - 19 x 2.75" Hydra, UnGd Rkts M156, Wht Phos', diff --git a/_G/launcher/LAU3_WP1B.lua b/_G/launcher/LAU3_WP1B.lua index a8d42676..637d0021 100644 --- a/_G/launcher/LAU3_WP1B.lua +++ b/_G/launcher/LAU3_WP1B.lua @@ -64,7 +64,8 @@ _G["launcher"]["LAU3_WP1B"] = { connector_name = "tube_19" } }, Picture = "LAU61.png", - Weight = 234, + Weight = 207.59, + Weight_Empty = 34.5, _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 7, 32, "Redacted" }, displayName = 'LAU-3 pod - 19 x 2.75" Hydra, UnGd Rkts WTU-1/B, Practice', diff --git a/_G/launcher/LAU3_WP61.lua b/_G/launcher/LAU3_WP61.lua index e98860ef..e578d9a1 100644 --- a/_G/launcher/LAU3_WP61.lua +++ b/_G/launcher/LAU3_WP61.lua @@ -64,7 +64,8 @@ _G["launcher"]["LAU3_WP61"] = { connector_name = "tube_19" } }, Picture = "LAU61.png", - Weight = 234, + Weight = 207.59, + Weight_Empty = 34.5, _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 7, 32, "Redacted" }, displayName = 'LAU-3 pod - 19 x 2.75" Hydra, UnGd Rkts Mk61, Practice', diff --git a/_G/launcher/{57232979-8B0F-4db7-8D9A-55197E06B0F5}.lua b/_G/launcher/{57232979-8B0F-4db7-8D9A-55197E06B0F5}.lua index aa2c4005..11d77a78 100644 --- a/_G/launcher/{57232979-8B0F-4db7-8D9A-55197E06B0F5}.lua +++ b/_G/launcher/{57232979-8B0F-4db7-8D9A-55197E06B0F5}.lua @@ -3,14 +3,18 @@ _G["launcher"]["{57232979-8B0F-4db7-8D9A-55197E06B0F5}"] = { Count = 8, Cx_pil = 0.002, Elements = { { + IsAdapter = true, ShapeName = "9K114_Shturm" } }, NatoName = "AT-6", Picture = "apu8.png", - Weight = 422, + Weight = 457.2, Weight_Empty = 174, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, - displayName = "9M114 Shturm-V-8 (AT-6 Spiral) - ATGM, SACLOS", + category = 2, + displayName = "8 x 9M114 Shturm-V (AT-6 Spiral) - ATGM, SACLOS, HEAT", + kind_of_shipping = 0, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{9BCC2A2B-5708-4860-B1F1-053A18442067}.lua b/_G/launcher/{9BCC2A2B-5708-4860-B1F1-053A18442067}.lua index 10920b13..572c88a6 100644 --- a/_G/launcher/{9BCC2A2B-5708-4860-B1F1-053A18442067}.lua +++ b/_G/launcher/{9BCC2A2B-5708-4860-B1F1-053A18442067}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{9BCC2A2B-5708-4860-B1F1-053A18442067}"] = { CLSID = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", Elements = { { - ShapeName = "AGM-154" + ShapeName = "AGM-154C" } }, Picture = "AGM154.png", Weight = 484, diff --git a/_G/launcher/{9M114 Shturm-V-2 Rack}.lua b/_G/launcher/{9M114 Shturm-V-2 Rack}.lua index 0e5fc5f5..96fa26b3 100644 --- a/_G/launcher/{9M114 Shturm-V-2 Rack}.lua +++ b/_G/launcher/{9M114 Shturm-V-2 Rack}.lua @@ -8,6 +8,6 @@ _G["launcher"]["{9M114 Shturm-V-2 Rack}"] = { _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 2, - displayName = "9M114 Shturm-V-2 Rack", + displayName = "Missile Launcher Rack (Empty)", name = "{9M114 Shturm-V-2 Rack}" } \ No newline at end of file diff --git a/_G/launcher/{AIM-7P}.lua b/_G/launcher/{AIM-7P}.lua new file mode 100644 index 00000000..1dd2a0cc --- /dev/null +++ b/_G/launcher/{AIM-7P}.lua @@ -0,0 +1,16 @@ +_G["launcher"]["{AIM-7P}"] = { + CLSID = "{AIM-7P}", + Elements = { { + DrawArgs = { { 1, 1 }, { 2, 1 }, { 3, 1 } }, + Position = { 0, 0, 0 }, + ShapeName = "aim-7" + } }, + Picture = "us_AIM-7.png", + PictureBlendColor = "0xffffffff", + Weight = 231, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim7_family.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 7, "Redacted" }, + category = 4, + displayName = "AIM-7P Sparrow Semi-Active Radar" +} \ No newline at end of file diff --git a/_G/launcher/{B919B0F4-7C25-455E-9A02-CEA51DB895E3}.lua b/_G/launcher/{B919B0F4-7C25-455E-9A02-CEA51DB895E3}.lua index 0cbf0ef2..02012136 100644 --- a/_G/launcher/{B919B0F4-7C25-455E-9A02-CEA51DB895E3}.lua +++ b/_G/launcher/{B919B0F4-7C25-455E-9A02-CEA51DB895E3}.lua @@ -2,22 +2,16 @@ _G["launcher"]["{B919B0F4-7C25-455E-9A02-CEA51DB895E3}"] = { CLSID = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}", Count = 2, Cx_pil = 0.001, - Elements = { { - ShapeName = "9M114-PILON" - }, { - Position = { 1, 0.03, 0.17 }, - Rotation = { 0, 0, 1 }, - ShapeName = "" - }, { - Position = { 1, 0.03, -0.17 }, - Rotation = { 0, 0, 1 }, - ShapeName = "" - } }, + Elements = { "_G/Pylons/9M114-PILON.lua" }, NatoName = "AT-6", Picture = "apu2.png", - Weight = 105, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 97.8, + Weight_Empty = 27, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, - displayName = "9M114 Shturm-V-2 (AT-6 Spiral) - ATGM, SACLOS", + category = 2, + displayName = "2 x 9M114 Shturm-V (AT-6 Spiral) - ATGM, SACLOS, HEAT", + kind_of_shipping = 0, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{GBU-24}.lua b/_G/launcher/{GBU-24}.lua index 26889aab..b1d2f0a8 100644 --- a/_G/launcher/{GBU-24}.lua +++ b/_G/launcher/{GBU-24}.lua @@ -11,5 +11,5 @@ _G["launcher"]["{GBU-24}"] = { _origin = "AircraftWeaponPack", attribute = { 4, 5, 36, "Redacted" }, category = 1, - displayName = "GBU-24 Paveway III - 2000lb Laser Guided Bomb" + displayName = "GBU-24A/B Paveway III - 2000lb Laser Guided Bomb" } \ No newline at end of file diff --git a/_G/launcher/{LAU-115 - AIM-120B_R}.lua b/_G/launcher/{LAU-115 - AIM-120B_R}.lua index 136a6106..2713a1ef 100644 --- a/_G/launcher/{LAU-115 - AIM-120B_R}.lua +++ b/_G/launcher/{LAU-115 - AIM-120B_R}.lua @@ -11,13 +11,13 @@ _G["launcher"]["{LAU-115 - AIM-120B_R}"] = { } }, Picture = "us_AIM-120B.png", PictureBlendColor = "0xffffffff", - Weight = 301, + Weight = 302.85, Weight_Empty = 145, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "LAU-115 with 1 x LAU-127 AIM-120B AMRAAM - Active Rdr AAM", + displayName = "LAU-115 with 1 x LAU-127 AIM-120B AMRAAM - Active Radar AAM", name = "{LAU-115 - AIM-120B_R}", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{LAU-115 - AIM-120B}.lua b/_G/launcher/{LAU-115 - AIM-120B}.lua index 20d82ca8..a07c39ae 100644 --- a/_G/launcher/{LAU-115 - AIM-120B}.lua +++ b/_G/launcher/{LAU-115 - AIM-120B}.lua @@ -11,13 +11,13 @@ _G["launcher"]["{LAU-115 - AIM-120B}"] = { } }, Picture = "us_AIM-120B.png", PictureBlendColor = "0xffffffff", - Weight = 301, + Weight = 302.85, Weight_Empty = 145, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "LAU-115 with 1 x LAU-127 AIM-120B AMRAAM - Active Rdr AAM", + displayName = "LAU-115 with 1 x LAU-127 AIM-120B AMRAAM - Active Radar AAM", name = "{LAU-115 - AIM-120B}", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{LAU-115 - AIM-120C_R}.lua b/_G/launcher/{LAU-115 - AIM-120C_R}.lua index 0e4ba470..0cabaa21 100644 --- a/_G/launcher/{LAU-115 - AIM-120C_R}.lua +++ b/_G/launcher/{LAU-115 - AIM-120C_R}.lua @@ -11,13 +11,13 @@ _G["launcher"]["{LAU-115 - AIM-120C_R}"] = { } }, Picture = "us_AIM-120C.png", PictureBlendColor = "0xffffffff", - Weight = 306.5, + Weight = 306.48, Weight_Empty = 145, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "LAU-115 with 1 x LAU-127 AIM-120C-5 AMRAAM - Active Rdr AAM", + displayName = "LAU-115 with 1 x LAU-127 AIM-120C AMRAAM - Active Radar AAM", name = "{LAU-115 - AIM-120C_R}", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{LAU-115 - AIM-120C}.lua b/_G/launcher/{LAU-115 - AIM-120C}.lua index c12363a1..013645f1 100644 --- a/_G/launcher/{LAU-115 - AIM-120C}.lua +++ b/_G/launcher/{LAU-115 - AIM-120C}.lua @@ -11,13 +11,13 @@ _G["launcher"]["{LAU-115 - AIM-120C}"] = { } }, Picture = "us_AIM-120C.png", PictureBlendColor = "0xffffffff", - Weight = 306.5, + Weight = 306.48, Weight_Empty = 145, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "LAU-115 with 1 x LAU-127 AIM-120C-5 AMRAAM - Active Rdr AAM", + displayName = "LAU-115 with 1 x LAU-127 AIM-120C AMRAAM - Active Radar AAM", name = "{LAU-115 - AIM-120C}", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{LAU-115 - AIM-7P}.lua b/_G/launcher/{LAU-115 - AIM-7P}.lua new file mode 100644 index 00000000..78cc5792 --- /dev/null +++ b/_G/launcher/{LAU-115 - AIM-7P}.lua @@ -0,0 +1,22 @@ +_G["launcher"]["{LAU-115 - AIM-7P}"] = { + CLSID = "{LAU-115 - AIM-7P}", + Count = 1, + Cx_pil = 0.000894765625, + Elements = { { + IsAdapter = true, + ShapeName = "LAU-115C" + }, { + connector_name = "Point01", + payload_CLSID = "{AIM-7P}" + } }, + Picture = "us_AIM-7.png", + PictureBlendColor = "0xffffffff", + Weight = 285.4, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim7_family.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 32, "Redacted" }, + category = 4, + displayName = "LAU-115C with AIM-7P Sparrow Semi-Active Radar", + name = "{LAU-115 - AIM-7P}", + wsTypeOfWeapon = { 4, 4, 7, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{LAU3_FFAR_MK1HE}.lua b/_G/launcher/{LAU3_FFAR_MK1HE}.lua index 02d19919..128cf3de 100644 --- a/_G/launcher/{LAU3_FFAR_MK1HE}.lua +++ b/_G/launcher/{LAU3_FFAR_MK1HE}.lua @@ -64,7 +64,8 @@ _G["launcher"]["{LAU3_FFAR_MK1HE}"] = { connector_name = "tube_19" } }, Picture = "LAU61.png", - Weight = 285.292332, + Weight = 219.792332, + Weight_Empty = 34.5, _file = "./CoreMods/aircraft/AircraftWeaponPack/FFAR.lua", _origin = "AircraftWeaponPack", attribute = { 4, 7, 32, "Redacted" }, diff --git a/_G/launcher/{LAU3_FFAR_MK5HEAT}.lua b/_G/launcher/{LAU3_FFAR_MK5HEAT}.lua index 65fdb6c1..4b08c8d4 100644 --- a/_G/launcher/{LAU3_FFAR_MK5HEAT}.lua +++ b/_G/launcher/{LAU3_FFAR_MK5HEAT}.lua @@ -64,7 +64,8 @@ _G["launcher"]["{LAU3_FFAR_MK5HEAT}"] = { connector_name = "tube_19" } }, Picture = "LAU61.png", - Weight = 286.1541568, + Weight = 220.6541568, + Weight_Empty = 34.5, _file = "./CoreMods/aircraft/AircraftWeaponPack/FFAR.lua", _origin = "AircraftWeaponPack", attribute = { 4, 7, 32, "Redacted" }, diff --git a/_G/launcher/{LAU3_FFAR_WP156}.lua b/_G/launcher/{LAU3_FFAR_WP156}.lua index d0df7a95..5ce279a3 100644 --- a/_G/launcher/{LAU3_FFAR_WP156}.lua +++ b/_G/launcher/{LAU3_FFAR_WP156}.lua @@ -64,7 +64,8 @@ _G["launcher"]["{LAU3_FFAR_WP156}"] = { connector_name = "tube_19" } }, Picture = "LAU61.png", - Weight = 312.8707256, + Weight = 247.3707256, + Weight_Empty = 34.5, _file = "./CoreMods/aircraft/AircraftWeaponPack/FFAR.lua", _origin = "AircraftWeaponPack", attribute = { 4, 7, 32, "Redacted" }, diff --git a/_G/rockets/AIM-7E.lua b/_G/rockets/AIM-7E.lua index cce2480c..442ceab6 100644 --- a/_G/rockets/AIM-7E.lua +++ b/_G/rockets/AIM-7E.lua @@ -5,7 +5,7 @@ _G["rockets"]["#Index"] = { Damage = 97.5, Diam = 203, Escort = 1, - Fi_excort = 1.05, + Fi_excort = 0.8, Fi_rak = 3.14152, Fi_search = 0.1, Fi_start = 0.4, @@ -55,6 +55,7 @@ _G["rockets"]["#Index"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, impulse = 250, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -113,6 +114,7 @@ _G["rockets"]["#Index"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 40, impulse = 250, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -130,14 +132,14 @@ _G["rockets"]["#Index"] = { rad_correction = 0, scheme = "aa_missile_semi_active", seeker = { - FOV = 2.0943951023932, + FOV = 1.6057029118348, aim_sigma = 8, ccm_k0 = 2, delay = 2, height_error_k = 110, height_error_max_h = 450, height_error_max_vel = 150, - max_w_LOS = 0.34906585039887, + max_w_LOS = 0.26179938779915, op_time = 75, sens_far_dist = 30000, sens_near_dist = 100 diff --git a/_G/rockets/AIM-7F.lua b/_G/rockets/AIM-7F.lua index 2415cb76..61c26ecb 100644 --- a/_G/rockets/AIM-7F.lua +++ b/_G/rockets/AIM-7F.lua @@ -5,7 +5,7 @@ _G["rockets"]["#Index"] = { Damage = 97.5, Diam = 203, Escort = 1, - Fi_excort = 1.05, + Fi_excort = 0.96, Fi_rak = 3.14152, Fi_search = 0.1, Fi_start = 0.4, @@ -60,6 +60,7 @@ _G["rockets"]["#Index"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 38.48, impulse = 247, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -119,6 +120,7 @@ _G["rockets"]["#Index"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 21.82, impulse = 209, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -137,7 +139,7 @@ _G["rockets"]["#Index"] = { rad_correction = 0, scheme = "aa_missile_semi_active", seeker = { - FOV = 2.0943951023932, + FOV = 1.9198621771938, aim_sigma = 5.5, ccm_k0 = 1, delay = 1.5, diff --git a/_G/rockets/AIM-7MH.lua b/_G/rockets/AIM-7MH.lua index 1edbd2b0..2772004f 100644 --- a/_G/rockets/AIM-7MH.lua +++ b/_G/rockets/AIM-7MH.lua @@ -61,6 +61,7 @@ _G["rockets"]["#Index"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 38.48, impulse = 247, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -118,6 +119,7 @@ _G["rockets"]["#Index"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 21.82, impulse = 209, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, diff --git a/_G/rockets/AIM-7P.lua b/_G/rockets/AIM-7P.lua new file mode 100644 index 00000000..23bf1602 --- /dev/null +++ b/_G/rockets/AIM-7P.lua @@ -0,0 +1,174 @@ +_G["rockets"]["#Index"] = { + Cx_pil = 2.21, + D_max = 20000, + D_min = 1500, + Damage = 97.5, + Diam = 203, + Escort = 1, + Fi_excort = 1.05, + Fi_rak = 3.14152, + Fi_search = 0.1, + Fi_start = 0.4, + H_max = 24400, + H_min = 1, + H_min_t = 15, + Head_Form = 1, + Head_Type = 6, + KillDistance = 12, + Life_Time = 90, + M = 231, + Mach_max = 3.2, + ModelData = { 58, 0.9, 0.0125, 0.052, 0.01, 0.002, 0.5, 1.2, 2.2, 1.05, 1.2, 0.18, 0, -1, -1, 3.7, 10.8, 0, 0, 1000000000, 0, 0, 10.4, 2.02, 0, 0, 0, 0, 0, 25192, 4140, 0, 0, 0, 1000000000, 75, 0, 1.5, 5000, 15000, 0.1, 50, 0, 1.19, 1, 2, 14, -21, -2.2, 27000, 7000, 38000, 12000, 19000, 5000, 2500, 0.4, -0.014, 0.5 }, + Name = "Redacted", + Nr_max = 25, + OmViz_max = 0.35, + PN_coeffs = { 2, 5000, 1, 15000, 0.4 }, + Range_max = 50000, + Reflection = 0.08, + X_back = -2, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim7_family.lua", + _origin = "AircraftWeaponPack", + autopilot = { + Areq_limit = 25, + Kconv = 4, + Kd = 0.4, + Ki = 0.1, + Knv = 0.02, + Kout = 1, + Krx = 2, + Kx = 0.1, + PN_dist_data = { 15000, 1, 9000, 1 }, + alg = 0, + bang_bang = 0, + delay = 1.5, + fins_limit = 0.34906585039887, + fins_limit_x = 0.087266462599716, + loft_active_by_default = 1, + loft_add_pitch = 0.5235987755983, + loft_max_dist = 20000, + loft_min_dist = 6500, + loft_time = 3.5, + max_side_N = 10, + max_signal_Fi = 0.20943951023932, + null_roll = 0.78539816339745, + op_time = 75, + rotate_fins_output = 0, + x_channel_delay = 0.9 + }, + boost = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 38.48, + impulse = 247, + nozzle_exit_area = 0.00724, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.9, 0, 0 } }, + smoke_color = { 1, 1, 1 }, + smoke_transparency = 0.9, + tail_width = 0.4, + work_time = 3.7 + }, + category = 4, + ccm_k0 = 0.5, + class_name = "wAmmunitionSelfHoming", + controller = { + boost_start = 0.5, + march_start = 4.2 + }, + displayName = "AIM-7P Sparrow Semi-Active Radar", + display_name = "AIM-7P", + exhaust = { 0.78, 0.78, 0.78, 0.3 }, + fm = { + A1trim = { 10, 10 }, + A2trim = { 10, 10 }, + Cx0 = { 0.34, 0.34, 0.34, 0.34, 0.35, 1.1, 1.27, 1.23, 1.19, 1.12, 1.05, 1, 0.95, 0.91, 0.87, 0.84, 0.81, 0.78, 0.76, 0.74, 0.72 }, + CxB = { 0.11, 0.11, 0.11, 0.11, 0.11, 0.18, 0.19, 0.17, 0.16, 0.14, 0.13, 0.12, 0.12, 0.11, 0.11, 0.1, 0.09, 0.09, 0.08, 0.08, 0.07 }, + Cya = { 1.14, 1.14, 1.14, 1.14, 1.14, 1.42, 1.46, 1.39, 1.32, 1.15, 1.06, 1, 0.94, 0.89, 0.83, 0.78, 0.73, 0.69, 0.65, 0.61, 0.57 }, + Cza = { 1.14, 1.14, 1.14, 1.14, 1.14, 1.42, 1.46, 1.39, 1.32, 1.15, 1.06, 1, 0.94, 0.89, 0.83, 0.78, 0.73, 0.69, 0.65, 0.61, 0.57 }, + Ix = 3.5, + Iy = 127.4, + Iz = 127.4, + K1 = { 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0052, 0.0048, 0.0045, 0.0041, 0.0037, 0.0036, 0.0034, 0.0032, 0.0031, 0.003, 0.0029, 0.0027, 0.0026 }, + K2 = { 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0051, 0.0047, 0.0043, 0.0037, 0.0031, 0.0032, 0.0033, 0.0035, 0.0036, 0.0037, 0.0038, 0.0039, 0.004 }, + L = 0.2, + Mxd = 17.19, + Mxw = -44.5, + Mya = { -0.5, -0.5 }, + Myw = { -2, -2 }, + Mza = { -0.5, -0.5 }, + Mzw = { -2, -2 }, + S = 0.0324, + caliber = 0.2, + delta_max = 0.34906585039887, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 1, + mass = 231, + 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 + }, + hoj = 1, + loft = 1, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 21.82, + impulse = 209, + nozzle_exit_area = 0.00724, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.9, 0, 0 } }, + smoke_color = { 1, 1, 1 }, + smoke_transparency = 0.9, + tail_width = 0.4, + work_time = 10.8 + }, + mass = 231, + model = "aim-7", + name = "AIM-7P", + nozzle_exit_area = 0.007238, + proximity_fuze = { + arm_delay = 1.6, + radius = 12 + }, + scheme = "aa_missile_semi_active", + seeker = { + FOV = 2.0943951023932, + aim_sigma = 5.5, + ccm_k0 = 0.5, + delay = 1.5, + height_error_k = 100, + height_error_max_h = 300, + height_error_max_vel = 138, + hoj = 1, + max_w_LOS = 0.34906585039887, + op_time = 75, + rad_correction = 1, + sens_far_dist = 60000, + sens_near_dist = 100 + }, + shape_table_data = { { + file = "aim-7", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "aim_7_P", + username = "AIM-7P" + } }, + sigma = { 5.6, 5, 5.6 }, + supersonic_A_coef_skew = 0.25, + t_acc = 3.3, + t_b = 0.5, + t_marsh = 11, + user_name = "AIM-7P", + v_mid = 500, + v_min = 140, + warhead = "_G/warheads/AIM_7.lua", + warhead_air = "_G/warheads/AIM_7.lua", + wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, + ws_type =
+} \ No newline at end of file diff --git a/_G/rockets/AIM-9J.lua b/_G/rockets/AIM-9J.lua index 04097fa0..71a924f4 100644 --- a/_G/rockets/AIM-9J.lua +++ b/_G/rockets/AIM-9J.lua @@ -5,9 +5,9 @@ _G["rockets"]["#Index"] = { Damage = 27.5, Diam = 127, Escort = 0, - Fi_excort = 0.79, + Fi_excort = 0.7, Fi_rak = 2.1, - Fi_search = 0.028, + Fi_search = 0.031, Fi_start = 0.3, H_max = 18000, H_min = -1, diff --git a/_G/rockets/AIM-9JULI.lua b/_G/rockets/AIM-9JULI.lua index a8addf8c..3683556e 100644 --- a/_G/rockets/AIM-9JULI.lua +++ b/_G/rockets/AIM-9JULI.lua @@ -7,7 +7,7 @@ _G["rockets"]["#Index"] = { Escort = 0, Fi_excort = 0.79, Fi_rak = 3.14152, - Fi_search = 0.061, + Fi_search = 0.031, Fi_start = 0.3, H_max = 21000, H_min = -1, diff --git a/_G/rockets/AIM-9L.lua b/_G/rockets/AIM-9L.lua index fa0c5068..f7a6c77a 100644 --- a/_G/rockets/AIM-9L.lua +++ b/_G/rockets/AIM-9L.lua @@ -7,7 +7,7 @@ _G["rockets"]["#Index"] = { Escort = 0, Fi_excort = 0.79, Fi_rak = 3.14152, - Fi_search = 0.061, + Fi_search = 0.031, Fi_start = 0.3, H_max = 18000, H_min = -1, diff --git a/_G/rockets/AIM-9P.lua b/_G/rockets/AIM-9P.lua index 16f02f9f..fe6750d6 100644 --- a/_G/rockets/AIM-9P.lua +++ b/_G/rockets/AIM-9P.lua @@ -5,9 +5,9 @@ _G["rockets"]["#Index"] = { Damage = 27.5, Diam = 127, Escort = 0, - Fi_excort = 0.79, + Fi_excort = 0.7, Fi_rak = 3.14152, - Fi_search = 0.044, + Fi_search = 0.017, Fi_start = 0.3, H_max = 18000, H_min = -1, diff --git a/_G/rockets/AIM-9P5.lua b/_G/rockets/AIM-9P5.lua index ac6617af..f47f37e1 100644 --- a/_G/rockets/AIM-9P5.lua +++ b/_G/rockets/AIM-9P5.lua @@ -7,7 +7,7 @@ _G["rockets"]["#Index"] = { Escort = 0, Fi_excort = 0.79, Fi_rak = 3.14152, - Fi_search = 0.09, + Fi_search = 0.031, Fi_start = 0.3, H_max = 18000, H_min = -1, @@ -21,7 +21,7 @@ _G["rockets"]["#Index"] = { ModelData = { 58, 0.35, 0.04, 0.08, 0.02, 0.05, 1.2, 1.2, 0.5, 0.4, 1.2, 0.29, 0, -1, -1, 3, 0, 0, 0, 1000000000, 0, 0, 8, 0, 0, 0, 0, 0, 0, 18800, 0, 0, 0, 0, 1000000000, 30, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 9000, 4000, 4000, 0.2, 1, 1.4, -3, 0.5 }, Name = "Redacted", Nr_max = 16, - OmViz_max = 0.61, + OmViz_max = 0.44, Range_max = 11000, Reflection = 0.03, SeekerCooled = true, diff --git a/_G/rockets/AIM_120.lua b/_G/rockets/AIM_120.lua index 83e42c6e..30c82ddc 100644 --- a/_G/rockets/AIM_120.lua +++ b/_G/rockets/AIM_120.lua @@ -16,34 +16,171 @@ _G["rockets"]["#Index"] = { Head_Type = 2, KillDistance = 15, Life_Time = 90, - M = 156, + M = 157.85, Mach_max = 4, ModelData = { 58, 0.5, 0.026, 0.053, 0.01, -0.245, 0.075, 0.7, 1.5, 0.6, 1.2, 0.5, 0, -1, -1, 4, 4, 0, 0, 1000000000, 0, 0, 7.69, 3.94, 0, 0, 0, 0, 0, 19600, 10045, 0, 0, 0, 1000000000, 80, 0, 1, 25000, 15000, 0.52356, 50, 0, 1.19, 1, 2, 21, -25, -3, 33000, 10000, 65000, 19500, 21500, 6500, 3000, 0.4, -0.015, 0.5 }, Name = "Redacted", Nr_max = 30, OmViz_max = 0.52, - PN_coeffs = { 3, 15000, 1, 25000, 0.5, 40000, 0.25 }, + PN_gain = 4, Range_max = 57000, Reflection = 0.07, X_back = -1.99, Y_back = 0, Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", + _origin = "AircraftWeaponPack", + actuator = { + D = 250, + T1 = 0.002, + T2 = 0.006, + Tf = 0.005, + fin_stall = 1, + max_delta = 0.34906585039887, + max_omega = 6.9813170079773, + sim_count = 4 + }, + autopilot = { + Ka = 22, + Kd = 110, + Knav = 4, + Krx = 2, + Kx = 0.1, + T1 = 292, + Tc = 0.04, + Tf = 0.1, + accel_coeffs = { 0, 3.4, -0.4, -0.2, 13.6, 0.0002232 }, + dV0 = 347, + delay = 1, + fins_limit = 0.31415926535898, + fins_limit_x = 0.087266462599716, + gload_limit = 30, + loft_active = 1, + loft_factor = 4.5, + loft_off_range = 15000, + loft_sin = 0.49996660034157, + null_roll = 0.78539816339745, + op_time = 80 + }, + boost = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 18.21, + impulse = 236, + nozzle_exit_area = 0.0132, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.9, 0, 0 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.03, + tail_width = 0.4, + work_time = 2.1 + }, + category = 4, ccm_k0 = 0.2, + class_name = "wAmmunitionSelfHoming", + controller = { + boost_start = 0.5, + march_start = 2.6 + }, + displayName = "AIM-120B AMRAAM - Active Radar AAM", display_name = "AIM-120B", - display_name_short = "AIM-120B", exhaust = { 0.8, 0.8, 0.8, 0.05 }, + fm = { + A1trim = { 24, 24, 24, 24, 23.5, 23, 25.16, 27.23, 29.04, 30.6, 31.93, 33.08, 34.07, 34.95, 35.74, 36.45, 37.09, 37.68, 38.2, 38.66, 39.06, 39.39, 39.66, 39.85, 39.96, 40 }, + A2trim = { 24, 24, 24, 24, 23.5, 23, 25.16, 27.23, 29.04, 30.6, 31.93, 33.08, 34.07, 34.95, 35.74, 36.45, 37.09, 37.68, 38.2, 38.66, 39.06, 39.39, 39.66, 39.85, 39.96, 40 }, + Cx0 = { 0.515, 0.515, 0.515, 0.515, 0.527, 0.85, 0.949, 0.905, 0.8605, 0.8094, 0.7636, 0.7204, 0.6813, 0.6458, 0.6135, 0.5839, 0.5567, 0.5316, 0.5082, 0.4864, 0.4659, 0.4468, 0.4288, 0.4121, 0.3968, 0.384 }, + CxB = { 0.021, 0.021, 0.021, 0.021, 0.021, 0.138, 0.153, 0.146, 0.1382, 0.1272, 0.1167, 0.1073, 0.0987, 0.0909, 0.0837, 0.077, 0.0708, 0.065, 0.0595, 0.0544, 0.0495, 0.0449, 0.0406, 0.0364, 0.0324, 0.0286 }, + Cya = { 0.345, 0.345, 0.345, 0.345, 0.357, 0.401, 0.448, 0.495, 0.513, 0.506, 0.5, 0.495, 0.49, 0.486, 0.482, 0.478, 0.474, 0.471, 0.468, 0.465, 0.462, 0.46, 0.457, 0.455, 0.453, 0.451 }, + Cza = { 0.345, 0.345, 0.345, 0.345, 0.357, 0.401, 0.448, 0.495, 0.513, 0.506, 0.5, 0.495, 0.49, 0.486, 0.482, 0.478, 0.474, 0.471, 0.468, 0.465, 0.462, 0.46, 0.457, 0.455, 0.453, 0.451 }, + Ix = 1.24, + Iy = 130.12, + Iz = 130.12, + K1 = { 0.0039, 0.0039, 0.0039, 0.0039, 0.0039, 0.0048, 0.004, 0.00325, 0.002845, 0.002602, 0.002378, 0.002176, 0.001994, 0.001832, 0.001689, 0.001564, 0.001456, 0.001366, 0.00129, 0.001229, 0.001182, 0.001147, 0.001123, 0.001108, 0.001101, 0.0011 }, + K2 = { -0.0041, -0.0041, -0.0041, -0.0041, -0.0041, -0.0049, -0.0042, -0.0036, -0.003121, -0.002725, -0.002408, -0.00213, -0.001888, -0.001677, -0.001494, -0.001334, -0.001196, -0.001077, -0.000973, -0.000884, -0.000808, -0.000743, -0.000689, -0.000646, -0.000615, -0.0006 }, + L = 0.178, + Mxd = 5.73, + Mxw = -15.8, + Mya = { -1.316, -1.316, -1.316, -1.316, -1.458, -1.982, -1.418, -1.0883, -0.9411, -0.8255, -0.733, -0.6574, -0.5942, -0.5403, -0.4935, -0.4525, -0.4164, -0.3846, -0.3568, -0.3328, -0.3125, -0.2959, -0.283, -0.2739, -0.2683, -0.2665 }, + Myw = { -16.3145, -16.3145, -16.3145, -16.3145, -16.8944, -19.8659, -18.1868, -17.1716, -16.504, -15.88, -15.2958, -14.7478, -14.2328, -13.7477, -13.2901, -12.8574, -12.4477, -12.0593, -11.6911, -11.3421, -11.0121, -10.7015, -10.4118, -10.1458, -9.9098, -9.7256 }, + Mza = { -1.316, -1.316, -1.316, -1.316, -1.458, -1.982, -1.418, -1.0883, -0.9411, -0.8255, -0.733, -0.6574, -0.5942, -0.5403, -0.4935, -0.4525, -0.4164, -0.3846, -0.3568, -0.3328, -0.3125, -0.2959, -0.283, -0.2739, -0.2683, -0.2665 }, + Mzw = { -16.3145, -16.3145, -16.3145, -16.3145, -16.8944, -19.8659, -18.1868, -17.1716, -16.504, -15.88, -15.2958, -14.7478, -14.2328, -13.7477, -13.2901, -12.8574, -12.4477, -12.0593, -11.6911, -11.3421, -11.0121, -10.7015, -10.4118, -10.1458, -9.9098, -9.7256 }, + S = 0.0248, + caliber = 0.178, + delta_max = 0.34906585039887, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 1, + mass = 157.85, + model_roll = 0.78539816339745, + rotated_fins_inp = 0, + table_degree_values = 1, + table_scale = 0.2, + tail_first = 0, + wind_sigma = 0, + wind_time = 0 + }, + gimbal = { + delay = 0, + max_tracking_rate = 0.5235987755983, + op_time = 95, + pitch_max = 1.0471975511966, + tracking_gain = 50, + yaw_max = 1.0471975511966 + }, hoj = 1, loft = 1, loft_factor = 4.5, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 28.33, + impulse = 227, + nozzle_exit_area = 0.0132, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.9, 0, 0 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.03, + tail_width = 0.4, + work_time = 5 + }, + model = "aim-120b", name = "AIM_120", nozzle_exit_area = 0.011, + proximity_fuze = { + arm_delay = 1.6, + radius = 7 + }, + scheme = "aa_missile_amraam2", + sensor = { + FOV = 0.26179938779915, + aim_sigma = 4, + ccm_k0 = 0.2, + delay = 1.5, + height_error_k = 25, + height_error_max_h = 300, + height_error_max_vel = 60, + hoj = 1, + max_w_LOS = 0.5235987755983, + op_time = 80, + sens_far_dist = 30000, + sens_near_dist = 100 + }, + shape_table_data = { { + file = "aim-120b", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "AIM-120B", + username = "AIM-120B" + } }, sigma = { 5, 5, 5 }, supersonic_A_coef_skew = 0.1, t_acc = 3, t_b = 0.5, t_marsh = 5, + user_name = "AIM-120B", v_mid = 700, v_min = 140, warhead = "_G/warheads/AIM_120.lua", - ws_type = { 4, 4, 7, "Redacted" } + warhead_air = "_G/warheads/AIM_120.lua", + wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, + ws_type =
} \ No newline at end of file diff --git a/_G/rockets/AIM_120C.lua b/_G/rockets/AIM_120C.lua index 3d33895a..5bfa858c 100644 --- a/_G/rockets/AIM_120C.lua +++ b/_G/rockets/AIM_120C.lua @@ -16,34 +16,171 @@ _G["rockets"]["#Index"] = { Head_Type = 2, KillDistance = 15, Life_Time = 90, - M = 161.5, + M = 161.48, Mach_max = 4, - ModelData = { 58, 0.4, 0.029, 0.06, 0.01, -0.245, 0.08, 0.7, 1.4, 0.6, 1.2, 0.5, 0, -1, -1, 8, 0, 0, 0, 1000000000, 0, 0, 6.41, 0, 0, 0, 0, 0, 0, 16325, 0, 0, 0, 0, 1000000000, 80, 0, 1, 25000, 15000, 0.52356, 50, 0, 1.19, 1, 2, 21, -23, -3, 35000, 12000, 75000, 21500, 25000, 7500, 4000, 0.4, -0.015, 0.5 }, + ModelData = { 58, 0.4, 0.029, 0.06, 0.01, -0.245, 0.08, 0.7, 1.4, 0.6, 1.2, 0.5, 0, -1, -1, 8, 0, 0, 0, 1000000000, 0, 0, 6.41, 0, 0, 0, 0, 0, 0, 16325, 0, 0, 0, 0, 1000000000, 100, 0, 1, 25000, 15000, 0.52356, 50, 0, 1.19, 1, 2, 21, -23, -3, 35000, 12000, 75000, 21500, 25000, 7500, 4000, 0.4, -0.015, 0.5 }, Name = "Redacted", Nr_max = 30, OmViz_max = 0.52, - PN_coeffs = { 3, 15000, 1, 25000, 0.5, 40000, 0.25 }, + PN_gain = 4, Range_max = 61000, Reflection = 0.07, X_back = -1.98, Y_back = 0, Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", + _origin = "AircraftWeaponPack", + actuator = { + D = 250, + T1 = 0.002, + T2 = 0.006, + Tf = 0.005, + fin_stall = 1, + max_delta = 0.34906585039887, + max_omega = 6.9813170079773, + sim_count = 4 + }, + autopilot = { + Ka = 16, + Kd = 180, + Knav = 4, + Krx = 2, + Kx = 0.1, + T1 = 309, + Tc = 0.06, + Tf = 0.1, + accel_coeffs = { 0, 11.5, -1.2, -0.25, 24, 0.00016926 }, + dV0 = 393, + delay = 1, + fins_limit = 0.31415926535898, + fins_limit_x = 0.087266462599716, + gload_limit = 30, + loft_active = 1, + loft_factor = 4.5, + loft_off_range = 15000, + loft_sin = 0.49996660034157, + null_roll = 0.78539816339745, + op_time = 100 + }, + boost = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 0, + impulse = 0, + nozzle_exit_area = 0.0132, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.9, 0, 0 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.03, + tail_width = 0.4, + work_time = 0.1 + }, + category = 4, ccm_k0 = 0.1, - display_name = "AIM-120C-5", - display_name_short = "AIM-120C-5", + class_name = "wAmmunitionSelfHoming", + controller = { + boost_start = 0, + march_start = 0.5 + }, + displayName = "AIM-120C AMRAAM - Active Radar AAM", + display_name = "AIM-120C", exhaust = { 0.8, 0.8, 0.8, 0.05 }, + fm = { + A1trim = { 28, 28, 28, 28, 28, 31.2, 32.74, 33.39, 33.7, 33.89, 34.04, 34.18, 34.31, 34.44, 34.57, 34.7, 34.83, 34.96, 35.09, 35.22, 35.35, 35.48, 35.61, 35.74, 35.87, 36 }, + A2trim = { 28, 28, 28, 28, 28, 31.2, 32.74, 33.39, 33.7, 33.89, 34.04, 34.18, 34.31, 34.44, 34.57, 34.7, 34.83, 34.96, 35.09, 35.22, 35.35, 35.48, 35.61, 35.74, 35.87, 36 }, + Cx0 = { 0.468, 0.468, 0.468, 0.468, 0.479, 0.751, 0.88, 0.8572, 0.8132, 0.7645, 0.7205, 0.6808, 0.6447, 0.6119, 0.582, 0.5545, 0.5292, 0.5057, 0.4838, 0.4633, 0.4439, 0.4256, 0.4083, 0.3921, 0.377, 0.364 }, + CxB = { 0.021, 0.021, 0.021, 0.021, 0.021, 0.138, 0.153, 0.146, 0.1382, 0.1272, 0.1167, 0.1073, 0.0987, 0.0909, 0.0837, 0.077, 0.0708, 0.065, 0.0595, 0.0544, 0.0495, 0.0449, 0.0406, 0.0364, 0.0324, 0.0286 }, + Cya = { 0.318, 0.318, 0.318, 0.318, 0.336, 0.425, 0.467, 0.506, 0.518, 0.503, 0.491, 0.48, 0.471, 0.463, 0.456, 0.45, 0.445, 0.441, 0.438, 0.434, 0.431, 0.429, 0.427, 0.424, 0.423, 0.421 }, + Cza = { 0.318, 0.318, 0.318, 0.318, 0.336, 0.425, 0.467, 0.506, 0.518, 0.503, 0.491, 0.48, 0.471, 0.463, 0.456, 0.45, 0.445, 0.441, 0.438, 0.434, 0.431, 0.429, 0.427, 0.424, 0.423, 0.421 }, + Ix = 1.04, + Iy = 125.32, + Iz = 125.32, + K1 = { 0.0025, 0.0025, 0.0025, 0.0025, 0.0025, 0.0024, 0.002, 0.00172, 0.00151, 0.00135, 0.00123, 0.00114, 0.00106, 0.00099, 0.00094, 0.00088, 0.00084, 0.00079, 0.00074, 0.0007, 0.00066, 0.00062, 0.00058, 0.00055, 0.00052, 0.0005 }, + K2 = { -0.0024, -0.0024, -0.0024, -0.0024, -0.0024, -0.0024, -0.00206, -0.00186, -0.00168, -0.0015, -0.00134, -0.00118, -0.00104, -0.0009, -0.00078, -0.00066, -0.00056, -0.00046, -0.00038, -0.0003, -0.00024, -0.00018, -0.00014, -0.0001, -8e-05, -6e-05 }, + L = 0.178, + Mxd = 5.73, + Mxw = -15.8, + Mya = { -0.712, -0.712, -0.712, -0.712, -0.776, -0.916, -0.907, -0.825, -0.7191, -0.5719, -0.4711, -0.4019, -0.3538, -0.3193, -0.2934, -0.2728, -0.2553, -0.2398, -0.2254, -0.2119, -0.199, -0.1868, -0.1754, -0.1649, -0.1557, -0.149 }, + Myw = { -8.8081, -8.8081, -8.8081, -8.8081, -9.0256, -11.32, -10.0494, -10.0967, -10.111, -10.0959, -10.0547, -9.9906, -9.9065, -9.8052, -9.6892, -9.5609, -9.4224, -9.2756, -9.1223, -8.9639, -8.8019, -8.6373, -8.471, -8.3037, -8.1361, -7.9682 }, + Mza = { -0.712, -0.712, -0.712, -0.712, -0.776, -0.916, -0.907, -0.825, -0.7191, -0.5719, -0.4711, -0.4019, -0.3538, -0.3193, -0.2934, -0.2728, -0.2553, -0.2398, -0.2254, -0.2119, -0.199, -0.1868, -0.1754, -0.1649, -0.1557, -0.149 }, + Mzw = { -8.8081, -8.8081, -8.8081, -8.8081, -9.0256, -11.32, -10.0494, -10.0967, -10.111, -10.0959, -10.0547, -9.9906, -9.9065, -9.8052, -9.6892, -9.5609, -9.4224, -9.2756, -9.1223, -8.9639, -8.8019, -8.6373, -8.471, -8.3037, -8.1361, -7.9682 }, + S = 0.0248, + caliber = 0.178, + delta_max = 0.34906585039887, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 1, + mass = 161.48, + model_roll = 0.78539816339745, + rotated_fins_inp = 0, + table_degree_values = 1, + table_scale = 0.2, + tail_first = 0, + wind_sigma = 0, + wind_time = 0 + }, + gimbal = { + delay = 0, + max_tracking_rate = 0.5235987755983, + op_time = 100, + pitch_max = 1.0471975511966, + tracking_gain = 50, + yaw_max = 1.0471975511966 + }, hoj = 1, loft = 1, loft_factor = 4.5, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 51.26, + impulse = 234, + nozzle_exit_area = 0.0132, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.9, 0, 0 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.03, + tail_width = 0.4, + work_time = 6.5 + }, + model = "aim-120c", name = "AIM_120C", nozzle_exit_area = 0.011, + proximity_fuze = { + arm_delay = 1.6, + radius = 7 + }, + scheme = "aa_missile_amraam2", + sensor = { + FOV = 0.26179938779915, + aim_sigma = 3.5, + ccm_k0 = 0.1, + delay = 1.5, + height_error_k = 20, + height_error_max_h = 300, + height_error_max_vel = 50, + hoj = 1, + max_w_LOS = 0.5235987755983, + op_time = 100, + sens_far_dist = 30000, + sens_near_dist = 100 + }, + shape_table_data = { { + file = "aim-120c", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "AIM-120C", + username = "AIM-120C" + } }, sigma = { 5, 5, 5 }, supersonic_A_coef_skew = 0.1, t_acc = 3, t_b = 0.4, t_marsh = 6, + user_name = "AIM-120C", v_mid = 700, v_min = 140, warhead = "_G/warheads/AIM_120C.lua", - ws_type = { 4, 4, 7, "Redacted" } + warhead_air = "_G/warheads/AIM_120C.lua", + wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, + ws_type =
} \ No newline at end of file diff --git a/_G/rockets/AIM_54A_Mk47.lua b/_G/rockets/AIM_54A_Mk47.lua index 6c735893..16dbc5f7 100644 --- a/_G/rockets/AIM_54A_Mk47.lua +++ b/_G/rockets/AIM_54A_Mk47.lua @@ -18,7 +18,7 @@ _G["rockets"]["#Index"] = { Life_Time = 240, M = 444, Mach_max = 4, - ModelData = { 58, 1.1, 0.042, 0.083, 0.01, -0.24, 0.12, 1.2, 1.6, 1.3, 1.2, 0.35, 0, 0.27, -1, 27, 0.1, 0, 0, 1000000000, 0, 0, 6.32, 0, 0, 0, 0, 0, 0, 15982, 0, 0, 0, 0, 1000000000, 240, 0, 2.5, 40000, 30000, 0.5, 30, 0, 36, 7.8, 1, 50, -45, -7.2, 72000, 28000, 120000, 46000, 44000, 20000, 3500, 0.4, -0.012, 0.7 }, + ModelData = { 58, 1.1, 0.042, 0.083, 0.01, -0.24, 0.12, 0.18, 1.6, 1.3, 1.2, 0.35, 0, 0.27, -1, 27, 0.1, 0, 0, 1000000000, 0, 0, 6.32, 0, 0, 0, 0, 0, 0, 15982, 0, 0, 0, 0, 1000000000, 240, 0, 2.5, 40000, 30000, 0.5, 30, 0, 1.2, 1, 2, 50, -45, -7.2, 72000, 28000, 120000, 46000, 44000, 20000, 3500, 0.4, -0.012, 0.7 }, Name = "Redacted", Nr_max = 18, OmViz_max = 0.52, @@ -57,7 +57,7 @@ _G["rockets"]["#Index"] = { name = "HB_F14_EXT_PHX_ALU" } }, sigma = { 5, 5, 5 }, - supersonic_A_coef_skew = 0.25, + supersonic_A_coef_skew = 0.295, t_acc = 3, t_b = 0, t_marsh = 5, diff --git a/_G/rockets/AIM_54A_Mk60.lua b/_G/rockets/AIM_54A_Mk60.lua index fa7980c7..a4924036 100644 --- a/_G/rockets/AIM_54A_Mk60.lua +++ b/_G/rockets/AIM_54A_Mk60.lua @@ -18,7 +18,7 @@ _G["rockets"]["#Index"] = { Life_Time = 240, M = 471.7, Mach_max = 4, - ModelData = { 58, 1.1, 0.042, 0.083, 0.01, -0.24, 0.12, 1.2, 1.6, 1.3, 1.2, 0.35, 0, 0.27, -1, 30, 0.1, 0, 0, 1000000000, 0, 0, 6.933, 0, 0, 0, 0, 0, 0, 17793, 0, 0, 0, 0, 1000000000, 240, 0, 2.5, 40000, 30000, 0.5, 30, 0, 36, 7.8, 1, 50, -45, -7.2, 72000, 28000, 120000, 46000, 44000, 20000, 3500, 0.4, -0.012, 0.7 }, + ModelData = { 58, 1.1, 0.042, 0.083, 0.01, -0.24, 0.12, 0.18, 1.6, 1.3, 1.2, 0.35, 0, 0.27, -1, 30, 0.1, 0, 0, 1000000000, 0, 0, 6.933, 0, 0, 0, 0, 0, 0, 17793, 0, 0, 0, 0, 1000000000, 240, 0, 2.5, 40000, 30000, 0.5, 30, 0, 1.2, 1, 2, 50, -45, -7.2, 72000, 28000, 120000, 46000, 44000, 20000, 3500, 0.4, -0.012, 0.7 }, Name = "Redacted", Nr_max = 18, OmViz_max = 0.52, @@ -51,7 +51,7 @@ _G["rockets"]["#Index"] = { username = "AIM-54A-Mk60" } }, sigma = { 5, 5, 5 }, - supersonic_A_coef_skew = 0.25, + supersonic_A_coef_skew = 0.295, t_acc = 3, t_b = 0, t_marsh = 5, diff --git a/_G/rockets/AIM_54C_Mk47.lua b/_G/rockets/AIM_54C_Mk47.lua index 7e459ac4..0d2c4369 100644 --- a/_G/rockets/AIM_54C_Mk47.lua +++ b/_G/rockets/AIM_54C_Mk47.lua @@ -18,7 +18,7 @@ _G["rockets"]["#Index"] = { Life_Time = 240, M = 465.6, Mach_max = 4, - ModelData = { 58, 1.1, 0.042, 0.083, 0.01, -0.24, 0.12, 1.2, 1.6, 1.3, 1.2, 0.35, 0, 0.27, -1, 27, 0.1, 0, 0, 1000000000, 0, 0, 6.048, 0, 0, 0, 0, 0, 0, 15723.1, 0, 0, 0, 0, 1000000000, 240, 0, 2.5, 40000, 30000, 0.5, 30, 0, 36, 7.8, 1, 50, -45, -7.2, 72000, 28000, 120000, 46000, 44000, 20000, 3500, 0.4, -0.012, 0.7 }, + ModelData = { 58, 1.1, 0.042, 0.083, 0.01, -0.24, 0.12, 0.18, 1.6, 1.3, 1.2, 0.35, 0, 0.27, -1, 27, 0.1, 0, 0, 1000000000, 0, 0, 6.048, 0, 0, 0, 0, 0, 0, 15723.1, 0, 0, 0, 0, 1000000000, 240, 0, 2.5, 40000, 30000, 0.5, 30, 0, 1.2, 1, 2, 50, -45, -7.2, 72000, 28000, 120000, 46000, 44000, 20000, 3500, 0.4, -0.012, 0.7 }, Name = "Redacted", Nr_max = 18, OmViz_max = 0.52, @@ -51,7 +51,7 @@ _G["rockets"]["#Index"] = { username = "AIM-54C" } }, sigma = { 5, 5, 5 }, - supersonic_A_coef_skew = 0.25, + supersonic_A_coef_skew = 0.295, t_acc = 3, t_b = 0, t_marsh = 5, diff --git a/_G/rockets/AIM_7.lua b/_G/rockets/AIM_7.lua index 50bf8c3b..b4c72af3 100644 --- a/_G/rockets/AIM_7.lua +++ b/_G/rockets/AIM_7.lua @@ -61,6 +61,7 @@ _G["rockets"]["#Index"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 38.48, impulse = 247, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -117,6 +118,7 @@ _G["rockets"]["#Index"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 21.82, impulse = 209, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, diff --git a/_G/rockets/AIM_9.lua b/_G/rockets/AIM_9.lua index e613585e..744ffa25 100644 --- a/_G/rockets/AIM_9.lua +++ b/_G/rockets/AIM_9.lua @@ -7,7 +7,7 @@ _G["rockets"]["#Index"] = { Escort = 0, Fi_excort = 0.79, Fi_rak = 3.14152, - Fi_search = 0.061, + Fi_search = 0.031, Fi_start = 0.3, H_max = 18000, H_min = -1, diff --git a/_G/rockets/AT_6.lua b/_G/rockets/AT_6.lua index b8faad89..7543b7ce 100644 --- a/_G/rockets/AT_6.lua +++ b/_G/rockets/AT_6.lua @@ -1,41 +1,152 @@ _G["rockets"]["#Index"] = { - Cx_pil = 2, - D_max = 5000, + Cx_pil = 0, + D_max = 6000, D_min = 800, Damage = 18, - Diam = 126, + Diam = 130, Escort = 1, Fi_excort = 0.4, Fi_rak = 3.14152, Fi_search = 99.9, Fi_start = 0.1, - H_max = 8000, + H_max = 4000, H_min = -1, H_min_t = 0, Head_Form = 1, Head_Type = 7, KillDistance = 0, Life_Time = 30, - M = 40, + M = 35.4, Mach_max = 1.8, Name = "Redacted", Nr_max = 1.2, OmViz_max = 99.9, - Range_max = 5000, + Range_max = 6000, Reflection = 0.03, X_back = -0.922, Y_back = 0, Z_back = 0, - display_name = "AT-6", - display_name_short = "9M114 Shturm", - exhaust = { 0.63, 0.67, 0.75, 0.1 }, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", + _origin = "AircraftWeaponPack", + autopilot = { + Kd = 0.036, + Ki = 0.056, + Kp = 0.062, + delay = 0.7, + fins_discreet = 0.08, + fins_limit = 1, + max_ctrl_angle = 1.15, + no_ctrl_center_ang = 2e-05, + op_time = 18, + self_destruct_command_timer = 3, + self_destruct_maneuver = 1, + self_destruct_maneuver_cmd_y = 0.3, + self_destruct_maneuver_cmd_z = 0.6, + self_destruct_no_signal_lim = 0.5, + self_destruct_start_timer = 18 + }, + booster = { + custom_smoke_dissipation_factor = 0.5, + fuel_mass = 1, + impulse = 220, + nozzle_position = { { -0.92, 0, 0 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.8, + tail_width = 0.13, + work_time = 0.05 + }, + category = 2, + class_name = "wAmmunitionVikhr", + display_name = "9M114 Shturm-V (AT-6 Spiral)", + eng_err = { + max_time_interval = 1, + min_time_interval = 0.1, + y_error = 0, + z_error = 0.1 + }, + fm = { + A = 0.6, + I = 9.879255, + L = 1.83, + Ma = 2, + Mw = 5, + Sw = 0.12, + caliber = 0.13, + cx_coeff = { 1, 1.5, 1.2, 0.2, 1.3 }, + dCydA = { 0.024, 0.018 }, + finsTau = 0.05, + freq = 4, + mass = 35.4, + maxAoa = 0.2 + }, + fuze_proximity = { + arm_delay = 0.8, + ignore_inp_armed = 0, + radius = 0 + }, + march = { + custom_smoke_dissipation_factor = 1, + fuel_mass = 6.46, + impulse = 240, + nozzle_orientationXYZ = { { 0, -0.2, 0 }, { 0, 0.2, 0 } }, + nozzle_position = { { -0.515, 0, 0.07 }, { -0.515, 0, -0.07 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.01, + tail_width = 0.06, + work_time = 2 + }, + march2 = { + custom_smoke_dissipation_factor = 1, + fuel_mass = 2.94, + impulse = 250, + nozzle_orientationXYZ = { { 0, -0.2, 0 }, { 0, 0.2, 0 } }, + nozzle_position = { { -0.515, 0, 0.07 }, { -0.515, 0, -0.07 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.01, + tail_width = 0.06, + work_time = 3 + }, + march_smoke = { + custom_smoke_dissipation_factor = 1, + fuel_mass = 0.6, + impulse = 0.5, + nozzle_orientationXYZ = { { 0, -0.2, 0.15 }, { 0, 0.2, 0 } }, + nozzle_position = { { -0.515, 0, 0.07 }, { -0.515, 0, -0.07 } }, + smoke_color = { 0.1, 0.1, 0.1 }, + smoke_transparency = 0.01, + tail_width = 0.13, + work_time = 0.5 + }, + model = "9M114", name = "AT_6", + scheme = "shturm_new", + shape_table_data = { { + file = "9M114", + index = "Redacted", + name = "AT_6", + username = "AT-6" + } }, sigma = { 4, 4, 4 }, + spiral_nav = { + def_cone_max_dist = 6500, + def_cone_near_rad = 1000, + def_cone_near_rad_st = 0, + def_cone_time_stab_rad = 0, + gb_angle = 0.0036, + gb_max_retW = 0.4, + gb_min_dist = 3200, + gb_ret_Kp = 1.1, + gb_use_time = 5.3, + t_cone_near_rad = 1000 + }, t_acc = 5, t_b = 0, t_marsh = 0, + user_name = "9M114 Shturm-V (AT-6 Spiral)", v_mid = 300, v_min = 170, warhead = "_G/warheads/AT_6.lua", - ws_type = { 4, 4, 8, "Redacted" } + warhead_air = "_G/warheads/AT_6.lua", + wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, + ws_type =
} \ No newline at end of file diff --git a/_G/rockets/CATM_9M.lua b/_G/rockets/CATM_9M.lua index a4e33f8e..5a497162 100644 --- a/_G/rockets/CATM_9M.lua +++ b/_G/rockets/CATM_9M.lua @@ -36,6 +36,14 @@ _G["rockets"]["#Index"] = { display_name = "CATM-9M", exhaust = { 0.7, 0.7, 0.7, 0.08 }, name = "CATM_9M", + shape_table_data = { { + file = "catm-9", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "CATM-9M", + username = "CATM-9M" + } }, sigma = { 3, 3, 3 }, t_acc = 5, t_b = 0, diff --git a/_G/rockets/GAR-8.lua b/_G/rockets/GAR-8.lua index 9ceb92e0..068d69a7 100644 --- a/_G/rockets/GAR-8.lua +++ b/_G/rockets/GAR-8.lua @@ -5,9 +5,9 @@ _G["rockets"]["#Index"] = { Damage = 25, Diam = 127, Escort = 0, - Fi_excort = 0.79, - Fi_rak = 3.14152, - Fi_search = 0.09, + Fi_excort = 0.44, + Fi_rak = 1.1, + Fi_search = 0.044, Fi_start = 0.3, H_max = 18000, H_min = -1, diff --git a/_G/rockets/P_27P.lua b/_G/rockets/P_27P.lua index 53939f3b..1e6efb86 100644 --- a/_G/rockets/P_27P.lua +++ b/_G/rockets/P_27P.lua @@ -24,8 +24,8 @@ _G["rockets"]["#Index"] = { OmViz_max = 0.35, Range_max = 35000, Reflection = 0.08, - X_back = -1.34, - Y_back = -0.128, + X_back = -2.15, + Y_back = 0, Z_back = 0, _unique_resource_name = "weapons.missiles.P_27P", ccm_k0 = 0.5, diff --git a/_G/rockets/P_27PE.lua b/_G/rockets/P_27PE.lua index aaff9d70..32d1cedb 100644 --- a/_G/rockets/P_27PE.lua +++ b/_G/rockets/P_27PE.lua @@ -24,8 +24,8 @@ _G["rockets"]["#Index"] = { OmViz_max = 0.35, Range_max = 60000, Reflection = 0.09, - X_back = -2, - Y_back = -0.128, + X_back = -2.55, + Y_back = 0, Z_back = 0, _unique_resource_name = "weapons.missiles.P_27PE", ccm_k0 = 0.5, diff --git a/_G/rockets/P_27T.lua b/_G/rockets/P_27T.lua index c824b057..ea9642bd 100644 --- a/_G/rockets/P_27T.lua +++ b/_G/rockets/P_27T.lua @@ -26,8 +26,8 @@ _G["rockets"]["#Index"] = { Reflection = 0.06, SeekerCooled = true, SeekerSensivityDistance = 25000, - X_back = -1.34, - Y_back = -0.128, + X_back = -2.05, + Y_back = 0, Z_back = 0, _unique_resource_name = "weapons.missiles.P_27T", ccm_k0 = 0.5, diff --git a/_G/rockets/P_27TE.lua b/_G/rockets/P_27TE.lua index cd4be85e..42d8b85d 100644 --- a/_G/rockets/P_27TE.lua +++ b/_G/rockets/P_27TE.lua @@ -26,8 +26,8 @@ _G["rockets"]["#Index"] = { Reflection = 0.07, SeekerCooled = true, SeekerSensivityDistance = 25000, - X_back = -2, - Y_back = -0.128, + X_back = -2.4, + Y_back = 0, Z_back = 0, _unique_resource_name = "weapons.missiles.P_27TE", ccm_k0 = 0.5, diff --git a/_G/rockets/P_60.lua b/_G/rockets/P_60.lua index 90ef7fc7..f886de88 100644 --- a/_G/rockets/P_60.lua +++ b/_G/rockets/P_60.lua @@ -3,24 +3,24 @@ _G["rockets"]["#Index"] = { D_max = 4000, D_min = 200, Damage = 8.75, - Diam = 130, + Diam = 120, Escort = 0, Fi_excort = 0.79, Fi_rak = 3.14152, Fi_search = 0.044, Fi_start = 0.35, - H_max = 28000, + H_max = 20000, H_min = -1, H_min_t = 1, Head_Form = 0, Head_Type = 1, KillDistance = 3, Life_Time = 20, - M = 44, + M = 43, Mach_max = 2.5, - ModelData = { 58, 0.2, 0.1, 0.1, 0.02, 0.05, 1.2, 1.2, 0.9, 0.8, 1.2, 0.29, 0, -1, -1, 4, 0, 0, 0, 1000000000, 0, 0, 2.6, 0, 0, 0, 0, 0, 0, 6250, 0, 0, 0, 0, 30, 25, 0, 0.3, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 14, -19, -2, 16000, 5000, 19000, 8000, 13000, 3000, 2500, 0.35, -0.01, 0.5 }, + ModelData = { 58, 0.2, 0.1, 0.1, 0.02, 0.05, 1.2, 1.2, 0.9, 0.8, 1.2, 0.29, 0, -1, -1, 4, 0, 0, 0, 1000000000, 0, 0, 2.6, 0, 0, 0, 0, 0, 0, 6250, 0, 0, 0, 0, 26, 20, 0, 0.35, 1000000000, 1000000000, 0, 80, 0, 1.19, 1, 2, 14, -19, -2, 16000, 5000, 19000, 8000, 13000, 3000, 2500, 0.35, -0.01, 0.5 }, Name = "Redacted", - Nr_max = 42, + Nr_max = 30, OmViz_max = 0.611, Range_max = 12000, Reflection = 0.03, diff --git a/_G/rockets/SA9M311.lua b/_G/rockets/SA9M311.lua index 029eb8c4..fb35e882 100644 --- a/_G/rockets/SA9M311.lua +++ b/_G/rockets/SA9M311.lua @@ -31,14 +31,14 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SA9M311", ccm_k0 = 0.5, display_name = "9M311 Tunguska (SA-19 Grison)", - effect_max_length = 1300, - exhaust = { 0.7, 0.7, 0.7, 0.4 }, + effect_max_length = 10000, + exhaust = { 0.7, 0.7, 0.7, 0.5 }, name = "SA9M311", sigma = { 10, 10, 10 }, t_acc = 2, t_b = 0, t_marsh = 0, - tail_scale = 0.6, + tail_scale = 1, v_mid = 600, v_min = 170, warhead = "_G/warheads/SA9M311.lua", diff --git a/_G/rockets/YJ-12.lua b/_G/rockets/YJ-12.lua index c2d070a5..ac4b3857 100644 --- a/_G/rockets/YJ-12.lua +++ b/_G/rockets/YJ-12.lua @@ -54,7 +54,9 @@ _G["rockets"]["#Index"] = { fins_limit_x = 0.43633231299858, fins_q_div = 1, glide_height = 5000, + glide_height_eq_error = 0.5, hor_err_limit = 0.5, + inertial_km_error = 2, integr_val_limit = 0.5, max_climb_ang_hdiff = 200, max_climb_angle = 0.17453292519943, diff --git a/_G/warheads/P_60.lua b/_G/warheads/P_60.lua index 72ab84cf..c4be8464 100644 --- a/_G/warheads/P_60.lua +++ b/_G/warheads/P_60.lua @@ -1,5 +1,5 @@ _G["warheads"]["P_60"] = { - caliber = 130, + caliber = 120, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, cumulative_factor = 0, diff --git a/_G/weapons_table/aircraft_gunpods/KORD_12_7_MI24.lua b/_G/weapons_table/aircraft_gunpods/KORD_12_7_MI24_L.lua similarity index 94% rename from _G/weapons_table/aircraft_gunpods/KORD_12_7_MI24.lua rename to _G/weapons_table/aircraft_gunpods/KORD_12_7_MI24_L.lua index b2976531..576055a0 100644 --- a/_G/weapons_table/aircraft_gunpods/KORD_12_7_MI24.lua +++ b/_G/weapons_table/aircraft_gunpods/KORD_12_7_MI24_L.lua @@ -1,7 +1,7 @@ -_G["weapons_table"]["aircraft_gunpods"]["KORD_12_7_MI24"] = { - _unique_resource_name = "weapons.gunmounts.KORD_12_7_MI24", - display_name = "KORD_12_7_MI24", - gunpod_name = "KORD_12_7_MI24", +_G["weapons_table"]["aircraft_gunpods"]["KORD_12_7_MI24_L"] = { + _unique_resource_name = "weapons.gunmounts.KORD_12_7_MI24_L", + display_name = "KORD_12_7_MI24_L", + gunpod_name = "KORD_12_7_MI24_L", mounts = { { aft_gun_mount = false, azimuth_initial = 0, @@ -176,7 +176,7 @@ _G["weapons_table"]["aircraft_gunpods"]["KORD_12_7_MI24"] = { name = "KORD_side_gun" } } }, - name = "KORD_12_7_MI24", - short_name = "KORD_12_7_MI24", + name = "KORD_12_7_MI24_L", + short_name = "KORD_12_7_MI24_L", ws_type = "Redacted" } \ No newline at end of file diff --git a/_G/weapons_table/aircraft_gunpods/KORD_12_7_MI24_R.lua b/_G/weapons_table/aircraft_gunpods/KORD_12_7_MI24_R.lua new file mode 100644 index 00000000..06091157 --- /dev/null +++ b/_G/weapons_table/aircraft_gunpods/KORD_12_7_MI24_R.lua @@ -0,0 +1,182 @@ +_G["weapons_table"]["aircraft_gunpods"]["KORD_12_7_MI24_R"] = { + _unique_resource_name = "weapons.gunmounts.KORD_12_7_MI24_R", + display_name = "KORD_12_7_MI24_R", + gunpod_name = "KORD_12_7_MI24_R", + mounts = { { + aft_gun_mount = false, + azimuth_initial = 0, + barrel_circular_error = 0.0007, + display_name = "KORD-12.7", + drop_cartridge = 204, + effective_fire_distance = 1300, + effects = { { + arg = 46, + attenuation = 2, + duration = 0.05, + light_pos = { 0.5, 0, 0 }, + name = "FireEffect" + }, { + name = "SmokeEffect" + }, { + arg_v = 46, + full_load = 600, + name = "FeedBeltBox" + } }, + ejector_dir = { 3, 0, 0 }, + ejector_pos = { -1.2, 0, 0.05 }, + elevation_initial = 0, + gun = { + impulse_vec_rot = { + x = 0, + y = 0, + z = 0 + }, + max_burst_length = 7, + rates = { 600 }, + recoil_coeff = 0.65, + trigger = { + name = "GunTrigger" + } + }, + muzzle_pos = { 3.11, -1.2, 0 }, + muzzle_pos_connector = "POINT_MGUN", + short_name = "KORD_12_7", + supply = { + count = 600, + get_mass = , + get_mass_ = , + mixes = { { 1, 2 } }, + reload_arg = 500, + reload_every = 50, + reload_time = 7, + shells = { { + AP_cap_caliber = 12.7, + Da0 = 0.00085, + Da1 = 0, + Dv0 = 0.008, + _unique_resource_name = "weapons.shells.YakB_12_7_T", + caliber = 12.7, + cartridge = 0, + cartridge_mass = 0, + charTime = 0, + cumulative_mass = 0, + cumulative_thickness = 0, + cx = { 0.5, 0.61, 0.8, 0.27, 1.9 }, + damage_factor = 639, + display_name = "12.7mm", + explosive = 0, + full_scale_time = -1, + j = 0, + k1 = 1.2e-08, + l = 0, + life_time = 7, + mass = 0.048, + model_name = "tracer_bullet_green", + name = "YakB_12_7_T", + payload = 0, + piercing_mass = 0.048, + rebound_concrete = <1>{ + angle0 = 50, + angle100 = 75, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_ground = { + angle0 = 55, + angle100 = 73, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_object =
, + rebound_water = { + angle0 = 65, + angle100 = 83, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rotation_freq = 7, + round_mass = 0.154, + s = 0, + silent_self_destruction = false, + smoke_tail_life_time = -1, + subcalibre = false, + tracer_off = 4, + tracer_on = 0, + type_name = "shell", + v0 = 810, + visual_effect_correction = 0, + visual_effect_correction_rebound = 0.1 + }, { + AP_cap_caliber = 12.7, + Da0 = 0.00085, + Da1 = 0, + Dv0 = 0.008, + _unique_resource_name = "weapons.shells.YakB_12_7", + caliber = 12.7, + cartridge = 0, + cartridge_mass = 0, + charTime = 0, + cumulative_mass = 0, + cumulative_thickness = 0, + cx = { 0.5, 0.61, 0.8, 0.27, 1.9 }, + damage_factor = 639, + display_name = "12.7mm", + explosive = 0, + full_scale_time = -1, + j = 0, + k1 = 1.2e-08, + l = 0, + life_time = 7, + mass = 0.048, + model_name = "tracer_bullet_green", + name = "YakB_12_7", + payload = 0, + piercing_mass = 0.048, + rebound_concrete = <2>{ + angle0 = 50, + angle100 = 75, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_ground = { + angle0 = 55, + angle100 = 73, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_object =
, + rebound_water = { + angle0 = 65, + angle100 = 83, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rotation_freq = 7, + round_mass = 0.154, + s = 0, + silent_self_destruction = false, + smoke_tail_life_time = -1, + subcalibre = false, + tracer_off = -100, + tracer_on = 0, + type_name = "shell", + v0 = 810, + visual_effect_correction = 0, + visual_effect_correction_rebound = 0.1 + } } + }, + supply_position = { 0, 0, 0 }, + turret = { + name = "KORD_side_gun" + } + } }, + name = "KORD_12_7_MI24_R", + short_name = "KORD_12_7_MI24_R", + ws_type = "Redacted" +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/bombs/GBU_24.lua b/_G/weapons_table/weapons/bombs/GBU_24.lua index e18664cf..8ada11e6 100644 --- a/_G/weapons_table/weapons/bombs/GBU_24.lua +++ b/_G/weapons_table/weapons/bombs/GBU_24.lua @@ -12,20 +12,19 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_24"] = { velK = 1 }, autopilot = { - K = 5, - Kd = 0, - Ki = 0, - Kix = 0, - Ks = 4, - Kw = 1, - Kx = 0, - PN_dist_data = { 2000, 1, 500, 1 }, - add_err_val = 0.02, - conv_input = 0, - delay = 1, - fins_limit = 0.43633231299858, - rotated_WLOS_input = 0, - w_limit = 0.087266462599716 + Kbias = 4, + Kd = 2, + Kdx = 0.2, + Ki = 10, + Kix = 0.8, + Knav = 4, + Kpitch = 2, + Tf = 0.2, + delay = 2, + fins_limit = 0.34906585039887, + fins_limit_x = 0.17453292519943, + null_roll = 0.78539816339745, + op_time = 100 }, fm = { A = 0.6, @@ -44,12 +43,13 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_24"] = { finsTau = 0.1, mass = 1087, maxAoa = 0.43633231299858, + model_roll = 0.78539816339745, wind_sigma = 0, wind_time = 1000 }, scheme = "schemes/bombs/bomb-paveway-III.sch", seeker = { - FOV = 0.5235987755983, + FOV = 1.5707963267949, delay = 0 }, warhead = { @@ -67,7 +67,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_24"] = { piercing_mass = 69.92 } }, - display_name = "GBU-24 Paveway III", + display_name = "GBU-24A/B Paveway III", mass = 1087, model = "GBU-24", name = "GBU_24", @@ -82,20 +82,19 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_24"] = { velK = 1 }, autopilot = { - K = 5, - Kd = 0, - Ki = 0, - Kix = 0, - Ks = 4, - Kw = 1, - Kx = 0, - PN_dist_data = { 2000, 1, 500, 1 }, - add_err_val = 0.02, - conv_input = 0, - delay = 1, - fins_limit = 0.43633231299858, - rotated_WLOS_input = 0, - w_limit = 0.087266462599716 + Kbias = 4, + Kd = 2, + Kdx = 0.2, + Ki = 10, + Kix = 0.8, + Knav = 4, + Kpitch = 2, + Tf = 0.2, + delay = 2, + fins_limit = 0.34906585039887, + fins_limit_x = 0.17453292519943, + null_roll = 0.78539816339745, + op_time = 100 }, fm = { A = 0.6, @@ -114,12 +113,13 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_24"] = { finsTau = 0.1, mass = 1087, maxAoa = 0.43633231299858, + model_roll = 0.78539816339745, wind_sigma = 0, wind_time = 1000 }, scheme = "schemes/bombs/bomb-paveway-III.sch", seeker = { - FOV = 0.5235987755983, + FOV = 1.5707963267949, delay = 0 }, warhead = { diff --git a/_G/weapons_table/weapons/missiles/AGM_154.lua b/_G/weapons_table/weapons/missiles/AGM_154.lua index 41ad632a..9a61f611 100644 --- a/_G/weapons_table/weapons/missiles/AGM_154.lua +++ b/_G/weapons_table/weapons/missiles/AGM_154.lua @@ -102,7 +102,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154"] = { }, display_name = "AGM-154C", mass = 485, - model = "agm-154", + model = "agm-154C", name = "AGM_154", server = { autopilot = { diff --git a/_G/weapons_table/weapons/missiles/AIM-7E.lua b/_G/weapons_table/weapons/missiles/AIM-7E.lua index 21b728e4..079cacb8 100644 --- a/_G/weapons_table/weapons/missiles/AIM-7E.lua +++ b/_G/weapons_table/weapons/missiles/AIM-7E.lua @@ -10,7 +10,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7E"] = { D_min = 1500, Diam = 203, Escort = 1, - Fi_excort = 1.05, + Fi_excort = 0.8, Fi_rak = 3.14152, Fi_search = 0.1, Fi_start = 0.4, @@ -59,6 +59,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7E"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, impulse = 250, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -116,6 +117,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7E"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 40, impulse = 250, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -133,14 +135,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7E"] = { rad_correction = 0, scheme = "schemes/missiles/aa_missile_semi_active.sch", seeker = { - FOV = 2.0943951023932, + FOV = 1.6057029118348, aim_sigma = 8, ccm_k0 = 2, delay = 2, height_error_k = 110, height_error_max_h = 450, height_error_max_vel = 150, - max_w_LOS = 0.34906585039887, + max_w_LOS = 0.26179938779915, op_time = 75, sens_far_dist = 30000, sens_near_dist = 100 @@ -198,7 +200,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7E"] = { D_min = 1500, Diam = 203, Escort = 1, - Fi_excort = 1.05, + Fi_excort = 0.8, Fi_rak = 3.14152, Fi_search = 0.1, Fi_start = 0.4, @@ -247,6 +249,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7E"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, impulse = 250, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -304,6 +307,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7E"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 40, impulse = 250, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -321,14 +325,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7E"] = { rad_correction = 0, scheme = "schemes/missiles/aa_missile_semi_active.sch", seeker = { - FOV = 2.0943951023932, + FOV = 1.6057029118348, aim_sigma = 8, ccm_k0 = 2, delay = 2, height_error_k = 110, height_error_max_h = 450, height_error_max_vel = 150, - max_w_LOS = 0.34906585039887, + max_w_LOS = 0.26179938779915, op_time = 75, sens_far_dist = 30000, sens_near_dist = 100 diff --git a/_G/weapons_table/weapons/missiles/AIM-7F.lua b/_G/weapons_table/weapons/missiles/AIM-7F.lua index c741e0fd..b542e5a2 100644 --- a/_G/weapons_table/weapons/missiles/AIM-7F.lua +++ b/_G/weapons_table/weapons/missiles/AIM-7F.lua @@ -10,7 +10,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7F"] = { D_min = 1500, Diam = 203, Escort = 1, - Fi_excort = 1.05, + Fi_excort = 0.96, Fi_rak = 3.14152, Fi_search = 0.1, Fi_start = 0.4, @@ -64,6 +64,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7F"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 38.48, impulse = 247, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -122,6 +123,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7F"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 21.82, impulse = 209, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -140,7 +142,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7F"] = { rad_correction = 0, scheme = "schemes/missiles/aa_missile_semi_active.sch", seeker = { - FOV = 2.0943951023932, + FOV = 1.9198621771938, aim_sigma = 5.5, ccm_k0 = 1, delay = 1.5, @@ -207,7 +209,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7F"] = { D_min = 1500, Diam = 203, Escort = 1, - Fi_excort = 1.05, + Fi_excort = 0.96, Fi_rak = 3.14152, Fi_search = 0.1, Fi_start = 0.4, @@ -261,6 +263,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7F"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 38.48, impulse = 247, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -319,6 +322,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7F"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 21.82, impulse = 209, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -337,7 +341,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7F"] = { rad_correction = 0, scheme = "schemes/missiles/aa_missile_semi_active.sch", seeker = { - FOV = 2.0943951023932, + FOV = 1.9198621771938, aim_sigma = 5.5, ccm_k0 = 1, delay = 1.5, diff --git a/_G/weapons_table/weapons/missiles/AIM-7MH.lua b/_G/weapons_table/weapons/missiles/AIM-7MH.lua index a46fcf5b..65d13702 100644 --- a/_G/weapons_table/weapons/missiles/AIM-7MH.lua +++ b/_G/weapons_table/weapons/missiles/AIM-7MH.lua @@ -65,6 +65,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7MH"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 38.48, impulse = 247, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -121,6 +122,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7MH"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 21.82, impulse = 209, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -260,6 +262,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7MH"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 38.48, impulse = 247, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -316,6 +319,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7MH"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 21.82, impulse = 209, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, diff --git a/_G/weapons_table/weapons/missiles/AIM-7P.lua b/_G/weapons_table/weapons/missiles/AIM-7P.lua new file mode 100644 index 00000000..6b9c4404 --- /dev/null +++ b/_G/weapons_table/weapons/missiles/AIM-7P.lua @@ -0,0 +1,402 @@ +_G["weapons_table"]["weapons"]["missiles"]["AIM-7P"] = { + Reflection = 0.05, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim7_family.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.missiles.AIM-7P", + caliber = 0.2, + client = { + Cx_pil = 2.21, + D_max = 20000, + D_min = 1500, + Diam = 203, + Escort = 1, + Fi_excort = 1.05, + Fi_rak = 3.14152, + Fi_search = 0.1, + Fi_start = 0.4, + H_max = 24400, + H_min = 1, + H_min_t = 15, + Head_Form = 1, + Head_Type = 6, + KillDistance = 12, + Life_Time = 90, + M = 231, + Mach_max = 3.2, + ModelData = { 58, 0.9, 0.0125, 0.052, 0.01, 0.002, 0.5, 1.2, 2.2, 1.05, 1.2, 0.18, 0, -1, -1, 3.7, 10.8, 0, 0, 1000000000, 0, 0, 10.4, 2.02, 0, 0, 0, 0, 0, 25192, 4140, 0, 0, 0, 1000000000, 75, 0, 1.5, 5000, 15000, 0.1, 50, 0, 1.19, 1, 2, 14, -21, -2.2, 27000, 7000, 38000, 12000, 19000, 5000, 2500, 0.4, -0.014, 0.5 }, + Nr_max = 25, + OmViz_max = 0.35, + PN_coeffs = { 2, 5000, 1, 15000, 0.4 }, + Range_max = 50000, + Reflection = 0.08, + X_back = -2, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim7_family.lua", + _origin = "AircraftWeaponPack", + autopilot = { + Areq_limit = 25, + Kconv = 4, + Kd = 0.4, + Ki = 0.1, + Knv = 0.02, + Kout = 1, + Krx = 2, + Kx = 0.1, + PN_dist_data = { 15000, 1, 9000, 1 }, + alg = 0, + bang_bang = 0, + delay = 1.5, + fins_limit = 0.34906585039887, + fins_limit_x = 0.087266462599716, + loft_active_by_default = 1, + loft_add_pitch = 0.5235987755983, + loft_max_dist = 20000, + loft_min_dist = 6500, + loft_time = 3.5, + max_side_N = 10, + max_signal_Fi = 0.20943951023932, + null_roll = 0.78539816339745, + op_time = 75, + rotate_fins_output = 0, + x_channel_delay = 0.9 + }, + boost = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 38.48, + impulse = 247, + nozzle_exit_area = 0.00724, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.9, 0, 0 } }, + smoke_color = { 1, 1, 1 }, + smoke_transparency = 0.9, + tail_width = 0.4, + work_time = 3.7 + }, + category = 4, + ccm_k0 = 0.5, + class_name = "wAmmunitionSelfHoming", + controller = { + boost_start = 0.5, + march_start = 4.2 + }, + displayName = "AIM-7P Sparrow Semi-Active Radar", + exhaust = { 0.78, 0.78, 0.78, 0.3 }, + fm = { + A1trim = { 10, 10 }, + A2trim = { 10, 10 }, + Cx0 = { 0.34, 0.34, 0.34, 0.34, 0.35, 1.1, 1.27, 1.23, 1.19, 1.12, 1.05, 1, 0.95, 0.91, 0.87, 0.84, 0.81, 0.78, 0.76, 0.74, 0.72 }, + CxB = { 0.11, 0.11, 0.11, 0.11, 0.11, 0.18, 0.19, 0.17, 0.16, 0.14, 0.13, 0.12, 0.12, 0.11, 0.11, 0.1, 0.09, 0.09, 0.08, 0.08, 0.07 }, + Cya = { 1.14, 1.14, 1.14, 1.14, 1.14, 1.42, 1.46, 1.39, 1.32, 1.15, 1.06, 1, 0.94, 0.89, 0.83, 0.78, 0.73, 0.69, 0.65, 0.61, 0.57 }, + Cza = { 1.14, 1.14, 1.14, 1.14, 1.14, 1.42, 1.46, 1.39, 1.32, 1.15, 1.06, 1, 0.94, 0.89, 0.83, 0.78, 0.73, 0.69, 0.65, 0.61, 0.57 }, + Ix = 3.5, + Iy = 127.4, + Iz = 127.4, + K1 = { 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0052, 0.0048, 0.0045, 0.0041, 0.0037, 0.0036, 0.0034, 0.0032, 0.0031, 0.003, 0.0029, 0.0027, 0.0026 }, + K2 = { 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0051, 0.0047, 0.0043, 0.0037, 0.0031, 0.0032, 0.0033, 0.0035, 0.0036, 0.0037, 0.0038, 0.0039, 0.004 }, + L = 0.2, + Mxd = 17.19, + Mxw = -44.5, + Mya = { -0.5, -0.5 }, + Myw = { -2, -2 }, + Mza = { -0.5, -0.5 }, + Mzw = { -2, -2 }, + S = 0.0324, + caliber = 0.2, + delta_max = 0.34906585039887, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 1, + mass = 231, + 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 + }, + hoj = 1, + loft = 1, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 21.82, + impulse = 209, + nozzle_exit_area = 0.00724, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.9, 0, 0 } }, + smoke_color = { 1, 1, 1 }, + smoke_transparency = 0.9, + tail_width = 0.4, + work_time = 10.8 + }, + mass = 231, + model = "aim-7", + name = "AIM-7P", + nozzle_exit_area = 0.007238, + proximity_fuze = { + arm_delay = 1.6, + radius = 12 + }, + scheme = "schemes/missiles/aa_missile_semi_active.sch", + seeker = { + FOV = 2.0943951023932, + aim_sigma = 5.5, + ccm_k0 = 0.5, + delay = 1.5, + height_error_k = 100, + height_error_max_h = 300, + height_error_max_vel = 138, + hoj = 1, + max_w_LOS = 0.34906585039887, + op_time = 75, + rad_correction = 1, + sens_far_dist = 60000, + sens_near_dist = 100 + }, + shape_table_data = { { + file = "aim-7", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "aim_7_P", + username = "AIM-7P" + } }, + sigma = { 5.6, 5, 5.6 }, + supersonic_A_coef_skew = 0.25, + t_acc = 3.3, + t_b = 0.5, + t_marsh = 11, + user_name = "AIM-7P", + v_mid = 500, + v_min = 140, + warhead = { + caliber = 203, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 39, + fantom = 1, + mass = 39, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 7.8 + }, + warhead_air = { + caliber = 203, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 39, + fantom = 1, + mass = 39, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 7.8 + }, + wsTypeOfWeapon = { 4, 4, 7, "Redacted" } + }, + display_name = "AIM-7P", + mass = 231, + model = "aim-7", + name = "AIM-7P", + server = { + Cx_pil = 2.21, + D_max = 20000, + D_min = 1500, + Diam = 203, + Escort = 1, + Fi_excort = 1.05, + Fi_rak = 3.14152, + Fi_search = 0.1, + Fi_start = 0.4, + H_max = 24400, + H_min = 1, + H_min_t = 15, + Head_Form = 1, + Head_Type = 6, + KillDistance = 12, + Life_Time = 90, + M = 231, + Mach_max = 3.2, + ModelData = { 58, 0.9, 0.0125, 0.052, 0.01, 0.002, 0.5, 1.2, 2.2, 1.05, 1.2, 0.18, 0, -1, -1, 3.7, 10.8, 0, 0, 1000000000, 0, 0, 10.4, 2.02, 0, 0, 0, 0, 0, 25192, 4140, 0, 0, 0, 1000000000, 75, 0, 1.5, 5000, 15000, 0.1, 50, 0, 1.19, 1, 2, 14, -21, -2.2, 27000, 7000, 38000, 12000, 19000, 5000, 2500, 0.4, -0.014, 0.5 }, + Nr_max = 25, + OmViz_max = 0.35, + PN_coeffs = { 2, 5000, 1, 15000, 0.4 }, + Range_max = 50000, + Reflection = 0.08, + X_back = -2, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim7_family.lua", + _origin = "AircraftWeaponPack", + autopilot = { + Areq_limit = 25, + Kconv = 4, + Kd = 0.4, + Ki = 0.1, + Knv = 0.02, + Kout = 1, + Krx = 2, + Kx = 0.1, + PN_dist_data = { 15000, 1, 9000, 1 }, + alg = 0, + bang_bang = 0, + delay = 1.5, + fins_limit = 0.34906585039887, + fins_limit_x = 0.087266462599716, + loft_active_by_default = 1, + loft_add_pitch = 0.5235987755983, + loft_max_dist = 20000, + loft_min_dist = 6500, + loft_time = 3.5, + max_side_N = 10, + max_signal_Fi = 0.20943951023932, + null_roll = 0.78539816339745, + op_time = 75, + rotate_fins_output = 0, + x_channel_delay = 0.9 + }, + boost = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 38.48, + impulse = 247, + nozzle_exit_area = 0.00724, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.9, 0, 0 } }, + smoke_color = { 1, 1, 1 }, + smoke_transparency = 0.9, + tail_width = 0.4, + work_time = 3.7 + }, + category = 4, + ccm_k0 = 0.5, + class_name = "wAmmunitionSelfHoming", + controller = { + boost_start = 0.5, + march_start = 4.2 + }, + displayName = "AIM-7P Sparrow Semi-Active Radar", + exhaust = { 0.78, 0.78, 0.78, 0.3 }, + fm = { + A1trim = { 10, 10 }, + A2trim = { 10, 10 }, + Cx0 = { 0.34, 0.34, 0.34, 0.34, 0.35, 1.1, 1.27, 1.23, 1.19, 1.12, 1.05, 1, 0.95, 0.91, 0.87, 0.84, 0.81, 0.78, 0.76, 0.74, 0.72 }, + CxB = { 0.11, 0.11, 0.11, 0.11, 0.11, 0.18, 0.19, 0.17, 0.16, 0.14, 0.13, 0.12, 0.12, 0.11, 0.11, 0.1, 0.09, 0.09, 0.08, 0.08, 0.07 }, + Cya = { 1.14, 1.14, 1.14, 1.14, 1.14, 1.42, 1.46, 1.39, 1.32, 1.15, 1.06, 1, 0.94, 0.89, 0.83, 0.78, 0.73, 0.69, 0.65, 0.61, 0.57 }, + Cza = { 1.14, 1.14, 1.14, 1.14, 1.14, 1.42, 1.46, 1.39, 1.32, 1.15, 1.06, 1, 0.94, 0.89, 0.83, 0.78, 0.73, 0.69, 0.65, 0.61, 0.57 }, + Ix = 3.5, + Iy = 127.4, + Iz = 127.4, + K1 = { 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0056, 0.0052, 0.0048, 0.0045, 0.0041, 0.0037, 0.0036, 0.0034, 0.0032, 0.0031, 0.003, 0.0029, 0.0027, 0.0026 }, + K2 = { 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0055, 0.0051, 0.0047, 0.0043, 0.0037, 0.0031, 0.0032, 0.0033, 0.0035, 0.0036, 0.0037, 0.0038, 0.0039, 0.004 }, + L = 0.2, + Mxd = 17.19, + Mxw = -44.5, + Mya = { -0.5, -0.5 }, + Myw = { -2, -2 }, + Mza = { -0.5, -0.5 }, + Mzw = { -2, -2 }, + S = 0.0324, + caliber = 0.2, + delta_max = 0.34906585039887, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 1, + mass = 231, + 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 + }, + hoj = 1, + loft = 1, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 21.82, + impulse = 209, + nozzle_exit_area = 0.00724, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.9, 0, 0 } }, + smoke_color = { 1, 1, 1 }, + smoke_transparency = 0.9, + tail_width = 0.4, + work_time = 10.8 + }, + mass = 231, + model = "aim-7", + name = "AIM-7P", + nozzle_exit_area = 0.007238, + proximity_fuze = { + arm_delay = 1.6, + radius = 12 + }, + scheme = "schemes/missiles/aa_missile_semi_active.sch", + seeker = { + FOV = 2.0943951023932, + aim_sigma = 5.5, + ccm_k0 = 0.5, + delay = 1.5, + height_error_k = 100, + height_error_max_h = 300, + height_error_max_vel = 138, + hoj = 1, + max_w_LOS = 0.34906585039887, + op_time = 75, + rad_correction = 1, + sens_far_dist = 60000, + sens_near_dist = 100 + }, + shape_table_data = { { + file = "aim-7", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "aim_7_P", + username = "AIM-7P" + } }, + sigma = { 5.6, 5, 5.6 }, + supersonic_A_coef_skew = 0.25, + t_acc = 3.3, + t_b = 0.5, + t_marsh = 11, + user_name = "AIM-7P", + v_mid = 500, + v_min = 140, + warhead = { + caliber = 203, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 39, + fantom = 0, + mass = 39, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 7.8 + }, + warhead_air = { + caliber = 203, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 39, + fantom = 0, + mass = 39, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 7.8 + }, + wsTypeOfWeapon = { 4, 4, 7, "Redacted" } + }, + sounderName = "Weapons/Missile", + type_name = "missile", + ws_type = { 4, 4, 7, "Redacted" } +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/AIM_120.lua b/_G/weapons_table/weapons/missiles/AIM_120.lua index 3bbc5471..507d015e 100644 --- a/_G/weapons_table/weapons/missiles/AIM_120.lua +++ b/_G/weapons_table/weapons/missiles/AIM_120.lua @@ -1,8 +1,39 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { - Reflection = 0.07, + Reflection = 0.05, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.AIM_120", caliber = 0.178, client = { + Cx_pil = 2.5, + D_max = 14000, + D_min = 700, + Diam = 169, + Escort = 0, + Fi_excort = 1.05, + Fi_rak = 3.14152, + Fi_search = 1.05, + Fi_start = 0.88, + H_max = 20000, + H_min = 1, + H_min_t = 3, + Head_Form = 1, + Head_Type = 2, + KillDistance = 15, + Life_Time = 90, + M = 157.85, + Mach_max = 4, + ModelData = { 58, 0.5, 0.026, 0.053, 0.01, -0.245, 0.075, 0.7, 1.5, 0.6, 1.2, 0.5, 0, -1, -1, 4, 4, 0, 0, 1000000000, 0, 0, 7.69, 3.94, 0, 0, 0, 0, 0, 19600, 10045, 0, 0, 0, 1000000000, 80, 0, 1, 25000, 15000, 0.52356, 50, 0, 1.19, 1, 2, 21, -25, -3, 33000, 10000, 65000, 19500, 21500, 6500, 3000, 0.4, -0.015, 0.5 }, + Nr_max = 30, + OmViz_max = 0.52, + PN_gain = 4, + Range_max = 57000, + Reflection = 0.07, + X_back = -1.99, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", + _origin = "AircraftWeaponPack", actuator = { D = 250, T1 = 0.002, @@ -47,10 +78,15 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { tail_width = 0.4, work_time = 2.1 }, + category = 4, + ccm_k0 = 0.2, + class_name = "wAmmunitionSelfHoming", controller = { boost_start = 0.5, march_start = 2.6 }, + displayName = "AIM-120B AMRAAM - Active Radar AAM", + exhaust = { 0.8, 0.8, 0.8, 0.05 }, fm = { A1trim = { 24, 24, 24, 24, 23.5, 23, 25.16, 27.23, 29.04, 30.6, 31.93, 33.08, 34.07, 34.95, 35.74, 36.45, 37.09, 37.68, 38.2, 38.66, 39.06, 39.39, 39.66, 39.85, 39.96, 40 }, A2trim = { 24, 24, 24, 24, 23.5, 23, 25.16, 27.23, 29.04, 30.6, 31.93, 33.08, 34.07, 34.95, 35.74, 36.45, 37.09, 37.68, 38.2, 38.66, 39.06, 39.39, 39.66, 39.85, 39.96, 40 }, @@ -93,6 +129,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { tracking_gain = 50, yaw_max = 1.0471975511966 }, + hoj = 1, + loft = 1, + loft_factor = 4.5, march = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 28.33, @@ -105,6 +144,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { tail_width = 0.4, work_time = 5 }, + model = "aim-120b", + name = "AIM_120", + nozzle_exit_area = 0.011, proximity_fuze = { arm_delay = 1.6, radius = 7 @@ -124,6 +166,22 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { sens_far_dist = 30000, sens_near_dist = 100 }, + shape_table_data = { { + file = "aim-120b", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "AIM-120B", + username = "AIM-120B" + } }, + sigma = { 5, 5, 5 }, + supersonic_A_coef_skew = 0.1, + t_acc = 3, + t_b = 0.5, + t_marsh = 5, + user_name = "AIM-120B", + v_mid = 700, + v_min = 140, warhead = { caliber = 169, concrete_factors = { 1, 1, 1 }, @@ -149,13 +207,43 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 3.74 - } + }, + wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "AIM-120B", mass = 157.85, model = "aim-120b", name = "AIM_120", server = { + Cx_pil = 2.5, + D_max = 14000, + D_min = 700, + Diam = 169, + Escort = 0, + Fi_excort = 1.05, + Fi_rak = 3.14152, + Fi_search = 1.05, + Fi_start = 0.88, + H_max = 20000, + H_min = 1, + H_min_t = 3, + Head_Form = 1, + Head_Type = 2, + KillDistance = 15, + Life_Time = 90, + M = 157.85, + Mach_max = 4, + ModelData = { 58, 0.5, 0.026, 0.053, 0.01, -0.245, 0.075, 0.7, 1.5, 0.6, 1.2, 0.5, 0, -1, -1, 4, 4, 0, 0, 1000000000, 0, 0, 7.69, 3.94, 0, 0, 0, 0, 0, 19600, 10045, 0, 0, 0, 1000000000, 80, 0, 1, 25000, 15000, 0.52356, 50, 0, 1.19, 1, 2, 21, -25, -3, 33000, 10000, 65000, 19500, 21500, 6500, 3000, 0.4, -0.015, 0.5 }, + Nr_max = 30, + OmViz_max = 0.52, + PN_gain = 4, + Range_max = 57000, + Reflection = 0.07, + X_back = -1.99, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", + _origin = "AircraftWeaponPack", actuator = { D = 250, T1 = 0.002, @@ -200,10 +288,15 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { tail_width = 0.4, work_time = 2.1 }, + category = 4, + ccm_k0 = 0.2, + class_name = "wAmmunitionSelfHoming", controller = { boost_start = 0.5, march_start = 2.6 }, + displayName = "AIM-120B AMRAAM - Active Radar AAM", + exhaust = { 0.8, 0.8, 0.8, 0.05 }, fm = { A1trim = { 24, 24, 24, 24, 23.5, 23, 25.16, 27.23, 29.04, 30.6, 31.93, 33.08, 34.07, 34.95, 35.74, 36.45, 37.09, 37.68, 38.2, 38.66, 39.06, 39.39, 39.66, 39.85, 39.96, 40 }, A2trim = { 24, 24, 24, 24, 23.5, 23, 25.16, 27.23, 29.04, 30.6, 31.93, 33.08, 34.07, 34.95, 35.74, 36.45, 37.09, 37.68, 38.2, 38.66, 39.06, 39.39, 39.66, 39.85, 39.96, 40 }, @@ -246,6 +339,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { tracking_gain = 50, yaw_max = 1.0471975511966 }, + hoj = 1, + loft = 1, + loft_factor = 4.5, march = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 28.33, @@ -258,6 +354,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { tail_width = 0.4, work_time = 5 }, + model = "aim-120b", + name = "AIM_120", + nozzle_exit_area = 0.011, proximity_fuze = { arm_delay = 1.6, radius = 7 @@ -277,6 +376,22 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { sens_far_dist = 30000, sens_near_dist = 100 }, + shape_table_data = { { + file = "aim-120b", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "AIM-120B", + username = "AIM-120B" + } }, + sigma = { 5, 5, 5 }, + supersonic_A_coef_skew = 0.1, + t_acc = 3, + t_b = 0.5, + t_marsh = 5, + user_name = "AIM-120B", + v_mid = 700, + v_min = 140, warhead = { caliber = 169, concrete_factors = { 1, 1, 1 }, @@ -302,7 +417,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 3.74 - } + }, + wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, sounderName = "Weapons/Missile", type_name = "missile", diff --git a/_G/weapons_table/weapons/missiles/AIM_120C.lua b/_G/weapons_table/weapons/missiles/AIM_120C.lua index d7ae327c..f82a8e89 100644 --- a/_G/weapons_table/weapons/missiles/AIM_120C.lua +++ b/_G/weapons_table/weapons/missiles/AIM_120C.lua @@ -1,8 +1,39 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { - Reflection = 0.07, + Reflection = 0.05, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.AIM_120C", caliber = 0.178, client = { + Cx_pil = 2.5, + D_max = 16000, + D_min = 700, + Diam = 160, + Escort = 0, + Fi_excort = 1.05, + Fi_rak = 3.14152, + Fi_search = 1.05, + Fi_start = 0.88, + H_max = 26000, + H_min = 1, + H_min_t = 1, + Head_Form = 1, + Head_Type = 2, + KillDistance = 15, + Life_Time = 90, + M = 161.48, + Mach_max = 4, + ModelData = { 58, 0.4, 0.029, 0.06, 0.01, -0.245, 0.08, 0.7, 1.4, 0.6, 1.2, 0.5, 0, -1, -1, 8, 0, 0, 0, 1000000000, 0, 0, 6.41, 0, 0, 0, 0, 0, 0, 16325, 0, 0, 0, 0, 1000000000, 100, 0, 1, 25000, 15000, 0.52356, 50, 0, 1.19, 1, 2, 21, -23, -3, 35000, 12000, 75000, 21500, 25000, 7500, 4000, 0.4, -0.015, 0.5 }, + Nr_max = 30, + OmViz_max = 0.52, + PN_gain = 4, + Range_max = 61000, + Reflection = 0.07, + X_back = -1.98, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", + _origin = "AircraftWeaponPack", actuator = { D = 250, T1 = 0.002, @@ -33,7 +64,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { loft_off_range = 15000, loft_sin = 0.49996660034157, null_roll = 0.78539816339745, - op_time = 80 + op_time = 100 }, boost = { custom_smoke_dissipation_factor = 0.2, @@ -47,10 +78,15 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { tail_width = 0.4, work_time = 0.1 }, + category = 4, + ccm_k0 = 0.1, + class_name = "wAmmunitionSelfHoming", controller = { boost_start = 0, march_start = 0.5 }, + displayName = "AIM-120C AMRAAM - Active Radar AAM", + exhaust = { 0.8, 0.8, 0.8, 0.05 }, fm = { A1trim = { 28, 28, 28, 28, 28, 31.2, 32.74, 33.39, 33.7, 33.89, 34.04, 34.18, 34.31, 34.44, 34.57, 34.7, 34.83, 34.96, 35.09, 35.22, 35.35, 35.48, 35.61, 35.74, 35.87, 36 }, A2trim = { 28, 28, 28, 28, 28, 31.2, 32.74, 33.39, 33.7, 33.89, 34.04, 34.18, 34.31, 34.44, 34.57, 34.7, 34.83, 34.96, 35.09, 35.22, 35.35, 35.48, 35.61, 35.74, 35.87, 36 }, @@ -88,11 +124,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { gimbal = { delay = 0, max_tracking_rate = 0.5235987755983, - op_time = 95, + op_time = 100, pitch_max = 1.0471975511966, tracking_gain = 50, yaw_max = 1.0471975511966 }, + hoj = 1, + loft = 1, + loft_factor = 4.5, march = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 51.26, @@ -105,6 +144,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { tail_width = 0.4, work_time = 6.5 }, + model = "aim-120c", + name = "AIM_120C", + nozzle_exit_area = 0.011, proximity_fuze = { arm_delay = 1.6, radius = 7 @@ -120,10 +162,26 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { height_error_max_vel = 50, hoj = 1, max_w_LOS = 0.5235987755983, - op_time = 80, + op_time = 100, sens_far_dist = 30000, sens_near_dist = 100 }, + shape_table_data = { { + file = "aim-120c", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "AIM-120C", + username = "AIM-120C" + } }, + sigma = { 5, 5, 5 }, + supersonic_A_coef_skew = 0.1, + t_acc = 3, + t_b = 0.4, + t_marsh = 6, + user_name = "AIM-120C", + v_mid = 700, + v_min = 140, warhead = { caliber = 169, concrete_factors = { 1, 1, 1 }, @@ -149,13 +207,43 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 3.74 - } + }, + wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, - display_name = "AIM-120C-5", + display_name = "AIM-120C", mass = 161.48, model = "aim-120c", name = "AIM_120C", server = { + Cx_pil = 2.5, + D_max = 16000, + D_min = 700, + Diam = 160, + Escort = 0, + Fi_excort = 1.05, + Fi_rak = 3.14152, + Fi_search = 1.05, + Fi_start = 0.88, + H_max = 26000, + H_min = 1, + H_min_t = 1, + Head_Form = 1, + Head_Type = 2, + KillDistance = 15, + Life_Time = 90, + M = 161.48, + Mach_max = 4, + ModelData = { 58, 0.4, 0.029, 0.06, 0.01, -0.245, 0.08, 0.7, 1.4, 0.6, 1.2, 0.5, 0, -1, -1, 8, 0, 0, 0, 1000000000, 0, 0, 6.41, 0, 0, 0, 0, 0, 0, 16325, 0, 0, 0, 0, 1000000000, 100, 0, 1, 25000, 15000, 0.52356, 50, 0, 1.19, 1, 2, 21, -23, -3, 35000, 12000, 75000, 21500, 25000, 7500, 4000, 0.4, -0.015, 0.5 }, + Nr_max = 30, + OmViz_max = 0.52, + PN_gain = 4, + Range_max = 61000, + Reflection = 0.07, + X_back = -1.98, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", + _origin = "AircraftWeaponPack", actuator = { D = 250, T1 = 0.002, @@ -186,7 +274,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { loft_off_range = 15000, loft_sin = 0.49996660034157, null_roll = 0.78539816339745, - op_time = 80 + op_time = 100 }, boost = { custom_smoke_dissipation_factor = 0.2, @@ -200,10 +288,15 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { tail_width = 0.4, work_time = 0.1 }, + category = 4, + ccm_k0 = 0.1, + class_name = "wAmmunitionSelfHoming", controller = { boost_start = 0, march_start = 0.5 }, + displayName = "AIM-120C AMRAAM - Active Radar AAM", + exhaust = { 0.8, 0.8, 0.8, 0.05 }, fm = { A1trim = { 28, 28, 28, 28, 28, 31.2, 32.74, 33.39, 33.7, 33.89, 34.04, 34.18, 34.31, 34.44, 34.57, 34.7, 34.83, 34.96, 35.09, 35.22, 35.35, 35.48, 35.61, 35.74, 35.87, 36 }, A2trim = { 28, 28, 28, 28, 28, 31.2, 32.74, 33.39, 33.7, 33.89, 34.04, 34.18, 34.31, 34.44, 34.57, 34.7, 34.83, 34.96, 35.09, 35.22, 35.35, 35.48, 35.61, 35.74, 35.87, 36 }, @@ -241,11 +334,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { gimbal = { delay = 0, max_tracking_rate = 0.5235987755983, - op_time = 95, + op_time = 100, pitch_max = 1.0471975511966, tracking_gain = 50, yaw_max = 1.0471975511966 }, + hoj = 1, + loft = 1, + loft_factor = 4.5, march = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 51.26, @@ -258,6 +354,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { tail_width = 0.4, work_time = 6.5 }, + model = "aim-120c", + name = "AIM_120C", + nozzle_exit_area = 0.011, proximity_fuze = { arm_delay = 1.6, radius = 7 @@ -273,10 +372,26 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { height_error_max_vel = 50, hoj = 1, max_w_LOS = 0.5235987755983, - op_time = 80, + op_time = 100, sens_far_dist = 30000, sens_near_dist = 100 }, + shape_table_data = { { + file = "aim-120c", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "AIM-120C", + username = "AIM-120C" + } }, + sigma = { 5, 5, 5 }, + supersonic_A_coef_skew = 0.1, + t_acc = 3, + t_b = 0.4, + t_marsh = 6, + user_name = "AIM-120C", + v_mid = 700, + v_min = 140, warhead = { caliber = 169, concrete_factors = { 1, 1, 1 }, @@ -302,7 +417,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 3.74 - } + }, + wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, sounderName = "Weapons/Missile", type_name = "missile", diff --git a/_G/weapons_table/weapons/missiles/AIM_7.lua b/_G/weapons_table/weapons/missiles/AIM_7.lua index bf2a3ee0..c61fb1ef 100644 --- a/_G/weapons_table/weapons/missiles/AIM_7.lua +++ b/_G/weapons_table/weapons/missiles/AIM_7.lua @@ -65,6 +65,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_7"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 38.48, impulse = 247, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -120,6 +121,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_7"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 21.82, impulse = 209, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -260,6 +262,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_7"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 38.48, impulse = 247, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, @@ -315,6 +318,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_7"] = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 21.82, impulse = 209, + nozzle_exit_area = 0.00724, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -1.9, 0, 0 } }, smoke_color = { 1, 1, 1 }, diff --git a/_G/weapons_table/weapons/missiles/AT_6.lua b/_G/weapons_table/weapons/missiles/AT_6.lua index b88768e2..33ff2cbc 100644 --- a/_G/weapons_table/weapons/missiles/AT_6.lua +++ b/_G/weapons_table/weapons/missiles/AT_6.lua @@ -1,8 +1,36 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { - Reflection = 0.03, - _unique_resource_name = "weapons.missiles.AT_6", + Reflection = 0.05, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", + _origin = "AircraftWeaponPack", caliber = 0.13, client = { + Cx_pil = 0, + D_max = 6000, + D_min = 800, + Diam = 130, + Escort = 1, + Fi_excort = 0.4, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.1, + H_max = 4000, + H_min = -1, + H_min_t = 0, + Head_Form = 1, + Head_Type = 7, + KillDistance = 0, + Life_Time = 30, + M = 35.4, + Mach_max = 1.8, + Nr_max = 1.2, + OmViz_max = 99.9, + Range_max = 6000, + Reflection = 0.03, + X_back = -0.922, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", + _origin = "AircraftWeaponPack", autopilot = { Kd = 0.036, Ki = 0.056, @@ -30,6 +58,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { tail_width = 0.13, work_time = 0.05 }, + category = 2, + class_name = "wAmmunitionVikhr", eng_err = { max_time_interval = 1, min_time_interval = 0.1, @@ -89,7 +119,16 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { tail_width = 0.13, work_time = 0.5 }, + model = "9M114", + name = "AT_6", scheme = "schemes/missiles/shturm_new.sch", + shape_table_data = { { + file = "9M114", + index = "Redacted", + name = "AT_6", + username = "AT-6" + } }, + sigma = { 4, 4, 4 }, spiral_nav = { def_cone_max_dist = 6500, def_cone_near_rad = 1000, @@ -102,6 +141,12 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { gb_use_time = 5.3, t_cone_near_rad = 1000 }, + t_acc = 5, + t_b = 0, + t_marsh = 0, + user_name = "9M114 Shturm-V (AT-6 Spiral)", + v_mid = 300, + v_min = 170, warhead = { caliber = 130, concrete_factors = { 1, 1, 1 }, @@ -129,13 +174,41 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { other_factors = { 1, 1, 1 }, piercing_mass = 1.08, time_self_destruct = 20 - } + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, - display_name = "AT-6", - mass = 31, - model = "9m114", + display_name = "9M114 Shturm-V (AT-6 Spiral)", + mass = 35.4, + model = "9M114", name = "AT_6", server = { + Cx_pil = 0, + D_max = 6000, + D_min = 800, + Diam = 130, + Escort = 1, + Fi_excort = 0.4, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.1, + H_max = 4000, + H_min = -1, + H_min_t = 0, + Head_Form = 1, + Head_Type = 7, + KillDistance = 0, + Life_Time = 30, + M = 35.4, + Mach_max = 1.8, + Nr_max = 1.2, + OmViz_max = 99.9, + Range_max = 6000, + Reflection = 0.03, + X_back = -0.922, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", + _origin = "AircraftWeaponPack", autopilot = { Kd = 0.036, Ki = 0.056, @@ -163,6 +236,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { tail_width = 0.13, work_time = 0.05 }, + category = 2, + class_name = "wAmmunitionVikhr", eng_err = { max_time_interval = 1, min_time_interval = 0.1, @@ -222,7 +297,16 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { tail_width = 0.13, work_time = 0.5 }, + model = "9M114", + name = "AT_6", scheme = "schemes/missiles/shturm_new.sch", + shape_table_data = { { + file = "9M114", + index = "Redacted", + name = "AT_6", + username = "AT-6" + } }, + sigma = { 4, 4, 4 }, spiral_nav = { def_cone_max_dist = 6500, def_cone_near_rad = 1000, @@ -235,6 +319,12 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { gb_use_time = 5.3, t_cone_near_rad = 1000 }, + t_acc = 5, + t_b = 0, + t_marsh = 0, + user_name = "9M114 Shturm-V (AT-6 Spiral)", + v_mid = 300, + v_min = 170, warhead = { caliber = 130, concrete_factors = { 1, 1, 1 }, @@ -262,7 +352,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { other_factors = { 1, 1, 1 }, piercing_mass = 1.08, time_self_destruct = 20 - } + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, sounderName = "Weapons/Missile", type_name = "missile", diff --git a/_G/weapons_table/weapons/missiles/FIM_92C.lua b/_G/weapons_table/weapons/missiles/FIM_92C.lua index 469ef1aa..008d91df 100644 --- a/_G/weapons_table/weapons/missiles/FIM_92C.lua +++ b/_G/weapons_table/weapons/missiles/FIM_92C.lua @@ -18,10 +18,10 @@ _G["weapons_table"]["weapons"]["missiles"]["FIM_92C"] = { fuel_mass = 0.22, impulse = 170, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.79, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, smoke_transparency = 0.9, - tail_width = 0.072, + tail_width = 0.216, work_time = 0.048 }, controller = { @@ -51,27 +51,29 @@ _G["weapons_table"]["weapons"]["missiles"]["FIM_92C"] = { march = { boost_factor = 0, boost_time = 0, - custom_smoke_dissipation_factor = 0.3, + custom_smoke_dissipation_factor = 0.01, fuel_mass = 2.52, impulse = 250, + max_effect_length = 100000, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.79, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, - smoke_transparency = 0.9, - tail_width = 0.072, + smoke_transparency = 1, + tail_width = 0.216, work_time = 1.4 }, march2 = { boost_factor = 0, boost_time = 0, - custom_smoke_dissipation_factor = 0.3, + custom_smoke_dissipation_factor = 0.01, fuel_mass = 2.04, impulse = 225, + max_effect_length = 100000, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.79, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, - smoke_transparency = 0.7, - tail_width = 0.072, + smoke_transparency = 1, + tail_width = 0.216, work_time = 5.1 }, scheme = "schemes/missiles/self_homing_spin_missile2.sch", @@ -139,10 +141,10 @@ _G["weapons_table"]["weapons"]["missiles"]["FIM_92C"] = { fuel_mass = 0.22, impulse = 170, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.79, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, smoke_transparency = 0.9, - tail_width = 0.072, + tail_width = 0.216, work_time = 0.048 }, controller = { @@ -172,27 +174,29 @@ _G["weapons_table"]["weapons"]["missiles"]["FIM_92C"] = { march = { boost_factor = 0, boost_time = 0, - custom_smoke_dissipation_factor = 0.3, + custom_smoke_dissipation_factor = 0.01, fuel_mass = 2.52, impulse = 250, + max_effect_length = 100000, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.79, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, - smoke_transparency = 0.9, - tail_width = 0.072, + smoke_transparency = 1, + tail_width = 0.216, work_time = 1.4 }, march2 = { boost_factor = 0, boost_time = 0, - custom_smoke_dissipation_factor = 0.3, + custom_smoke_dissipation_factor = 0.01, fuel_mass = 2.04, impulse = 225, + max_effect_length = 100000, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.79, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, - smoke_transparency = 0.7, - tail_width = 0.072, + smoke_transparency = 1, + tail_width = 0.216, work_time = 5.1 }, scheme = "schemes/missiles/self_homing_spin_missile2.sch", diff --git a/_G/weapons_table/weapons/missiles/Igla_1E.lua b/_G/weapons_table/weapons/missiles/Igla_1E.lua index eeb0a842..2dfc2ffc 100644 --- a/_G/weapons_table/weapons/missiles/Igla_1E.lua +++ b/_G/weapons_table/weapons/missiles/Igla_1E.lua @@ -18,10 +18,10 @@ _G["weapons_table"]["weapons"]["missiles"]["Igla_1E"] = { fuel_mass = 0.22, impulse = 170, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.85, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, smoke_transparency = 0.9, - tail_width = 0.072, + tail_width = 0.216, work_time = 0.048 }, controller = { @@ -51,27 +51,29 @@ _G["weapons_table"]["weapons"]["missiles"]["Igla_1E"] = { march = { boost_factor = 0, boost_time = 0, - custom_smoke_dissipation_factor = 0.3, + custom_smoke_dissipation_factor = 0.01, fuel_mass = 2.25, impulse = 225, + max_effect_length = 100000, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.79, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, - smoke_transparency = 0.9, - tail_width = 0.072, + smoke_transparency = 1, + tail_width = 0.216, work_time = 1.9 }, march2 = { boost_factor = 0, boost_time = 0, - custom_smoke_dissipation_factor = 0.3, + custom_smoke_dissipation_factor = 0.01, fuel_mass = 2.23, impulse = 207, + max_effect_length = 100000, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.79, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, - smoke_transparency = 0.7, - tail_width = 0.072, + smoke_transparency = 1, + tail_width = 0.216, work_time = 6.6 }, scheme = "schemes/missiles/self_homing_spin_missile2.sch", @@ -139,10 +141,10 @@ _G["weapons_table"]["weapons"]["missiles"]["Igla_1E"] = { fuel_mass = 0.22, impulse = 170, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.85, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, smoke_transparency = 0.9, - tail_width = 0.072, + tail_width = 0.216, work_time = 0.048 }, controller = { @@ -172,27 +174,29 @@ _G["weapons_table"]["weapons"]["missiles"]["Igla_1E"] = { march = { boost_factor = 0, boost_time = 0, - custom_smoke_dissipation_factor = 0.3, + custom_smoke_dissipation_factor = 0.01, fuel_mass = 2.25, impulse = 225, + max_effect_length = 100000, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.79, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, - smoke_transparency = 0.9, - tail_width = 0.072, + smoke_transparency = 1, + tail_width = 0.216, work_time = 1.9 }, march2 = { boost_factor = 0, boost_time = 0, - custom_smoke_dissipation_factor = 0.3, + custom_smoke_dissipation_factor = 0.01, fuel_mass = 2.23, impulse = 207, + max_effect_length = 100000, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.8, 0, 0 } }, + nozzle_position = { { -0.79, 0, 0 } }, smoke_color = { 0.7, 0.7, 0.7 }, - smoke_transparency = 0.7, - tail_width = 0.072, + smoke_transparency = 1, + tail_width = 0.216, work_time = 6.6 }, scheme = "schemes/missiles/self_homing_spin_missile2.sch", diff --git a/_G/weapons_table/weapons/missiles/YJ-12.lua b/_G/weapons_table/weapons/missiles/YJ-12.lua index d2d0de26..bb1bd7dc 100644 --- a/_G/weapons_table/weapons/missiles/YJ-12.lua +++ b/_G/weapons_table/weapons/missiles/YJ-12.lua @@ -59,7 +59,9 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-12"] = { fins_limit_x = 0.43633231299858, fins_q_div = 1, glide_height = 5000, + glide_height_eq_error = 0.5, hor_err_limit = 0.5, + inertial_km_error = 2, integr_val_limit = 0.5, max_climb_ang_hdiff = 200, max_climb_angle = 0.17453292519943, @@ -293,7 +295,9 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-12"] = { fins_limit_x = 0.43633231299858, fins_q_div = 1, glide_height = 5000, + glide_height_eq_error = 0.5, hor_err_limit = 0.5, + inertial_km_error = 2, integr_val_limit = 0.5, max_climb_ang_hdiff = 200, max_climb_angle = 0.17453292519943,