diff --git a/_G/__DCS_VERSION__.lua b/_G/__DCS_VERSION__.lua index ef24ab04..00e77756 100644 --- a/_G/__DCS_VERSION__.lua +++ b/_G/__DCS_VERSION__.lua @@ -1 +1 @@ -2.8.7.42718 \ No newline at end of file +2.8.8.43489 \ No newline at end of file diff --git a/_G/db/Countries/USA.lua b/_G/db/Countries/USA.lua index aad7ed20..5b570621 100644 --- a/_G/db/Countries/USA.lua +++ b/_G/db/Countries/USA.lua @@ -1094,22 +1094,18 @@ _G["db"]["Countries"]["#Index"] = { nativeName = "Anytime, Baby...!", picture = "USA/troops/F14_anytime.png" }, <231>{ - name = "FA-18 Hornet", - nativeName = "F/A-18 Hornet", - picture = "USA/troops/fa18.png" - }, <232>{ name = "AH-64 Apache Helicopter", nativeName = "AH-64 Apache Helicopter", picture = "USA/troops/AH-64_Apache_Helicopter.png" - }, <233>{ + }, <232>{ name = "Army CH-47 Chinook Helicopter", nativeName = "Army CH-47 Chinook Helicopter", picture = "USA/troops/Army_CH-47_Chinook_Helicopter.png" - }, <234>{ + }, <233>{ name = "Bell AH-1 Cobra Attack Helicopter", nativeName = "Bell AH-1 Cobra Attack Helicopter", picture = "USA/troops/Bell_AH-1_Cobra_Attack_Helicopter.png" - }, <235>{ + }, <234>{ name = "UH-60 Black Hawk Helicopter", nativeName = "UH-60 Black Hawk Helicopter", picture = "USA/troops/UH-60_Black_Hawk_Helicopter.png" @@ -1117,7 +1113,7 @@ _G["db"]["Countries"]["#Index"] = { name = "UH-1 Huey", nativeName = "UH-1 Huey Flying for Freedom", picture = "USA/troops/UH1_Huey.png" - }, <236>{ + }, <235>{ name = "UH-1 Huey", nativeName = "USMC UH-1 Combat Air Crew", picture = "USA/troops/UH1_usmc.png" @@ -1125,15 +1121,15 @@ _G["db"]["Countries"]["#Index"] = { name = "VF-24", nativeName = "Renegades Last Rage (VF-24)", picture = "USA/troops/VF24_Last_Rage.png" - }, <237>{ + }, <236>{ name = "VF-24", nativeName = "F-14 Tomcat (VF-24)", picture = "USA/troops/vf24_F14.png" - }, <238>{ + }, <237>{ name = "VF-31", nativeName = "VF-31 Last Cat Standing Baby", picture = "USA/troops/vf31_lastcat.png" - }, <239>{ + }, <238>{ name = "VF-1285", nativeName = "F-14 Tomcat (VF-1285)", picture = "USA/troops/vf1285_F14.png" @@ -2596,9 +2592,9 @@ _G["db"]["Countries"]["#Index"] = { ["94th Fighter Squad."] = , ["95th Fighter Squad."] =
, ["9th Fighter Squad."] =
, - ["AH-64 Apache Helicopter"] =
, - ["Army CH-47 Chinook Helicopter"] =
, - ["Bell AH-1 Cobra Attack Helicopter"] =
, + ["AH-64 Apache Helicopter"] =
, + ["Army CH-47 Chinook Helicopter"] =
, + ["Bell AH-1 Cobra Attack Helicopter"] =
, ["CVW-1"] =
, ["CVW-11"] =
, ["CVW-14"] =
, @@ -2612,7 +2608,6 @@ _G["db"]["Countries"]["#Index"] = { ["F-14 Tomcat"] =
, ["F-15 Eagle"] =
, ["F-15E Strike Eagle"] =
, - ["FA-18 Hornet"] =
, ["HA(L)-3"] =
, ["HA(L)-5"] =
, ["HML-367"] =
, @@ -2628,8 +2623,8 @@ _G["db"]["Countries"]["#Index"] = { ["HMLA-775"] =
, ["Section Break"] =
, ["Thunderbolt II"] =
, - ["UH-1 Huey"] =
, - ["UH-60 Black Hawk Helicopter"] =
, + ["UH-1 Huey"] =
, + ["UH-60 Black Hawk Helicopter"] =
, ["VF-1"] =
, ["VF-101"] =
, ["VF-102"] =
, @@ -2638,7 +2633,7 @@ _G["db"]["Countries"]["#Index"] = { ["VF-111"] =
, ["VF-114"] =
, ["VF-124"] =
, - ["VF-1285"] =
, + ["VF-1285"] =
, ["VF-14"] =
, ["VF-142"] =
, ["VF-143"] =
, @@ -2651,10 +2646,10 @@ _G["db"]["Countries"]["#Index"] = { ["VF-21"] =
, ["VF-211"] =
, ["VF-213"] =
, - ["VF-24"] =
, + ["VF-24"] =
, ["VF-301"] =
, ["VF-302"] =
, - ["VF-31"] =
, + ["VF-31"] =
, ["VF-32"] =
, ["VF-33"] =
, ["VF-41"] =
, diff --git a/_G/db/Countries/USAF Aggressors.lua b/_G/db/Countries/USAF Aggressors.lua index 284a20c0..b9d1aa90 100644 --- a/_G/db/Countries/USAF Aggressors.lua +++ b/_G/db/Countries/USAF Aggressors.lua @@ -1094,22 +1094,18 @@ _G["db"]["Countries"]["#Index"] = { nativeName = "Anytime, Baby...!", picture = "USAF Aggressors/troops/F14_anytime.png" }, <231>{ - name = "FA-18 Hornet", - nativeName = "F/A-18 Hornet", - picture = "USAF Aggressors/troops/fa18.png" - }, <232>{ name = "AH-64 Apache Helicopter", nativeName = "AH-64 Apache Helicopter", picture = "USAF Aggressors/troops/AH-64_Apache_Helicopter.png" - }, <233>{ + }, <232>{ name = "Army CH-47 Chinook Helicopter", nativeName = "Army CH-47 Chinook Helicopter", picture = "USAF Aggressors/troops/Army_CH-47_Chinook_Helicopter.png" - }, <234>{ + }, <233>{ name = "Bell AH-1 Cobra Attack Helicopter", nativeName = "Bell AH-1 Cobra Attack Helicopter", picture = "USAF Aggressors/troops/Bell_AH-1_Cobra_Attack_Helicopter.png" - }, <235>{ + }, <234>{ name = "UH-60 Black Hawk Helicopter", nativeName = "UH-60 Black Hawk Helicopter", picture = "USAF Aggressors/troops/UH-60_Black_Hawk_Helicopter.png" @@ -1117,7 +1113,7 @@ _G["db"]["Countries"]["#Index"] = { name = "UH-1 Huey", nativeName = "UH-1 Huey Flying for Freedom", picture = "USAF Aggressors/troops/UH1_Huey.png" - }, <236>{ + }, <235>{ name = "UH-1 Huey", nativeName = "USMC UH-1 Combat Air Crew", picture = "USAF Aggressors/troops/UH1_usmc.png" @@ -1125,15 +1121,15 @@ _G["db"]["Countries"]["#Index"] = { name = "VF-24", nativeName = "Renegades Last Rage (VF-24)", picture = "USAF Aggressors/troops/VF24_Last_Rage.png" - }, <237>{ + }, <236>{ name = "VF-24", nativeName = "F-14 Tomcat (VF-24)", picture = "USAF Aggressors/troops/vf24_F14.png" - }, <238>{ + }, <237>{ name = "VF-31", nativeName = "VF-31 Last Cat Standing Baby", picture = "USAF Aggressors/troops/vf31_lastcat.png" - }, <239>{ + }, <238>{ name = "VF-1285", nativeName = "F-14 Tomcat (VF-1285)", picture = "USAF Aggressors/troops/vf1285_F14.png" @@ -3756,9 +3752,9 @@ _G["db"]["Countries"]["#Index"] = { ["94th Fighter Squad."] =
, ["95th Fighter Squad."] =
, ["9th Fighter Squad."] =
, - ["AH-64 Apache Helicopter"] =
, - ["Army CH-47 Chinook Helicopter"] =
, - ["Bell AH-1 Cobra Attack Helicopter"] =
, + ["AH-64 Apache Helicopter"] =
, + ["Army CH-47 Chinook Helicopter"] =
, + ["Bell AH-1 Cobra Attack Helicopter"] =
, ["CVW-1"] =
, ["CVW-11"] =
, ["CVW-14"] =
, @@ -3772,7 +3768,6 @@ _G["db"]["Countries"]["#Index"] = { ["F-14 Tomcat"] =
, ["F-15 Eagle"] =
, ["F-15E Strike Eagle"] =
, - ["FA-18 Hornet"] =
, ["HA(L)-3"] =
, ["HA(L)-5"] =
, ["HML-367"] =
, @@ -3788,8 +3783,8 @@ _G["db"]["Countries"]["#Index"] = { ["HMLA-775"] =
, ["Section Break"] =
, ["Thunderbolt II"] =
, - ["UH-1 Huey"] =
, - ["UH-60 Black Hawk Helicopter"] =
, + ["UH-1 Huey"] =
, + ["UH-60 Black Hawk Helicopter"] =
, ["VF-1"] =
, ["VF-101"] =
, ["VF-102"] =
, @@ -3798,7 +3793,7 @@ _G["db"]["Countries"]["#Index"] = { ["VF-111"] =
, ["VF-114"] =
, ["VF-124"] =
, - ["VF-1285"] =
, + ["VF-1285"] =
, ["VF-14"] =
, ["VF-142"] =
, ["VF-143"] =
, @@ -3811,10 +3806,10 @@ _G["db"]["Countries"]["#Index"] = { ["VF-21"] =
, ["VF-211"] =
, ["VF-213"] =
, - ["VF-24"] =
, + ["VF-24"] =
, ["VF-301"] =
, ["VF-302"] =
, - ["VF-31"] =
, + ["VF-31"] =
, ["VF-32"] =
, ["VF-33"] =
, ["VF-41"] =
, diff --git a/_G/db/Units/Cars/Car/JTAC.lua b/_G/db/Units/Cars/Car/JTAC.lua index fe1c8664..f8affc11 100644 --- a/_G/db/Units/Cars/Car/JTAC.lua +++ b/_G/db/Units/Cars/Car/JTAC.lua @@ -62,7 +62,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "JTAC", visual = { IR = { - coeffs = { { 0.1858, 0.0151 }, { 0, 0 }, { 0.1, 0.008 }, { 0, 0 }, { 0.1, 0.00025 } } + coeffs = { {}, {}, {}, {} } }, fire_pos = {}, fire_size = 0, diff --git a/_G/db/Units/Cars/Car/soldier_mauser98.lua b/_G/db/Units/Cars/Car/soldier_mauser98.lua index 07fb5442..39c49da1 100644 --- a/_G/db/Units/Cars/Car/soldier_mauser98.lua +++ b/_G/db/Units/Cars/Car/soldier_mauser98.lua @@ -135,6 +135,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { coeffs = { {}, {}, {}, {} } }, fire_pos = {}, + fire_size = 0, shape = "soldier_wwii_de_01", shape_dstr = "soldier_wwii_de_01_d" } diff --git a/_G/db/Units/Cars/Car/soldier_wwii_br_01.lua b/_G/db/Units/Cars/Car/soldier_wwii_br_01.lua index b53c2edc..fe41a254 100644 --- a/_G/db/Units/Cars/Car/soldier_wwii_br_01.lua +++ b/_G/db/Units/Cars/Car/soldier_wwii_br_01.lua @@ -135,6 +135,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { coeffs = { {}, {}, {}, {} } }, fire_pos = {}, + fire_size = 0, shape = "soldier_wwii_br_01", shape_dstr = "soldier_wwii_br_01_d" } diff --git a/_G/db/Units/Cars/Car/soldier_wwii_us.lua b/_G/db/Units/Cars/Car/soldier_wwii_us.lua index c9c9e2cd..ad6b02d6 100644 --- a/_G/db/Units/Cars/Car/soldier_wwii_us.lua +++ b/_G/db/Units/Cars/Car/soldier_wwii_us.lua @@ -134,6 +134,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { coeffs = { {}, {}, {}, {} } }, fire_pos = {}, + fire_size = 0, parachute = 261, shape = "soldier_wwii_us_01", shape_dstr = "soldier_wwii_us_01_d" diff --git a/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua b/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua index efd3a8e1..cca03301 100644 --- a/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua +++ b/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua @@ -1950,11 +1950,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { crew_stations = "HumanOrchestra", detection_range_max = 0, doors_movement = 2, - effects_presets = { { - effect = "APU_STARTUP_BLAST", - preset = "mi8mtv2", - ttl = 3 - } }, + effects_presets = {}, encyclopediaAnimation = { args = { [507] = 1, diff --git a/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua b/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua index ea7a2d54..1a376df3 100644 --- a/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua +++ b/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua @@ -38,7 +38,9 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { defValue = true, id = "CargoHalfdoor", label = "Cargo halfdoor", - onlyEmpty = true, + removeWeapons = { + PKT_7_62 = false + }, weight = 130 }, { control = "slider", @@ -50,7 +52,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { min = 10 }, { control = "comboList", - defValue = 1, + defValue = 0, id = "NetCrewControlPriority", label = "Aircraft Control Priority", playerOnly = true, @@ -58,7 +60,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { dispName = "Pilot", id = 0 }, { - dispName = "Instructor", + dispName = "Copilot", id = 1 }, { dispName = "Ask Always", @@ -68,6 +70,12 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { id = -2 } }, wCtrl = 150 + }, { + control = "checkbox", + defValue = false, + id = "HumanOrchestra", + label = "Disable Multicrew", + playerOnly = true }, { control = "checkbox", defValue = true, @@ -76,7 +84,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } }, AmmoWeight = 0, Cannon = "yes", - CanopyGeometry = { -0.93969262078591, -0.90285901228517, -0.86602540378444, 5.5511151231258e-17, 0.86602540378444 }, + CanopyGeometry = { -0.93969262078591, -0.95280922353749, -0.96592582628907, -0.98106026219041, -0.99619469809175 }, Categories = {}, Damage = { { args = { 251 }, @@ -3239,7 +3247,10 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { DisplayName = "R MG", Launchers = { { CLSID = "PKT_7_62", - arg_value = -1 + arg_value = -1, + setAddPropAircraftValue = { + CargoHalfdoor = true + } } }, Number = 8, Order = 8, @@ -3711,6 +3722,8 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { crew_members = { { bailout_arg = 133, boarding_arg = 38, + can_be_playable = true, + can_control = true, canopy_arg = 133, canopy_args = { 133, 1, 131, 1, 38, 0.2, 86, 0.1 }, drop_canopy_name = 0, @@ -3721,6 +3734,8 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, { bailout_arg = 131, boarding_arg = 38, + can_be_playable = true, + can_control = true, canopy_arg = 131, canopy_args = { 133, 1, 131, 1, 38, 0.2, 86, 0.1 }, drop_canopy_name = 0, @@ -3731,6 +3746,8 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, { bailout_arg = 133, boarding_arg = 38, + can_be_playable = true, + can_control = false, canopy_arg = 133, canopy_args = { 133, 0.95, 131, 0.95, 38, 0.3, 86, 0.11 }, drop_canopy_name = 0, @@ -3740,12 +3757,13 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { role_display_name = "Technician" }, { can_be_playable = true, + can_control = false, canopy_arg = 43, pos = { 3.916, -0.11, 0 }, role = "gunner", role_display_name = "Left Gunner" } }, - crew_stations = "HumanOrchestra", + crew_stations = "Hybrid", detection_range_max = 0, effects_presets = { { effect = "APU_STARTUP_BLAST", @@ -4055,54 +4073,54 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { Door0 = { { Flags = { "Reversible" }, Sequence = { { - C = { { "Arg", 38, "to", 1, "in", 1 } } + C = { { "Arg", 133, "to", 0.64, "in", 1 } } } }, Transition = { "Close", "Open" } }, { Flags = { "Reversible", "StepsBackwards" }, Sequence = { { - C = { { "Arg", 38, "to", 0, "in", 1 } } + C = { { "Arg", 133, "to", 0, "in", 1 } } } }, Transition = { "Open", "Close" } - }, { - Sequence = { { - C = { { "Arg", 133, "to", 1, "in", 1 } } - } }, - Transition = { "Any", "Bailout" } - }, { + } }, + Door1 = { { + Flags = { "Reversible" }, Sequence = { { - C = { { "PosType", 10 }, { "ValuePhase", 2, "x", 1, "y", 0.5, "sign", 1 } } - }, { - C = { { "Arg", 133, "to", 1, "in", 1 } } - }, { - C = { { "Sleep", "for", 0 } } + C = { { "Arg", 131, "to", 0.64, "in", 2 } } } }, - Transition = { "Close", "Taxi" } + Transition = { "Close", "Open" } }, { + Flags = { "Reversible", "StepsBackwards" }, Sequence = { { - C = { { "Arg", 133, "to", 0, "in", 1 } } + C = { { "Arg", 131, "to", 0, "in", 2 } } } }, - Transition = { "Taxi", "Close" } + Transition = { "Open", "Close" } } }, - Door1 = { { + Door2 = { { + Flags = { "Reversible" }, Sequence = { { - C = { { "Arg", 131, "to", 1, "in", 1 } } + C = { { "Arg", 38, "to", 1, "in", 1 } } } }, - Transition = { "Any", "Bailout" } + Transition = { "Close", "Open" } }, { + Flags = { "Reversible", "StepsBackwards" }, Sequence = { { - C = { { "RandomPhase", 2, "x", 0.8 } } - }, { - C = { { "Arg", 131, "to", 1, "in", 1 } } - }, { - C = { { "Sleep", "for", 0 } } + C = { { "Arg", 38, "to", 0, "in", 1 } } + } }, + Transition = { "Open", "Close" } + } }, + Door3 = { { + Flags = { "Reversible" }, + Sequence = { { + C = { { "Arg", 86, "to", 1, "in", 1 } } } }, - Transition = { "Close", "Taxi" } + Transition = { "Close", "Open" } }, { + Flags = { "Reversible", "StepsBackwards" }, Sequence = { { - C = { { "Arg", 131, "to", 0, "in", 1 } } + C = { { "Arg", 86, "to", 0, "in", 1 } } } }, - Transition = { "Taxi", "Close" } + Transition = { "Open", "Close" } } }, HeadLights = { { Sequence = { { @@ -4202,7 +4220,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { Transition = { "Any", "CustomStage2" } } } }, - net_animation = { 458, 80, 85, 457, 1000, 26, 38, 86, 133, 131, 423, 424, 425, 426, 1, 2, 250 }, + net_animation = { 458, 80, 85, 457, 1000, 26, 423, 424, 425, 426, 1, 2, 250, 459, 460, 461 }, nose_gear_pos = { 3.236, -2.489, 0 }, panelRadio = { { channels = { { diff --git a/_G/db/Units/Planes/Plane/A-10C_2.lua b/_G/db/Units/Planes/Plane/A-10C_2.lua index 6b9e50c8..36760a72 100644 --- a/_G/db/Units/Planes/Plane/A-10C_2.lua +++ b/_G/db/Units/Planes/Plane/A-10C_2.lua @@ -1058,7 +1058,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 155.995, min = 136, - modulation = 2 + modulation = 2, + modulationDef = 1 }, { max = 173.975, min = 156, @@ -1066,7 +1067,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 399.975, min = 225, - modulation = 2 + modulation = 2, + modulationDef = 0 } } }, IR_emission_coeff = 0.53, @@ -2897,7 +2899,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 155.995, min = 136, - modulation = 2 + modulation = 2, + modulationDef = 1 }, { max = 173.975, min = 156, @@ -2905,7 +2908,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 399.975, min = 225, - modulation = 2 + modulation = 2, + modulationDef = 0 } } }, { channels = { { diff --git a/_G/db/Units/Planes/Plane/F-14A-135-GR.lua b/_G/db/Units/Planes/Plane/F-14A-135-GR.lua index 5e0843b4..a2991cd9 100644 --- a/_G/db/Units/Planes/Plane/F-14A-135-GR.lua +++ b/_G/db/Units/Planes/Plane/F-14A-135-GR.lua @@ -147,6 +147,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 527 }, critical_damage = 2 }, + [3] = { + args = { 65 }, + critical_damage = 3 + }, [4] = { args = { 516 }, critical_damage = 2 @@ -240,12 +244,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2 }, [90] = { - args = { 528 }, - critical_damage = 2 + critical_damage = 1 }, [91] = { - args = { 529 }, - critical_damage = 2 + critical_damage = 1 }, [98] = { args = { 2502 }, @@ -472,6 +474,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AVX_WALL_RIGHT_REAR = 146, CABIN_LEFT_SIDE = 4, CABIN_RIGHT_SIDE = 5, + COCKPIT = 3, COUNTERMEASURES = 147, CREW_1 = 90, CREW_2 = 91, @@ -10269,6 +10272,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Name = "AFAC", OldID = "AFAC", WorldID = 16 + }, { + Name = "SEAD", + OldID = "SEAD", + WorldID = 29 } }, V_land = 70, V_max_h = 700, diff --git a/_G/db/Units/Planes/Plane/F-14B.lua b/_G/db/Units/Planes/Plane/F-14B.lua index 0653dd67..391b15bf 100644 --- a/_G/db/Units/Planes/Plane/F-14B.lua +++ b/_G/db/Units/Planes/Plane/F-14B.lua @@ -147,6 +147,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 527 }, critical_damage = 2 }, + [3] = { + args = { 65 }, + critical_damage = 3 + }, [4] = { args = { 516 }, critical_damage = 2 @@ -240,12 +244,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2 }, [90] = { - args = { 528 }, - critical_damage = 2 + critical_damage = 1 }, [91] = { - args = { 529 }, - critical_damage = 2 + critical_damage = 1 }, [98] = { args = { 2502 }, @@ -472,6 +474,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AVX_WALL_RIGHT_REAR = 146, CABIN_LEFT_SIDE = 4, CABIN_RIGHT_SIDE = 5, + COCKPIT = 3, COUNTERMEASURES = 147, CREW_1 = 90, CREW_2 = 91, @@ -10270,6 +10273,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Name = "AFAC", OldID = "AFAC", WorldID = 16 + }, { + Name = "SEAD", + OldID = "SEAD", + WorldID = 29 } }, V_land = 70, V_max_h = 700, diff --git a/_G/db/Units/Planes/Plane/FA-18C.lua b/_G/db/Units/Planes/Plane/FA-18C.lua index b351b46c..d5e5a992 100644 --- a/_G/db/Units/Planes/Plane/FA-18C.lua +++ b/_G/db/Units/Planes/Plane/FA-18C.lua @@ -757,7 +757,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 155.995, min = 136, - modulation = 2 + modulation = 2, + modulationDef = 1 }, { max = 173.995, min = 156, @@ -765,7 +766,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 399.975, min = 225, - modulation = 2 + modulation = 2, + modulationDef = 0 } } }, IR_emission_coeff = 0.73, @@ -1578,7 +1580,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 155.995, min = 136, - modulation = 2 + modulation = 2, + modulationDef = 1 }, { max = 173.995, min = 156, @@ -1586,7 +1589,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 399.975, min = 225, - modulation = 2 + modulation = 2, + modulationDef = 0 } } }, { channels = { { @@ -1662,7 +1666,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 155.995, min = 136, - modulation = 2 + modulation = 2, + modulationDef = 1 }, { max = 173.995, min = 156, @@ -1670,7 +1675,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 399.975, min = 225, - modulation = 2 + modulation = 2, + modulationDef = 0 } } } }, passivCounterm = { diff --git a/_G/db/Units/Planes/Plane/FA-18C_hornet.lua b/_G/db/Units/Planes/Plane/FA-18C_hornet.lua index e50b5684..384efb96 100644 --- a/_G/db/Units/Planes/Plane/FA-18C_hornet.lua +++ b/_G/db/Units/Planes/Plane/FA-18C_hornet.lua @@ -1506,7 +1506,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 155.995, min = 136, - modulation = 2 + modulation = 2, + modulationDef = 1 }, { max = 173.995, min = 156, @@ -1514,7 +1515,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 399.975, min = 225, - modulation = 2 + modulation = 2, + modulationDef = 0 } } }, IR_emission_coeff = 0.75, @@ -2920,7 +2922,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 155.995, min = 136, - modulation = 2 + modulation = 2, + modulationDef = 1 }, { max = 173.995, min = 156, @@ -2928,7 +2931,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 399.975, min = 225, - modulation = 2 + modulation = 2, + modulationDef = 0 } } }, { channels = { { @@ -3004,7 +3008,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 155.995, min = 136, - modulation = 2 + modulation = 2, + modulationDef = 1 }, { max = 173.995, min = 156, @@ -3012,7 +3017,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { max = 399.975, min = 225, - modulation = 2 + modulation = 2, + modulationDef = 0 } } } }, passivCounterm = { diff --git a/_G/db/Units/Planes/Plane/KC130.lua b/_G/db/Units/Planes/Plane/KC130.lua index 4cd45d2a..2c6a3632 100644 --- a/_G/db/Units/Planes/Plane/KC130.lua +++ b/_G/db/Units/Planes/Plane/KC130.lua @@ -1,4 +1,4 @@ -_G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { false, +_G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.17, AmmoWeight = 0, CAS_min = 54, diff --git a/_G/db/Units/Planes/Plane/KC135MPRS.lua b/_G/db/Units/Planes/Plane/KC135MPRS.lua index e70f5321..5204d45a 100644 --- a/_G/db/Units/Planes/Plane/KC135MPRS.lua +++ b/_G/db/Units/Planes/Plane/KC135MPRS.lua @@ -1,4 +1,4 @@ -_G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { false, +_G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.14, AmmoWeight = 0, CAS_min = 54, diff --git a/_G/db/Units/Planes/Plane/M-2000C.lua b/_G/db/Units/Planes/Plane/M-2000C.lua index 2da7b7e7..25357ece 100644 --- a/_G/db/Units/Planes/Plane/M-2000C.lua +++ b/_G/db/Units/Planes/Plane/M-2000C.lua @@ -248,6 +248,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 156 }, critical_damage = 4 }, + [59] = { + args = { 148 }, + critical_damage = 5 + }, [61] = { args = { 224 }, critical_damage = 7 diff --git a/_G/db/Units/Planes/Plane/Mirage-F1B.lua b/_G/db/Units/Planes/Plane/Mirage-F1B.lua index 3990c970..2766be47 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1B.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1B.lua @@ -2150,8 +2150,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { role_display_name = "Pilot" }, { bailout_arg = -1, + boarding_arg = 421, can_be_playable = true, canopy_arg = 421, + canopy_args = { 421, 1 }, + canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 0.811, 0.892, 0 }, drop_canopy_name = 323, drop_parachute_name = "Mirage-F1_parachute", diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BD.lua b/_G/db/Units/Planes/Plane/Mirage-F1BD.lua index fd82627d..710e02e7 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BD.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BD.lua @@ -2137,8 +2137,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { role_display_name = "Pilot" }, { bailout_arg = -1, + boarding_arg = 421, can_be_playable = true, canopy_arg = 421, + canopy_args = { 421, 1 }, + canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 0.811, 0.892, 0 }, drop_canopy_name = 323, drop_parachute_name = "Mirage-F1_parachute", diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BE.lua b/_G/db/Units/Planes/Plane/Mirage-F1BE.lua index eada763c..d4d0b95d 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BE.lua @@ -2258,8 +2258,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { role_display_name = "Pilot" }, { bailout_arg = -1, + boarding_arg = 421, can_be_playable = true, canopy_arg = 421, + canopy_args = { 421, 1 }, + canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 0.811, 0.892, 0 }, drop_canopy_name = 323, drop_parachute_name = "Mirage-F1_parachute", diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua b/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua index 0e4fa694..46d7fdb0 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua @@ -2137,8 +2137,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { role_display_name = "Pilot" }, { bailout_arg = -1, + boarding_arg = 421, can_be_playable = true, canopy_arg = 421, + canopy_args = { 421, 1 }, + canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 0.811, 0.892, 0 }, drop_canopy_name = 323, drop_parachute_name = "Mirage-F1_parachute", diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CE.lua b/_G/db/Units/Planes/Plane/Mirage-F1CE.lua index 5f2b0986..7d7a69ac 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CE.lua @@ -2627,13 +2627,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { y_trans = -0.099924, z_trans = 0 }, { - hAngle = 0, + hAngle = -90.637207, rollAngle = 0, - vAngle = -10, - viewAngle = 80, - x_trans = -0.02, - y_trans = 0.003, - z_trans = 0 + vAngle = 4.386597, + viewAngle = 116.113876, + x_trans = -0.676361, + y_trans = -0.03726, + z_trans = -0.443781 }, { hAngle = -38.423161, rollAngle = 0, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua b/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua index 471844f7..1218ee48 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua @@ -2091,8 +2091,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { role_display_name = "Pilot" }, { bailout_arg = -1, + boarding_arg = 421, can_be_playable = true, canopy_arg = 421, + canopy_args = { 421, 1 }, + canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 0.811, 0.892, 0 }, drop_canopy_name = 323, drop_parachute_name = "Mirage-F1_parachute", diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EE.lua b/_G/db/Units/Planes/Plane/Mirage-F1EE.lua index 979c4b6d..d1bcfb4a 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EE.lua @@ -2674,13 +2674,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { y_trans = -0.099924, z_trans = 0 }, { - hAngle = 0, + hAngle = -90.637207, rollAngle = 0, - vAngle = -10, - viewAngle = 80, - x_trans = -0.02, - y_trans = 0.003, - z_trans = 0 + vAngle = 4.386597, + viewAngle = 116.113876, + x_trans = -0.676361, + y_trans = -0.03726, + z_trans = -0.443781 }, { hAngle = -38.423161, rollAngle = 0, diff --git a/_G/db/Units/Ships/Ship/Type_054A.lua b/_G/db/Units/Ships/Ship/Type_054A.lua index 3371a027..6e96aefb 100644 --- a/_G/db/Units/Ships/Ship/Type_054A.lua +++ b/_G/db/Units/Ships/Ship/Type_054A.lua @@ -761,15 +761,15 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { } }, sensor = {} } }, - angles = { { -2.6179938779915, -0.5235987755983, -0.43633231299858, 1.5184364492351 } }, - angles_mech = { { -2.6179938779915, -0.5235987755983, -0.43633231299858, 1.5184364492351 } }, + angles = { { -0.5235987755983, -2.6179938779915, -0.43633231299858, 1.5184364492351 } }, + angles_mech = { { -0.5235987755983, -2.6179938779915, -0.43633231299858, 1.5184364492351 } }, area = "BORT_L", center = "CENTER_CIWS_L001", drawArgument1 = 19, drawArgument2 = 20, pidY = {}, pidZ = {}, - reference_angle_Y = 1.5707963267949 + reference_angle_Y = -1.5707963267949 }, { LN = { { BR = { { @@ -799,15 +799,15 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { } }, sensor = {} } }, - angles = { { 0.5235987755983, 2.6179938779915, -0.43633231299858, 1.5184364492351 } }, - angles_mech = { { 0.5235987755983, 2.6179938779915, -0.43633231299858, 1.5184364492351 } }, + angles = { { 2.6179938779915, 0.5235987755983, -0.43633231299858, 1.5184364492351 } }, + angles_mech = { { 2.6179938779915, 0.5235987755983, -0.43633231299858, 1.5184364492351 } }, area = "BORT_R", center = "CENTER_CIWS_R001", drawArgument1 = 17, drawArgument2 = 18, pidY = {}, pidZ = {}, - reference_angle_Y = -1.5707963267949 + reference_angle_Y = 1.5707963267949 }, { LN = { { BR = { { diff --git a/_G/launcher/{A0648264-4BC0-4EE8-A543-D119F6BA4257}.lua b/_G/launcher/{A0648264-4BC0-4EE8-A543-D119F6BA4257}.lua index dd3571b3..766f2958 100644 --- a/_G/launcher/{A0648264-4BC0-4EE8-A543-D119F6BA4257}.lua +++ b/_G/launcher/{A0648264-4BC0-4EE8-A543-D119F6BA4257}.lua @@ -10,7 +10,7 @@ _G["launcher"]["{A0648264-4BC0-4EE8-A543-D119F6BA4257}"] = { ShapeName = "c-25", connector_name = "tube_1" } }, - Picture = "S25.png", + Picture = "S25_OFM.png", Weight = 495, _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 7, 32, "Redacted" }, diff --git a/_G/launcher/{S_25_O}.lua b/_G/launcher/{S_25_O}.lua index d03c61c4..d5e2c348 100644 --- a/_G/launcher/{S_25_O}.lua +++ b/_G/launcher/{S_25_O}.lua @@ -7,7 +7,7 @@ _G["launcher"]["{S_25_O}"] = { ShapeName = "C-25O", connector_name = "tube_1" } }, - Picture = "S25.png", + Picture = "S25_O.png", Weight = 445, Weight_Empty = 65, _file = "./CoreMods/aircraft/AircraftWeaponPack/rockets.lua", diff --git a/_G/launcher/{TWIN_S25_O}.lua b/_G/launcher/{TWIN_S25_O}.lua index b7564f5c..d944e116 100644 --- a/_G/launcher/{TWIN_S25_O}.lua +++ b/_G/launcher/{TWIN_S25_O}.lua @@ -13,7 +13,7 @@ _G["launcher"]["{TWIN_S25_O}"] = { payload_CLSID = "{S_25_O}" } }, JettisonSubmunitionOnly = true, - Picture = "S25.png", + Picture = "S25_O.png", Weight = 922, Weight_Empty = 162, _file = "./CoreMods/aircraft/AircraftWeaponPack/rockets.lua", diff --git a/_G/launcher/{TWIN_S25}.lua b/_G/launcher/{TWIN_S25}.lua index 6f221970..5edac639 100644 --- a/_G/launcher/{TWIN_S25}.lua +++ b/_G/launcher/{TWIN_S25}.lua @@ -15,7 +15,7 @@ _G["launcher"]["{TWIN_S25}"] = { payload_CLSID = "{A0648264-4BC0-4EE8-A543-D119F6BA4257}" } }, JettisonSubmunitionOnly = true, - Picture = "S25.png", + Picture = "S25_OFM.png", Weight = 902, _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 7, 32, "Redacted" }, diff --git a/_G/rockets/AGM_84H.lua b/_G/rockets/AGM_84H.lua index 20898918..49a14a88 100644 --- a/_G/rockets/AGM_84H.lua +++ b/_G/rockets/AGM_84H.lua @@ -85,7 +85,7 @@ _G["rockets"]["#Index"] = { alg_vel_k = 6, auto_terrain_following = 1, auto_terrain_following_height = 50, - delay = 1, + delay = 2, eng_max_thrust = 3000, eng_min_thrust = -100, estimated_N_max = 6, @@ -107,7 +107,7 @@ _G["rockets"]["#Index"] = { K = 60, Kg = 4, Ki = 0, - delay = 0, + delay = 5, finsLimit = 0.8, hKd = 0.005, hKp_err = 120, diff --git a/_G/rockets/X_59M.lua b/_G/rockets/X_59M.lua index 21526639..fde1a743 100644 --- a/_G/rockets/X_59M.lua +++ b/_G/rockets/X_59M.lua @@ -45,12 +45,14 @@ _G["rockets"]["#Index"] = { PN_dist_data = { 2000, 0, 500, 0 }, altim_vel_k = 4, conv_input = 0, - default_glide_height = 100, - delay = 1, + default_glide_height = 200, + delay = 2, dont_climb_on_cruise_height = 0, fins_limit = 0.87266462599716, fins_limit_x = 0.43633231299858, - glide_height = 100, + glide_height = 200, + glide_height_abs_error = 5, + glide_height_eq_error = 8, hor_err_limit = 0.5, integr_val_limit = 0.5, max_climb_ang_hdiff = 200, @@ -64,10 +66,10 @@ _G["rockets"]["#Index"] = { min_climb_vel = 120, min_climb_vel_factor = 0, op_time = 9999, - pre_maneuver_glide_height = 100, + pre_maneuver_glide_height = 200, rotated_WLOS_input = 0, - skim_glide_height = 100, - use_start_bar_height = 1, + skim_glide_height = 200, + use_start_bar_height = 0, vel_proj_div = 6, w_limit = 0.087266462599716 }, diff --git a/_G/weapons_table/weapons/missiles/AGM_84H.lua b/_G/weapons_table/weapons/missiles/AGM_84H.lua index 6f88ef8a..4dd0f42c 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84H.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84H.lua @@ -90,7 +90,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { alg_vel_k = 6, auto_terrain_following = 1, auto_terrain_following_height = 50, - delay = 1, + delay = 2, eng_max_thrust = 3000, eng_min_thrust = -100, estimated_N_max = 6, @@ -111,7 +111,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { K = 60, Kg = 4, Ki = 0, - delay = 0, + delay = 5, finsLimit = 0.8, hKd = 0.005, hKp_err = 120, @@ -316,7 +316,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { alg_vel_k = 6, auto_terrain_following = 1, auto_terrain_following_height = 50, - delay = 1, + delay = 2, eng_max_thrust = 3000, eng_min_thrust = -100, estimated_N_max = 6, @@ -337,7 +337,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { K = 60, Kg = 4, Ki = 0, - delay = 0, + delay = 5, finsLimit = 0.8, hKd = 0.005, hKp_err = 120, diff --git a/_G/weapons_table/weapons/missiles/X_59M.lua b/_G/weapons_table/weapons/missiles/X_59M.lua index 68ee44e9..95c8686d 100644 --- a/_G/weapons_table/weapons/missiles/X_59M.lua +++ b/_G/weapons_table/weapons/missiles/X_59M.lua @@ -50,12 +50,14 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { PN_dist_data = { 2000, 0, 500, 0 }, altim_vel_k = 4, conv_input = 0, - default_glide_height = 100, - delay = 1, + default_glide_height = 200, + delay = 2, dont_climb_on_cruise_height = 0, fins_limit = 0.87266462599716, fins_limit_x = 0.43633231299858, - glide_height = 100, + glide_height = 200, + glide_height_abs_error = 5, + glide_height_eq_error = 8, hor_err_limit = 0.5, integr_val_limit = 0.5, max_climb_ang_hdiff = 200, @@ -69,10 +71,10 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { min_climb_vel = 120, min_climb_vel_factor = 0, op_time = 9999, - pre_maneuver_glide_height = 100, + pre_maneuver_glide_height = 200, rotated_WLOS_input = 0, - skim_glide_height = 100, - use_start_bar_height = 1, + skim_glide_height = 200, + use_start_bar_height = 0, vel_proj_div = 6, w_limit = 0.087266462599716 }, @@ -301,12 +303,14 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { PN_dist_data = { 2000, 0, 500, 0 }, altim_vel_k = 4, conv_input = 0, - default_glide_height = 100, - delay = 1, + default_glide_height = 200, + delay = 2, dont_climb_on_cruise_height = 0, fins_limit = 0.87266462599716, fins_limit_x = 0.43633231299858, - glide_height = 100, + glide_height = 200, + glide_height_abs_error = 5, + glide_height_eq_error = 8, hor_err_limit = 0.5, integr_val_limit = 0.5, max_climb_ang_hdiff = 200, @@ -320,10 +324,10 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { min_climb_vel = 120, min_climb_vel_factor = 0, op_time = 9999, - pre_maneuver_glide_height = 100, + pre_maneuver_glide_height = 200, rotated_WLOS_input = 0, - skim_glide_height = 100, - use_start_bar_height = 1, + skim_glide_height = 200, + use_start_bar_height = 0, vel_proj_div = 6, w_limit = 0.087266462599716 },