diff --git a/_G/__DCS_VERSION__.lua b/_G/__DCS_VERSION__.lua index 2aac407d..06d47e8a 100644 --- a/_G/__DCS_VERSION__.lua +++ b/_G/__DCS_VERSION__.lua @@ -1 +1 @@ -2.7.12.23362 \ No newline at end of file +2.7.14.23966 \ No newline at end of file diff --git a/_G/bombs/FAB_100M.lua b/_G/bombs/FAB_100M.lua index 77e02a50..c05f9835 100644 --- a/_G/bombs/FAB_100M.lua +++ b/_G/bombs/FAB_100M.lua @@ -3,9 +3,9 @@ _G["bombs"]["#Index"] = { Cx = 0.00035, Name = "Redacted", VyHold = -100, - _file = "./CoreMods/aircraft/MiG-19P/WEAPONS/MiG-19P_Weapons.lua", - _origin = "MiG-19P AI by RAZBAM", - display_name = "FAB-100M", + _file = "./CoreMods/aircraft/MiG-15bis/MiG-15bis.lua", + _origin = "MiG-15bis AI by Eagle Dynamics", + display_name = "FAB-100M - 100kg GP Bomb LD", hMax = 12000, hMin = 1000, mass = 100, diff --git a/_G/bombs/FAB_50.lua b/_G/bombs/FAB_50.lua index e236f8fc..714c87a0 100644 --- a/_G/bombs/FAB_50.lua +++ b/_G/bombs/FAB_50.lua @@ -3,9 +3,9 @@ _G["bombs"]["#Index"] = { Cx = 0.00035, Name = "Redacted", VyHold = -100, - _file = "./CoreMods/aircraft/MiG-19P/WEAPONS/MiG-19P_Weapons.lua", - _origin = "MiG-19P AI by RAZBAM", - display_name = "FAB-50", + _file = "./CoreMods/aircraft/MiG-15bis/MiG-15bis.lua", + _origin = "MiG-15bis AI by Eagle Dynamics", + display_name = "FAB-50 - 50kg GP Bomb LD", hMax = 12000, hMin = 1000, mass = 50, diff --git a/_G/db/Units/Cars/Car/HQ-7_LN_SP.lua b/_G/db/Units/Cars/Car/HQ-7_LN_SP.lua index 0d4d6711..99d40bdc 100644 --- a/_G/db/Units/Cars/Car/HQ-7_LN_SP.lua +++ b/_G/db/Units/Cars/Car/HQ-7_LN_SP.lua @@ -28,7 +28,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { sightIndicationMode = 4, sightMasterMode = 1 } }, - PPI_view = "GenericPPI/GenericPPI", angles = { { 3.1415926535898, -3.1415926535898, -0.087266462599716, 0.78539816339745 } }, center = "CENTER_TOWER", cockpit = { "_1A29/_1A29", { 0, 0, 0 } }, @@ -74,7 +73,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { turret_azimuth = { {} }, turret_elevation = { {}, {} } }, - attribute = { 2, 16, 102, "Redacted", "AA_missile", "SR SAM", "SAM SR", "SAM TR", "RADAR_BAND1_FOR_ARM", "All", "Ground Units", "Vehicles", "Ground vehicles", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "SAM related", "SAM elements" }, + attribute = { 2, 16, 102, "Redacted", "AA_missile", "SR SAM" }, category = "Air Defence", chassis = {}, driverCockpit = "DriverCockpit/DriverCockpitWithIRandLLTV", diff --git a/_G/db/Units/Cars/Car/HQ-7_STR_SP.lua b/_G/db/Units/Cars/Car/HQ-7_STR_SP.lua index e9c0db32..07661edf 100644 --- a/_G/db/Units/Cars/Car/HQ-7_STR_SP.lua +++ b/_G/db/Units/Cars/Car/HQ-7_STR_SP.lua @@ -47,46 +47,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { p = 80 }, pos = { 0, 5, 0 } - }, { - LN = { { - BR = { { - connector_name = "POINT_RDR" - } }, - ECM_K = 0.65, - PL = { { - ammo_capacity = 1 - } }, - beamWidth = 1.5707963267949, - customViewPoint = { "GenericPPI/GenericPPI", { 0, 0, 0 } }, - distanceMax = 30000, - distanceMin = 500, - maxShootingSpeed = 0, - max_number_of_missiles_channels = 4, - max_trg_alt = 5500, - min_trg_alt = 10, - reactionTime = 10, - reflection_limit = 0.12, - type = 102 - } }, - PPI_view = "GenericPPI/GenericPPI", - angles = { { 3.1415926535898, -3.1415926535898, 0, 1.0471975511966 } }, - drawArgument1 = 0, - mount_before_move = true, - omegaY = 0.5235987755983, - omegaZ = 0.5235987755983, - pidY = { - d = 8, - i = 0.1, - inn = 5, - p = 40 - }, - pidZ = { - d = 9, - i = 0.1, - inn = 10, - p = 80 - }, - pos = { 0, 5, 0 } }, maxTargetDetectionRange = 30000, radar_rotation_type = 1, diff --git a/_G/db/Units/Cars/Car/Infantry AK Ins.lua b/_G/db/Units/Cars/Car/Infantry AK Ins.lua index 972814a6..27065aac 100644 --- a/_G/db/Units/Cars/Car/Infantry AK Ins.lua +++ b/_G/db/Units/Cars/Car/Infantry AK Ins.lua @@ -82,7 +82,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "Infantry", "CustomAimPoint", "New infantry", "Skeleton_type_A", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "NonAndLightArmoredUnits", "NonArmoredUnits" }, category = "Infantry", - chassis = {}, + chassis = { + life = 1.02 + }, enablePlayerCanDrive = false, mapclasskey = "P0091000201", mobile = true, diff --git a/_G/db/Units/Cars/Car/soldier_mauser98.lua b/_G/db/Units/Cars/Car/soldier_mauser98.lua index d745867c..f919e4f7 100644 --- a/_G/db/Units/Cars/Car/soldier_mauser98.lua +++ b/_G/db/Units/Cars/Car/soldier_mauser98.lua @@ -91,7 +91,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "Infantry", "CustomAimPoint", "New infantry", "Skeleton_type_A", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "NonAndLightArmoredUnits", "NonArmoredUnits" }, category = "Infantry", - chassis = {}, + chassis = { + life = 1.02 + }, enablePlayerCanDrive = false, mapclasskey = "P0091000201", mobile = true, 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 00581b45..abb89fd1 100644 --- a/_G/db/Units/Cars/Car/soldier_wwii_br_01.lua +++ b/_G/db/Units/Cars/Car/soldier_wwii_br_01.lua @@ -91,7 +91,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "Infantry", "CustomAimPoint", "New infantry", "Skeleton_type_A", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "NonAndLightArmoredUnits", "NonArmoredUnits" }, category = "Infantry", - chassis = {}, + chassis = { + life = 1.02 + }, enablePlayerCanDrive = false, mapclasskey = "P0091000201", mobile = true, diff --git a/_G/db/Units/Cars/Car/soldier_wwii_us.lua b/_G/db/Units/Cars/Car/soldier_wwii_us.lua index 13601887..bcb735d9 100644 --- a/_G/db/Units/Cars/Car/soldier_wwii_us.lua +++ b/_G/db/Units/Cars/Car/soldier_wwii_us.lua @@ -90,7 +90,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "Infantry", "CustomAimPoint", "New infantry", "Skeleton_type_A", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "NonAndLightArmoredUnits", "NonArmoredUnits" }, category = "Infantry", - chassis = {}, + chassis = { + life = 1.02 + }, enablePlayerCanDrive = false, mapclasskey = "P0091000201", mobile = true, diff --git a/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua b/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua index b68e0b92..218a4cc0 100644 --- a/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua +++ b/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua @@ -815,7 +815,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { ffbPitchK = 0.65, ffbRollK = 0.65, headingHold_K_int = 0.75, - headingHold_K_wy = 0.075, + headingHold_K_wy = 0.065, headingHold_K_yaw = 0.2, imgui_permissions = {}, kDamp_Mx_d1 = 0, @@ -836,22 +836,32 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { cyclic_roll_speed = 0.13333333333333, pedals_speed = 0.15384615384615 }, + mainRotorVortexRingCyclicLoss = 0.65, + mainRotorVortexRingK1 = 0.5, + mainRotorVortexRingK2 = 1.5, + mainRotorVortexRingK3 = 4, + mainRotorVortexRingThrustLoss = 0.6, + mainRotorVortexRingVibration = 0.2, + mainRotorVortexRingWashout = 15, major_shake_ampl = 0.25, minor_shake_ampl = 0.07, moment_of_inertia = { 9290, 51874, 51468, -5937 }, pedalCoeff = 1, pitchHold_K_int = 0.5, pitchHold_K_pitch = 0.35, - pitchHold_K_wz = 1.5, + pitchHold_K_wz = 0.6, pitchOutK = 1, - pitchRateDirectFB_Coef = 0.5, - pitchRateInputK = 0.5, + pitchRateDirectFB_Coef = 0.15, + pitchRateInputK = 0.65, pitchStickK = 1, + pos_distance = 10, + pos_dxMaxVal = 0.1, + pos_dzMaxVal = 0.1, rollHold_K_int = 0.5, rollHold_K_roll = 0.85, - rollHold_K_wx = 2.5, + rollHold_K_wx = 1.5, rollOutK = 1, - rollRateDirectFB_Coef = 1, + rollRateDirectFB_Coef = 0.35, rollRateInputK = 0.75, rollStickK = 1, rotorBladeDamageCentrifugalScale = 0.3, @@ -958,11 +968,11 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { thrust_function = { { 40, 0 }, { 440, 0.8 }, { 462, 0.805 }, { 484, 0.81 }, { 506, 0.815 }, { 528, 0.82 }, { 550, 0.825 }, { 572, 0.83 }, { 594, 0.835 }, { 616, 0.84 }, { 638, 0.845 }, { 660, 0.852 }, { 682, 0.863 }, { 704, 0.877 }, { 726, 0.89 }, { 748, 0.906 }, { 770, 0.923 }, { 792, 0.942 }, { 814, 0.957 }, { 836, 0.975 }, { 858, 0.99 }, { 880, 1 } }, totalTransmissionInertiaMoment = 7909.0362, user_options = "AH-64D_BLK_II", - velHold_K_vx = 1.5, - velHold_K_vz = 1.5, + velHold_K_vx = 2.5, + velHold_K_vz = 2.5, yawOutK = 1, - yawRateDirectFB_Coef = 0.12, - yawRateInputK = 0.75 + yawRateDirectFB_Coef = 0.2, + yawRateInputK = 0.65 }, HumanRadio = { editable = true, diff --git a/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua b/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua index b2bb04a4..7a9b4e02 100644 --- a/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua +++ b/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua @@ -71,7 +71,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { control = "checkbox", defValue = true, id = "TrackAirTargets", - label = "Track air targets" + label = "Track Air Targets" }, { control = "checkbox", defValue = true, diff --git a/_G/db/Units/Helicopters/Helicopter/SA342L.lua b/_G/db/Units/Helicopters/Helicopter/SA342L.lua index 3e097514..e66c3f41 100644 --- a/_G/db/Units/Helicopters/Helicopter/SA342L.lua +++ b/_G/db/Units/Helicopters/Helicopter/SA342L.lua @@ -5,14 +5,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { id = "NS430allow", label = "NS430 Allow", playerOnly = true - }, { - arg = 1338, - boolean_inverted = false, - control = "checkbox", - defValue = false, - id = "SA342RemoveDoors", - label = "Remove Doors", - playerOnly = false } }, AmmoWeight = 24, CanopyGeometry = { -0.76604444311898, -0.81603492345171, -0.86602540378444, 0.059391174613885, 0.98480775301221 }, @@ -106,10 +98,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { critical_damage = 6, deps_cells = { 35, 36, 39 } }, - [59] = { - args = { 152 }, - critical_damage = 1 - }, [63] = { args = { 160 }, critical_damage = 10, @@ -177,7 +165,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, DisplayName = "SA342L", EPLRS = true, - EmptyWeight = 1582.5, + EmptyWeight = 1494.5, Guns = { { _file = "./CoreMods/aircraft/SA342/SA342.lua", _origin = "SA342 AI by Polychop-Simulations", @@ -578,7 +566,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, { Name = "AircraftCarrier" } }, - M_empty = 1582.5, + M_empty = 1494.5, M_fuel_max = 416.33, M_max = 2100, M_nominal = 1900, @@ -601,18 +589,59 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { Y = -0.366, Z = 0.984 }, { + DisplayName = "2", FiZ = -3, Launchers = { { - CLSID = "{LAU_SNEB68G}" + CLSID = "{TELSON8_SNEBT250}", + arg_value = 0.1, + connector = "AttachPoint" + }, { + CLSID = "{TELSON8_SNEBT251}", + arg_value = 0.1, + connector = "AttachPoint" + }, { + CLSID = "{TELSON8_SNEBT252}", + arg_value = 0.1, + connector = "AttachPoint" + }, { + CLSID = "{TELSON8_SNEBT253}", + arg_value = 0.1, + connector = "AttachPoint" + }, { + CLSID = "{TELSON8_SNEBT254_RED}", + arg_value = 0.1, + connector = "AttachPoint" + }, { + CLSID = "{TELSON8_SNEBT254_YELLOW}", + arg_value = 0.1, + connector = "AttachPoint" + }, { + CLSID = "{TELSON8_SNEBT254_GREEN}", + arg_value = 0.1, + connector = "AttachPoint" }, { - CLSID = "{LAU_SNEB68_WP}" + CLSID = "{TELSON8_SNEBT256}", + arg_value = 0.1, + connector = "AttachPoint" + }, { + CLSID = "{TELSON8_SNEBT257}", + arg_value = 0.1, + connector = "AttachPoint" + }, { + CLSID = "{TELSON8_SNEBT259E}", + arg_value = 0.1, + connector = "AttachPoint" } }, Number = 2, Order = 2, Type = 0, X = 0.068, Y = -0.153, - Z = -1.282 + Z = -1.282, + arg = 1339, + arg_value = 0, + connector = "str_pnt_002", + use_full_connector_position = true }, { FiZ = 0, Launchers = {}, @@ -664,6 +693,17 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { X = 0, Y = 0, Z = 0 + }, { + FiZ = 0, + Launchers = { { + CLSID = "{SA342_Doors}" + } }, + Number = 8, + Order = 8, + Type = 0, + X = 0, + Y = 0, + Z = 0 } }, RCS = 3, Rate = 30, diff --git a/_G/db/Units/Helicopters/Helicopter/SA342M.lua b/_G/db/Units/Helicopters/Helicopter/SA342M.lua index 56b16543..31f3d93a 100644 --- a/_G/db/Units/Helicopters/Helicopter/SA342M.lua +++ b/_G/db/Units/Helicopters/Helicopter/SA342M.lua @@ -98,10 +98,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { critical_damage = 6, deps_cells = { 35, 36, 39 } }, - [59] = { - args = { 152 }, - critical_damage = 1 - }, [63] = { args = { 160 }, critical_damage = 10, @@ -170,6 +166,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { DisplayName = "SA342M", EPLRS = true, EmptyWeight = 1680, + Guns = {}, H_din_one_eng = 6000, H_din_two_eng = 6000, H_max = 6000, diff --git a/_G/db/Units/Helicopters/Helicopter/SA342Minigun.lua b/_G/db/Units/Helicopters/Helicopter/SA342Minigun.lua index fb6bd616..4a8e1b42 100644 --- a/_G/db/Units/Helicopters/Helicopter/SA342Minigun.lua +++ b/_G/db/Units/Helicopters/Helicopter/SA342Minigun.lua @@ -98,10 +98,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { critical_damage = 6, deps_cells = { 35, 36, 39 } }, - [59] = { - args = { 152 }, - critical_damage = 1 - }, [63] = { args = { 160 }, critical_damage = 10, @@ -442,6 +438,16 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { pos = { 3, 0.7, -0.3 }, role = "instructor", role_display_name = "Instructor pilot" + }, { + can_be_playable = true, + drop_canopy_name = 0, + ejection_added_speed = { 0, 0, 5 }, + ejection_order = 3, + ejection_seat_name = 0, + pilot_body_arg = 420, + pos = { 3, 0.7, -0.3 }, + role = "gunner", + role_display_name = "Gunner" } }, crew_size = 2, crew_stations = "HumanOrchestra", diff --git a/_G/db/Units/Helicopters/Helicopter/SA342Mistral.lua b/_G/db/Units/Helicopters/Helicopter/SA342Mistral.lua index 32d66355..bc106948 100644 --- a/_G/db/Units/Helicopters/Helicopter/SA342Mistral.lua +++ b/_G/db/Units/Helicopters/Helicopter/SA342Mistral.lua @@ -98,10 +98,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { critical_damage = 6, deps_cells = { 35, 36, 39 } }, - [59] = { - args = { 152 }, - critical_damage = 1 - }, [63] = { args = { 160 }, critical_damage = 10, @@ -170,6 +166,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { DisplayName = "SA342Mistral", EPLRS = true, EmptyWeight = 1559, + Guns = {}, H_din_one_eng = 6000, H_din_two_eng = 6000, H_max = 6000, diff --git a/_G/db/Units/Planes/Plane/Su-34.lua b/_G/db/Units/Planes/Plane/Su-34.lua index 196ef078..88fda39b 100644 --- a/_G/db/Units/Planes/Plane/Su-34.lua +++ b/_G/db/Units/Planes/Plane/Su-34.lua @@ -171,9 +171,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0, connector = "PYLON_3" }, { - CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74884}" + CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74884}", + arg_value = 0.05 }, { - CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74881}" + CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74881}", + arg_value = 0.05 }, ,
, <16>{ CLSID = "{9B25D316-0434-4954-868F-D51DB1A38DF0}", arg_value = 0.35 @@ -252,9 +254,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0, connector = "PYLON_4" }, { - CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74884}" + CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74884}", + arg_value = 0.05 }, { - CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74881}" + CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74881}", + arg_value = 0.05 },
,
,
,
,
, <20>{ CLSID = "{40AA4ABE-D6EB-4CD6-AEFE-A1A0477B24AB}", arg_value = 0.15 @@ -618,9 +622,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0, connector = "PYLON_9" }, { - CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74884}" + CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74884}", + arg_value = 0.05 }, { - CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74881}" + CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74881}", + arg_value = 0.05 },
,
,
,
,
,
, { CLSID = "{MBD3_U6_5*FAB-250}", arg_value = 0, @@ -705,9 +711,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg_value = 0, connector = "PYLON_10" }, { - CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74884}" + CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74884}", + arg_value = 0.05 }, { - CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74881}" + CLSID = "{96A7F676-F956-404A-AD04-F33FB2C74881}", + arg_value = 0.05 },
,
,
,
,
,
, { CLSID = "{MBD3_U6_5*FAB-250}", arg_value = 0, diff --git a/_G/db/Units/Ships/Ship/Forrestal.lua b/_G/db/Units/Ships/Ship/Forrestal.lua index 0065bfc6..9ee8d793 100644 --- a/_G/db/Units/Ships/Ship/Forrestal.lua +++ b/_G/db/Units/Ships/Ship/Forrestal.lua @@ -131,7 +131,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { size = 0.8 }, area_life = 100, - area_name = "PALUBA_NOSE" + area_name = "PALUBA_NOSE", + belongsToRunway = true }, { area_arg = 77, area_fire = { @@ -290,8 +291,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, Helicopter_Num_ = 6, ICLS = true, - ICLS_Glideslope_position = { -79, 26.5, 32.7, 3.5 }, - ICLS_Localizer_position = { -153, 12, 9.4, 189 }, + ICLS_Glideslope_position = { -68.8, 26.5, 21.3, 3.5 }, + ICLS_Localizer_position = { -137.5, 12, 6.9, 189.4 }, LSOView = { cockpit = "empty", position = { @@ -313,7 +314,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Plane_Num_ = 72, R_min = 665.8, Rate = 5500, - RunWays = { { { -28.28, 18.46, -10.54 }, 350, 170, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { 82.414, 18.46, 13.907 }, 356.72, 94.5, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { 81.735, 18.46, -11.985 }, 3.03, 95, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { -36.638, 18.46, -17.912 }, 352.92, 96.4, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { -46.811, 18.46, -31.578 }, 0, 127.7, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, + RunWays = { { { -28.28, 18.46, -10.54 }, 350.58, 170, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { 82.414, 18.46, 13.907 }, 356.72, 94.5, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { 81.735, 18.46, -11.985 }, 3.03, 95, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { -36.638, 18.46, -17.912 }, 352.92, 96.4, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { -46.811, 18.46, -31.578 }, 0, 127.7, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, RunwaysNumber = 5 }, Sensors = { @@ -661,7 +662,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { turret_azimuth = { {} }, turret_elevation = { {} } }, - attribute = { 3, 12, 12, "Redacted", "Aircraft Carriers", "Arresting Gear", "catapult", "RADAR_BAND1_FOR_ARM", "RADAR_BAND2_FOR_ARM", "AircraftCarrier", "AircraftCarrier With Catapult", "Armed Ship", "AircraftCarrier With Arresting Gear", "Naval", "All", "Ships", "Armed ships", "Armed Air Defence", "HeavyArmoredUnits", "Heavy armed ships" }, + 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 = { { { 792, 0, 1 }, { 794, 0, 1 }, { 150, 0, 1 } }, { { 790, 0, 1 }, { 792, 0, 1 }, { 793, 0, 1 }, { 794, 0, 1 }, { 150, 0, 1 } }, { { 793, 0, 1 }, { 794, 0, 1 }, { 792, 0, 1 }, { 150, 0, 1 } } }, chassis = {}, distFindObstacles = 1048.7, diff --git a/_G/db/Units/Ships/Ship/Type_071.lua b/_G/db/Units/Ships/Ship/Type_071.lua index c41b9d23..3b3ae332 100644 --- a/_G/db/Units/Ships/Ship/Type_071.lua +++ b/_G/db/Units/Ships/Ship/Type_071.lua @@ -1,6 +1,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Categories = { { name = "Armed Ship" + }, { + name = "HelicopterCarrier" }, { name = "AircraftCarrier" }, { @@ -382,7 +384,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { turret_azimuth = { {} }, turret_elevation = { {} } }, - attribute = { 3, 12, 12, "Redacted", "Aircraft Carriers", "RADAR_BAND1_FOR_ARM", "RADAR_BAND2_FOR_ARM", "DetectionByAWACS", "Straight_in_approach_type", "NO_SAM", "Armed Ship", "AircraftCarrier", "AircraftCarrier With Tramplin", "Naval", "All", "Ships", "Armed ships", "Armed Air Defence", "HeavyArmoredUnits", "Heavy armed ships" }, + attribute = { 3, 12, 12, "Redacted", "Aircraft Carriers", "RADAR_BAND1_FOR_ARM", "RADAR_BAND2_FOR_ARM", "DetectionByAWACS", "Straight_in_approach_type", "NO_SAM", "Armed Ship", "HelicopterCarrier", "AircraftCarrier", "AircraftCarrier With Tramplin", "Naval", "All", "Ships", "Armed ships", "Armed Air Defence", "HeavyArmoredUnits", "Heavy armed ships" }, chassis = {}, deck_crew = { { pos = { -75.343, 10.54, 11.009 }, diff --git a/_G/launcher/DIS_RKT_90_UG.lua b/_G/launcher/DIS_RKT_90_UG.lua index 9ab0c8dc..992d8978 100644 --- a/_G/launcher/DIS_RKT_90_UG.lua +++ b/_G/launcher/DIS_RKT_90_UG.lua @@ -72,7 +72,7 @@ _G["launcher"]["DIS_RKT_90_UG"] = { } }, JettisonSubmunitionOnly = false, Picture = "brm1_pod.png", - Weight = 382.5, + Weight = 462.5, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/rkt_brm1.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", attribute = { 4, 7, 32, "Redacted" }, diff --git a/_G/launcher/{LAU_SNEB68G}.lua b/_G/launcher/{LAU_SNEB68G}.lua index a0109d04..fa8b0300 100644 --- a/_G/launcher/{LAU_SNEB68G}.lua +++ b/_G/launcher/{LAU_SNEB68G}.lua @@ -1,49 +1,43 @@ _G["launcher"]["{LAU_SNEB68G}"] = { CLSID = "{LAU_SNEB68G}", Count = 8, + Cx_pil = 0.007, Elements = { { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, 0.04, 0.12 }, - Rotation = { 0, 0, 0 }, - ShapeName = "sneb68_eap" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, 0.04, 0.042 }, - ShapeName = "sneb68_eap" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, 0.04, -0.044 }, - ShapeName = "sneb68_eap" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, 0.04, -0.122 }, - ShapeName = "sneb68_eap" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, -0.042, -0.12 }, - ShapeName = "sneb68_eap" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, -0.042, -0.042 }, - ShapeName = "sneb68_eap" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, -0.042, 0.044 }, - ShapeName = "sneb68_eap" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, -0.042, 0.122 }, - ShapeName = "sneb68_eap" + IsAdapter = true, + ShapeName = "SA342_Telson8" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_01" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_02" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_03" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_04" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_05" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_06" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_07" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_08" } }, Picture = "SNEB68.png", - Weight = 50.08, - _file = "./CoreMods/aircraft/SA342/SA342_Weapons.lua", - _origin = "SA342 AI by Polychop-Simulations", - adapter_type = <1>{ 4, 4, 32, "Redacted" }, - attribute =
, + Weight = 70.4, + Weight_Empty = 30, + _file = "./CoreMods/aircraft/AircraftWeaponPack/rockets.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 7, 32, "Redacted" }, category = 3, - displayName = "LAU_SNEB68G - 8xSNEB68_EAP", - kind_of_shipping = 1, + displayName = "Telson 8 - 8 x 68 mm SNEB Type 253 H1 HEAT", name = "{LAU_SNEB68G}", wsTypeOfWeapon = { 4, 7, 33, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{LAU_SNEB68_WP}.lua b/_G/launcher/{LAU_SNEB68_WP}.lua index a3cb5772..6cadfc50 100644 --- a/_G/launcher/{LAU_SNEB68_WP}.lua +++ b/_G/launcher/{LAU_SNEB68_WP}.lua @@ -1,49 +1,43 @@ _G["launcher"]["{LAU_SNEB68_WP}"] = { CLSID = "{LAU_SNEB68_WP}", Count = 8, + Cx_pil = 0.007, Elements = { { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, 0.04, 0.12 }, - Rotation = { 0, 0, 0 }, - ShapeName = "sneb68_wp" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, 0.04, 0.042 }, - ShapeName = "sneb68_wp" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, 0.04, -0.044 }, - ShapeName = "sneb68_wp" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, 0.04, -0.122 }, - ShapeName = "sneb68_wp" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, -0.042, -0.12 }, - ShapeName = "sneb68_wp" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, -0.042, -0.042 }, - ShapeName = "sneb68_wp" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, -0.042, 0.044 }, - ShapeName = "sneb68_wp" - }, { - DrawArgs = { { 1, 1 }, { 2, 1 } }, - Position = { 0, -0.042, 0.122 }, - ShapeName = "sneb68_wp" + IsAdapter = true, + ShapeName = "SA342_Telson8" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_01" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_02" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_03" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_04" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_05" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_06" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_07" + }, { + ShapeName = "SA342_SNEB68", + connector_name = "tube_08" } }, Picture = "SNEB68_Smoke.png", - Weight = 50.08, - _file = "./CoreMods/aircraft/SA342/SA342_Weapons.lua", - _origin = "SA342 AI by Polychop-Simulations", - adapter_type = <1>{ 4, 4, 32, "Redacted" }, - attribute =
, + Weight = 61.152, + Weight_Empty = 30, + _file = "./CoreMods/aircraft/AircraftWeaponPack/rockets.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 7, 32, "Redacted" }, category = 3, - displayName = "LAU_SNEB68G - 8xSNEB68_WP", - kind_of_shipping = 1, + displayName = "Telson 8 - 8 x 68 mm SNEB Type 250 F1B TP-SM", name = "{LAU_SNEB68_WP}", wsTypeOfWeapon = { 4, 7, 33, "Redacted" } } \ No newline at end of file diff --git a/_G/rockets/AGM_84D.lua b/_G/rockets/AGM_84D.lua index 01dbf426..41d10bcb 100644 --- a/_G/rockets/AGM_84D.lua +++ b/_G/rockets/AGM_84D.lua @@ -107,13 +107,13 @@ _G["rockets"]["#Index"] = { Kd = 0, Ki = 0, Kix = 0, - Ks = 5, + Ks = 8, Kw = 1, Kx = 0, PN_dist_data = { 2000, 1, 500, 1 }, add_err_val = 0, add_err_vert = 0, - add_out_val = 0.1, + add_out_val = 0.03, add_out_vert = 1, conv_input = 0, delay = 1, diff --git a/_G/rockets/AIM_54A_Mk47.lua b/_G/rockets/AIM_54A_Mk47.lua index 9459b14b..6c735893 100644 --- a/_G/rockets/AIM_54A_Mk47.lua +++ b/_G/rockets/AIM_54A_Mk47.lua @@ -43,7 +43,7 @@ _G["rockets"]["#Index"] = { name = "AIM_54A_Mk47", nozzle_exit_area = 1e-06, shape_table_data = { { - file = "HB_F14_EXT_AIM54", + file = "HB_F14_EXT_AIM54_A", fire = { 0, 1 }, index = "Redacted", life = 1, diff --git a/_G/rockets/AIM_54A_Mk60.lua b/_G/rockets/AIM_54A_Mk60.lua index 64dde3ba..fa7980c7 100644 --- a/_G/rockets/AIM_54A_Mk60.lua +++ b/_G/rockets/AIM_54A_Mk60.lua @@ -43,7 +43,7 @@ _G["rockets"]["#Index"] = { name = "AIM_54A_Mk60", nozzle_exit_area = 1e-06, shape_table_data = { { - file = "HB_F14_EXT_AIM54", + file = "HB_F14_EXT_AIM54_A", fire = { 0, 1 }, index = "Redacted", life = 1, diff --git a/_G/rockets/BRM-1_90MM.lua b/_G/rockets/BRM-1_90MM.lua index 980f6654..c94dc115 100644 --- a/_G/rockets/BRM-1_90MM.lua +++ b/_G/rockets/BRM-1_90MM.lua @@ -65,14 +65,14 @@ _G["rockets"]["#Index"] = { maxAoa = 0.13962634015955, shapeName = "brm1_90", wind_sigma = 5, - wind_time = 1.1 + wind_time = 1.5 }, march = { boost_factor = 1, boost_tail = 1, boost_time = 0, custom_smoke_dissipation_factor = 0.2, - fuel_mass = 5, + fuel_mass = 5.65, impulse = 190, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -0.95, 0, 0 } }, diff --git a/_G/rockets/LD-10.lua b/_G/rockets/LD-10.lua index 92a470e4..d92e8d64 100644 --- a/_G/rockets/LD-10.lua +++ b/_G/rockets/LD-10.lua @@ -48,18 +48,18 @@ _G["rockets"]["#Index"] = { fins_limit = 0.34906585039887, fins_limit_x = 0.087266462599716, loft_active_by_default = 0, - loft_add_pitch = 0.34906585039887, + loft_add_pitch = 0.26179938779915, loft_min_add_pitch = 0.17453292519943, - loft_min_dist = 1000, + loft_min_dist = 5000, loft_min_trig_ang = 0.087266462599716, - loft_trig_ang = 0.34906585039887, - loft_trig_change_max_dist = 35000, + loft_trig_ang = 0.17453292519943, + loft_trig_change_max_dist = 40000, loft_trig_change_min_dist = 20000, loft_trig_max_alt = 3000, - max_pitch_cmd = 0.55850536063819, + max_pitch_cmd = 0.34906585039887, max_signal_Fi = 0.20943951023932, min_a_conv_approach_vel = 100, - min_horiz_time = 1, + min_horiz_time = 3, null_roll = 0.78539816339745, op_time = 240, rotate_fins_output = 0, @@ -97,8 +97,8 @@ _G["rockets"]["#Index"] = { K1 = { 0.00264, 0.00264, 0.00264, 0.00264, 0.00264, 0.00264, 0.0022, 0.001873, 0.0016435, 0.0014752, 0.0013448, 0.0012436, 0.0011534, 0.0010742, 0.0010149, 0.0009484, 0.0009016, 0.0008476, 0.000795, 0.0007529, 0.0007122, 0.0006727, 0.0006343, 0.0006058, 0.0005781, 0.00056 }, K2 = { -0.00257, -0.00257, -0.00257, -0.00257, -0.00257, -0.00265, -0.002274, -0.002034, -0.0018241, -0.0016225, -0.0014468, -0.001275, -0.0011248, -0.0009777, -0.0008514, -0.0007274, -0.0006236, -0.0005217, -0.0004393, -0.0003584, -0.0002968, -0.0002363, -0.0001949, -0.0001546, -0.0001335, -0.000114 }, L = 0.203, - Mxd = 17.19, - Mxw = -44.5, + Mxd = 5.73, + Mxw = -15.8, Mya = { -0.5, -0.5 }, Myw = { -2, -2 }, Mza = { -0.5, -0.5 }, @@ -139,13 +139,13 @@ _G["rockets"]["#Index"] = { }, scheme = "anti_rad_missile", seeker = { - FOV = 1.0471975511966, + FOV = 2.0943951023932, abs_err_val = 2, - aim_sigma = 4, - aim_y_offset = 2.5, + aim_sigma = 2, + aim_y_offset = 0.5, ang_err_val = 0.00013962634015955, blind_rad_val = 0.1, - calc_aim_dist = 500000, + calc_aim_dist = 200000, delay = 2.4, err_correct_time = 2, keep_aim_time = 5, diff --git a/_G/rockets/X_31A.lua b/_G/rockets/X_31A.lua index 747c50ca..817d6ab6 100644 --- a/_G/rockets/X_31A.lua +++ b/_G/rockets/X_31A.lua @@ -15,15 +15,15 @@ _G["rockets"]["#Index"] = { Head_Form = 1, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 22, 8, 200, 250, 300, 350, 400, 450, 500, 550, 300, 30310, 31850, 33110, 34190, 35170, 36070, 36970, 37870, 400, 30370, 31900, 33150, 34240, 35220, 36140, 37020, 37920, 500, 30460, 31980, 33220, 34310, 35290, 36190, 37090, 38000, 600, 30540, 32040, 33300, 34380, 35350, 36270, 37170, 38080, 700, 30630, 32130, 33370, 34460, 35430, 36350, 37260, 38150, 800, 30700, 32200, 33425, 34525, 35500, 36425, 37325, 38225, 900, 30775, 32275, 33500, 34600, 35575, 36525, 37400, 38325, 1000, 30875, 32350, 33600, 34675, 35650, 36600, 37525, 38425, 2000, 31900, 33350, 34575, 35700, 36700, 37675, 38625, 39575, 3000, 33000, 34450, 35700, 36850, 37950, 38950, 39950, 40950, 4000, 34200, 35650, 37000, 38200, 39300, 40400, 41450, 42500, 5000, 35400, 36900, 38300, 39500, 40700, 41900, 43100, 44200, 6000, 36500, 38250, 39750, 41000, 42250, 43500, 44750, 46000, 7000, 38000, 39750, 41250, 42750, 44000, 45250, 46750, 48250, 8000, 39250, 41000, 42750, 44250, 45750, 47000, 48750, 50000, 9000, 40500, 42500, 44250, 45750, 47500, 49000, 50500, 52000, 10000, 42250, 43750, 45750, 47500, 49250, 50750, 52500, 54250, 11000, 43500, 45000, 47000, 49000, 50500, 52500, 54000, 55500, 12000, 45000, 47500, 49000, 50500, 52500, 54500, 56000, 58000, 13000, 47500, 49000, 50500, 52000, 54000, 56000, 58000, 59500, 14000, 49000, 51000, 52500, 53500, 55500, 57500, 59500, 62000, 15000, 50500, 52500, 54500, 55500, 57000, 59000, 61000, 63500 }, + LaunchDistData = { 22, 8, 200, 250, 300, 350, 400, 450, 500, 550, 300, 40220, 41760, 43030, 44120, 45110, 46030, 46940, 47840, 400, 40340, 41870, 43140, 44230, 45220, 46140, 47050, 47960, 500, 40450, 41970, 43240, 44350, 45340, 46270, 47170, 48090, 600, 40570, 42090, 43360, 44450, 45450, 46390, 47310, 48230, 700, 40680, 42210, 43470, 44570, 45570, 46510, 47440, 48350, 800, 40800, 42300, 43575, 44675, 45700, 46625, 47575, 48475, 900, 40925, 42425, 43700, 44800, 45825, 46775, 47700, 48600, 1000, 41050, 42550, 43825, 44925, 45925, 46875, 47825, 48750, 2000, 42325, 43825, 45075, 46250, 47300, 48275, 49275, 50225, 3000, 43700, 45200, 46500, 47700, 48800, 49850, 50900, 51900, 4000, 45100, 46600, 48000, 49200, 50350, 51500, 52600, 53650, 5000, 46500, 48100, 49500, 50800, 52000, 53200, 54300, 55500, 6000, 48000, 49500, 51000, 52500, 53750, 55000, 56250, 57250, 7000, 49250, 51000, 52500, 54000, 55250, 56750, 58000, 59250, 8000, 50500, 52500, 54000, 55500, 57000, 58500, 59750, 61250, 9000, 52000, 53750, 55500, 57250, 58750, 60250, 61750, 63000, 10000, 53500, 55000, 57000, 58750, 60250, 62000, 63500, 65000, 11000, 55000, 56500, 58500, 60000, 62000, 63500, 65500, 67000, 12000, 56500, 58500, 59500, 61500, 63500, 65500, 67000, 69000, 13000, 58000, 60000, 61000, 63000, 65000, 67000, 68500, 70500, 14000, 59500, 61000, 63000, 64000, 66000, 68000, 70000, 72000, 15000, 60500, 62500, 64500, 66000, 67500, 69500, 71500, 73500 }, Life_Time = 150, M = 600, Mach_max = 2.54, - MinLaunchDistData = { 22, 8, 200, 250, 300, 350, 400, 450, 500, 550, 300, 4120, 4570, 4870, 5130, 5390, 5480, 5750, 6020, 400, 4280, 4730, 4870, 5310, 5570, 5800, 5940, 6210, 500, 4500, 4940, 5230, 5510, 5780, 5890, 6160, 6450, 600, 4810, 5140, 5440, 5600, 5860, 6140, 6440, 6740, 700, 4870, 5320, 5630, 5930, 6200, 6380, 6680, 6990, 800, 5025, 5375, 5700, 6100, 6300, 6600, 6900, 7250, 900, 5175, 5525, 5850, 6175, 6475, 6800, 7125, 7450, 1000, 5325, 5675, 6025, 6350, 6675, 7000, 7325, 7675, 2000, 6325, 6775, 7225, 7650, 8100, 8525, 8950, 9375, 3000, 6950, 7550, 8100, 8600, 9150, 9600, 10150, 10700, 4000, 7350, 8050, 8700, 9350, 9900, 10500, 11150, 12250, 5000, 7600, 8400, 9200, 9900, 11100, 12300, 13400, 14500, 6000, 7500, 8750, 10500, 12000, 13250, 14250, 15250, 16500, 7000, 7750, 10500, 12000, 13500, 14750, 15750, 18500, 21250, 8000, 9750, 11750, 13250, 14750, 17250, 20000, 22750, 24750, 9000, 11000, 12750, 15000, 17750, 21000, 23750, 26000, 28250, 10000, 12250, 14750, 17750, 20750, 24000, 26500, 29000, 31250, 11000, 15500, 17000, 20000, 23500, 26500, 29500, 32000, 34000, 12000, 18000, 21000, 22500, 26500, 29500, 32500, 34500, 37000, 13000, 20500, 24000, 26000, 28500, 31500, 34000, 36500, 39000, 14000, 23000, 26000, 29000, 30500, 33500, 36000, 38500, 41500, 15000, 25500, 28500, 31500, 33000, 34500, 37500, 40500, 43000 }, + MinLaunchDistData = { 22, 8, 200, 250, 300, 350, 400, 450, 500, 550, 300, 14760, 15180, 15590, 15980, 16360, 16710, 17080, 17470, 400, 15590, 16090, 16540, 16980, 17400, 17810, 18240, 18680, 500, 16350, 16890, 17410, 17900, 18390, 18840, 19310, 19800, 600, 17030, 17640, 18210, 18750, 19270, 19770, 20290, 20830, 700, 17670, 18330, 18960, 19550, 20100, 20640, 21200, 21760, 800, 18275, 19000, 19675, 20300, 20875, 21450, 22050, 22650, 900, 18875, 19625, 20325, 21025, 21650, 22275, 22875, 23500, 1000, 19425, 20250, 21000, 21700, 22350, 23000, 23650, 24300, 2000, 24250, 25475, 26550, 27525, 28475, 29325, 30200, 31075, 3000, 28400, 29850, 31200, 32400, 33450, 34500, 35500, 36450, 4000, 32100, 33700, 35100, 36400, 37550, 38650, 39700, 40700, 5000, 35200, 36900, 38400, 39700, 40900, 42100, 43200, 44300, 6000, 37750, 39500, 41250, 42500, 43750, 45000, 46250, 47500, 7000, 40250, 42000, 43750, 45250, 46500, 48000, 49250, 50500, 8000, 42500, 44250, 46000, 47500, 49000, 50500, 51750, 53000, 9000, 44250, 46250, 48250, 49750, 51250, 52750, 54250, 55750, 10000, 46250, 47750, 49750, 51500, 53250, 54750, 56250, 57750, 11000, 48500, 49500, 51500, 53500, 55000, 56500, 58500, 60000, 12000, 50500, 52000, 53500, 55000, 57000, 59000, 60500, 62500, 13000, 52000, 54000, 55500, 57000, 59000, 61000, 62500, 64500, 14000, 54000, 56000, 57500, 58500, 60500, 62500, 64500, 66500, 15000, 56000, 57500, 59500, 60500, 62000, 64000, 66000, 68000 }, Name = "Redacted", Nr_max = 12, OmViz_max = 99.9, - Range_max = 60000, + Range_max = 70000, Reflection = 0.3, X_back = -1.341, Y_back = -0.178, diff --git a/_G/rockets/X_31P.lua b/_G/rockets/X_31P.lua index a8c3f846..cd96a518 100644 --- a/_G/rockets/X_31P.lua +++ b/_G/rockets/X_31P.lua @@ -15,11 +15,11 @@ _G["rockets"]["#Index"] = { Head_Form = 1, Head_Type = 3, KillDistance = 5, - LaunchDistData = { 22, 8, 200, 250, 300, 350, 400, 450, 500, 550, 300, 42210, 45320, 47780, 49890, 51740, 53460, 55110, 56760, 400, 42800, 45970, 48470, 50610, 52480, 54240, 55940, 57610, 500, 43400, 46620, 49160, 51350, 53250, 55050, 56780, 58490, 600, 43990, 47270, 49870, 52090, 54050, 55870, 57640, 59380, 700, 44570, 47940, 50590, 52840, 54850, 56700, 58520, 60290, 800, 45125, 48600, 51300, 53600, 55650, 57550, 59425, 61225, 900, 45650, 49300, 52050, 54400, 56475, 58425, 60300, 62175, 1000, 46150, 49975, 52800, 55200, 57325, 59325, 61250, 63175, 2000, 52925, 57000, 60700, 64175, 67100, 69750, 72350, 74925, 3000, 62400, 67500, 71350, 74150, 76850, 79550, 82150, 84550, 4000, 69700, 73850, 77350, 80450, 83250, 85950, 88700, 91500, 5000, 74700, 79400, 83400, 86900, 90100, 93100, 96200, 99100, 6000, 79750, 85500, 90000, 94000, 97750, 101250, 104750, 107750, 7000, 84500, 90750, 95750, 100250, 104500, 108250, 111750, 115000, 8000, 87750, 94500, 100000, 104750, 109000, 113000, 116750, 120000, 9000, 89500, 96500, 102000, 107250, 111750, 115750, 119750, 120000, 10000, 89750, 96750, 102750, 107750, 112500, 116750, 120250, 120250, 11000, 89500, 97000, 103000, 108000, 112500, 117000, 120000, 120000, 12000, 88500, 95500, 101500, 106500, 111500, 116000, 120500, 120500, 13000, 86000, 93500, 101500, 105000, 111500, 118500, 120500, 120500, 14000, 84500, 93500, 101500, 103500, 111500, 115500, 119000, 120500, 15000, 83000, 93500, 100000, 104500, 109000, 113000, 117000, 120500 }, + LaunchDistData = { 22, 8, 200, 250, 300, 350, 400, 450, 500, 550, 300, 52750, 55760, 58100, 60080, 61800, 63380, 64880, 66370, 400, 53220, 56270, 58620, 60620, 62360, 63950, 65480, 66990, 500, 53670, 56760, 59150, 61160, 62920, 64540, 66100, 67600, 600, 54130, 57250, 59670, 61700, 63490, 65120, 66700, 68240, 700, 54540, 57730, 60180, 62240, 64050, 65700, 67310, 68870, 800, 54925, 58200, 60700, 62775, 64600, 66275, 67925, 69500, 900, 55275, 58700, 61175, 63300, 65175, 66875, 68525, 70150, 1000, 55600, 59150, 61725, 63850, 65750, 67475, 69150, 70775, 2000, 59675, 63175, 66300, 69200, 71575, 73650, 75650, 77550, 3000, 64600, 68300, 71400, 74200, 76900, 79650, 82250, 84650, 4000, 69800, 73950, 77450, 80550, 83350, 86050, 88850, 91650, 5000, 74800, 79500, 83500, 87000, 90300, 93300, 96300, 99200, 6000, 80000, 85500, 90000, 94250, 97750, 101250, 104750, 108000, 7000, 84750, 90750, 96000, 100500, 104500, 108500, 112000, 115250, 8000, 88000, 94750, 100000, 105000, 109250, 113250, 117000, 120500, 9000, 89500, 96500, 102250, 107500, 112000, 116000, 120000, 120500, 10000, 90000, 97000, 103000, 108000, 112750, 117250, 120750, 120750, 11000, 90000, 97000, 103000, 108000, 112500, 117500, 120500, 120500, 12000, 88500, 95500, 101500, 106500, 112000, 116500, 121000, 121000, 13000, 86000, 93000, 100000, 110000, 110500, 118500, 121000, 121000, 14000, 84500, 98000, 100000, 108000, 111500, 116000, 120000, 121000, 15000, 83500, 96000, 100500, 104500, 109000, 113000, 117500, 121000 }, Life_Time = 1000, M = 600, Mach_max = 2.54, - MinLaunchDistData = { 22, 8, 200, 250, 300, 350, 400, 450, 500, 550, 300, 28980, 31810, 33750, 35300, 36640, 37860, 39050, 40220, 400, 28790, 31860, 33850, 35460, 36840, 38100, 39300, 40500, 500, 28470, 31850, 33950, 35620, 37030, 38330, 39560, 40780, 600, 27960, 31800, 34030, 35750, 37220, 38550, 39810, 41050, 700, 27180, 31690, 34060, 35860, 37360, 38730, 40040, 41310, 800, 25875, 31500, 34050, 35950, 37500, 38925, 40275, 41550, 900, 23900, 31225, 34025, 36000, 37650, 39100, 40475, 41800, 1000, 21950, 30775, 33925, 36025, 37750, 39225, 40675, 42025, 2000, 10875, 14775, 22150, 31100, 36075, 39050, 41375, 43325, 3000, 9650, 11100, 12700, 15300, 20450, 27900, 34750, 39750, 4000, 10750, 11500, 12300, 13500, 14900, 16900, 21250, 27600, 5000, 12600, 13000, 13400, 14200, 15100, 16200, 17800, 20000, 6000, 14500, 14750, 15250, 15750, 16250, 17250, 18250, 20000, 7000, 16000, 16750, 17000, 17500, 18000, 18250, 19250, 20500, 8000, 17750, 18500, 19000, 19250, 19750, 20000, 20500, 21500, 9000, 19250, 20250, 20500, 21000, 21500, 22000, 22500, 22500, 10000, 20750, 21500, 22250, 22500, 23000, 23250, 23750, 24000, 11000, 22000, 23000, 23500, 24000, 24500, 25000, 25500, 25500, 12000, 23500, 24000, 25000, 25500, 26000, 26500, 26500, 27000, 13000, 24500, 25500, 26500, 27000, 27500, 28000, 28000, 28500, 14000, 26000, 26500, 28000, 28500, 29000, 29500, 30000, 30000, 15000, 26500, 28500, 29000, 30000, 30000, 31000, 31000, 31500 }, + MinLaunchDistData = { 22, 8, 200, 250, 300, 350, 400, 450, 500, 550, 300, 29660, 32490, 34400, 35940, 37280, 38500, 39680, 40830, 400, 29470, 32530, 34510, 36110, 37470, 38720, 39920, 41100, 500, 29140, 32500, 34600, 36250, 37640, 38930, 40170, 41360, 600, 28620, 32430, 34660, 36360, 37830, 39130, 40390, 41620, 700, 27770, 32300, 34690, 36470, 37960, 39320, 40600, 41850, 800, 26500, 32100, 34650, 36525, 38075, 39475, 40825, 42100, 900, 24500, 31800, 34600, 36575, 38200, 39625, 41000, 42300, 1000, 22525, 31375, 34475, 36575, 38275, 39775, 41150, 42525, 2000, 11325, 15125, 22475, 31425, 36350, 39275, 41550, 43500, 3000, 9700, 11150, 12700, 15300, 20400, 27900, 34750, 39700, 4000, 10800, 11500, 12300, 13500, 14950, 16950, 21250, 27600, 5000, 12600, 13000, 13400, 14200, 15100, 16200, 17800, 19800, 6000, 14500, 14750, 15250, 15750, 16250, 17250, 18250, 19500, 7000, 16250, 16750, 17000, 17750, 18000, 18500, 19250, 20500, 8000, 17750, 18500, 19000, 19250, 19750, 20000, 20500, 21500, 9000, 19250, 20250, 20500, 21000, 21500, 22000, 22500, 22500, 10000, 20750, 21500, 22250, 22500, 23000, 23500, 23750, 24000, 11000, 22000, 23000, 23500, 24000, 24500, 25000, 25500, 25500, 12000, 23500, 24000, 25000, 25500, 26000, 26500, 27000, 27000, 13000, 24500, 25500, 26500, 27500, 27500, 28000, 28000, 28500, 14000, 26000, 27000, 27500, 28500, 29000, 29500, 30000, 30000, 15000, 26500, 28500, 29000, 30000, 30000, 31000, 31000, 31500 }, Name = "Redacted", Nr_max = 12, OmViz_max = 99.9, diff --git a/_G/weapons_table/weapons/bombs/FAB_100M.lua b/_G/weapons_table/weapons/bombs/FAB_100M.lua index 0be17acc..0d9dcd25 100644 --- a/_G/weapons_table/weapons/bombs/FAB_100M.lua +++ b/_G/weapons_table/weapons/bombs/FAB_100M.lua @@ -1,12 +1,13 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_100M"] = { - _file = "./CoreMods/aircraft/MiG-19P/WEAPONS/MiG-19P_Weapons.lua", - _origin = "MiG-19P AI by RAZBAM", + _file = "./CoreMods/aircraft/MiG-15bis/MiG-15bis.lua", + _origin = "MiG-15bis AI by Eagle Dynamics", + _unique_resource_name = "weapons.bombs.FAB_100M", client = { Ag = -1.23, Cx = 0.00035, VyHold = -100, - _file = "./CoreMods/aircraft/MiG-19P/WEAPONS/MiG-19P_Weapons.lua", - _origin = "MiG-19P AI by RAZBAM", + _file = "./CoreMods/aircraft/MiG-15bis/MiG-15bis.lua", + _origin = "MiG-15bis AI by Eagle Dynamics", arming_delay = { delay_time = 0, enabled = false @@ -45,7 +46,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_100M"] = { char_time = 20.84 }, type = 0, - user_name = "FAB-100M", + user_name = "FAB-100M - 100kg GP Bomb LD", warhead = { caliber = 280, concrete_factors = { 1, 1, 1 }, @@ -61,7 +62,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_100M"] = { }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } }, - display_name = "FAB-100M", + display_name = "FAB-100M - 100kg GP Bomb LD", mass = 100, model = "fab100_40x", name = "FAB_100M", @@ -69,8 +70,8 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_100M"] = { Ag = -1.23, Cx = 0.00035, VyHold = -100, - _file = "./CoreMods/aircraft/MiG-19P/WEAPONS/MiG-19P_Weapons.lua", - _origin = "MiG-19P AI by RAZBAM", + _file = "./CoreMods/aircraft/MiG-15bis/MiG-15bis.lua", + _origin = "MiG-15bis AI by Eagle Dynamics", arming_delay = { delay_time = 0, enabled = false @@ -109,7 +110,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_100M"] = { char_time = 20.84 }, type = 0, - user_name = "FAB-100M", + user_name = "FAB-100M - 100kg GP Bomb LD", warhead = { caliber = 280, concrete_factors = { 1, 1, 1 }, diff --git a/_G/weapons_table/weapons/bombs/FAB_50.lua b/_G/weapons_table/weapons/bombs/FAB_50.lua index 6cd7aeb5..8adfb5da 100644 --- a/_G/weapons_table/weapons/bombs/FAB_50.lua +++ b/_G/weapons_table/weapons/bombs/FAB_50.lua @@ -1,12 +1,13 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_50"] = { - _file = "./CoreMods/aircraft/MiG-19P/WEAPONS/MiG-19P_Weapons.lua", - _origin = "MiG-19P AI by RAZBAM", + _file = "./CoreMods/aircraft/MiG-15bis/MiG-15bis.lua", + _origin = "MiG-15bis AI by Eagle Dynamics", + _unique_resource_name = "weapons.bombs.FAB_50", client = { Ag = -1.23, Cx = 0.00035, VyHold = -100, - _file = "./CoreMods/aircraft/MiG-19P/WEAPONS/MiG-19P_Weapons.lua", - _origin = "MiG-19P AI by RAZBAM", + _file = "./CoreMods/aircraft/MiG-15bis/MiG-15bis.lua", + _origin = "MiG-15bis AI by Eagle Dynamics", arming_delay = { delay_time = 0, enabled = false @@ -45,7 +46,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_50"] = { char_time = 20.87 }, type = 0, - user_name = "FAB-50", + user_name = "FAB-50 - 50kg GP Bomb LD", warhead = { caliber = 200, concrete_factors = { 1, 1, 1 }, @@ -61,7 +62,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_50"] = { }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } }, - display_name = "FAB-50", + display_name = "FAB-50 - 50kg GP Bomb LD", mass = 50, model = "fab50_40x", name = "FAB_50", @@ -69,8 +70,8 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_50"] = { Ag = -1.23, Cx = 0.00035, VyHold = -100, - _file = "./CoreMods/aircraft/MiG-19P/WEAPONS/MiG-19P_Weapons.lua", - _origin = "MiG-19P AI by RAZBAM", + _file = "./CoreMods/aircraft/MiG-15bis/MiG-15bis.lua", + _origin = "MiG-15bis AI by Eagle Dynamics", arming_delay = { delay_time = 0, enabled = false @@ -109,7 +110,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_50"] = { char_time = 20.87 }, type = 0, - user_name = "FAB-50", + user_name = "FAB-50 - 50kg GP Bomb LD", warhead = { caliber = 200, concrete_factors = { 1, 1, 1 }, diff --git a/_G/weapons_table/weapons/missiles/AGM_84D.lua b/_G/weapons_table/weapons/missiles/AGM_84D.lua index 3f59f29e..e9067493 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84D.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84D.lua @@ -111,13 +111,13 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84D"] = { Kd = 0, Ki = 0, Kix = 0, - Ks = 5, + Ks = 8, Kw = 1, Kx = 0, PN_dist_data = { 2000, 1, 500, 1 }, add_err_val = 0, add_err_vert = 0, - add_out_val = 0.1, + add_out_val = 0.03, add_out_vert = 1, conv_input = 0, delay = 1, @@ -361,13 +361,13 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84D"] = { Kd = 0, Ki = 0, Kix = 0, - Ks = 5, + Ks = 8, Kw = 1, Kx = 0, PN_dist_data = { 2000, 1, 500, 1 }, add_err_val = 0, add_err_vert = 0, - add_out_val = 0.1, + add_out_val = 0.03, add_out_vert = 1, conv_input = 0, delay = 1, diff --git a/_G/weapons_table/weapons/missiles/BRM-1_90MM.lua b/_G/weapons_table/weapons/missiles/BRM-1_90MM.lua index d1a2eac4..9626da9c 100644 --- a/_G/weapons_table/weapons/missiles/BRM-1_90MM.lua +++ b/_G/weapons_table/weapons/missiles/BRM-1_90MM.lua @@ -68,14 +68,14 @@ _G["weapons_table"]["weapons"]["missiles"]["BRM-1_90MM"] = { maxAoa = 0.13962634015955, shapeName = "brm1_90", wind_sigma = 5, - wind_time = 1.1 + wind_time = 1.5 }, march = { boost_factor = 1, boost_tail = 1, boost_time = 0, custom_smoke_dissipation_factor = 0.2, - fuel_mass = 5, + fuel_mass = 5.65, impulse = 190, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -0.95, 0, 0 } }, @@ -205,14 +205,14 @@ _G["weapons_table"]["weapons"]["missiles"]["BRM-1_90MM"] = { maxAoa = 0.13962634015955, shapeName = "brm1_90", wind_sigma = 5, - wind_time = 1.1 + wind_time = 1.5 }, march = { boost_factor = 1, boost_tail = 1, boost_time = 0, custom_smoke_dissipation_factor = 0.2, - fuel_mass = 5, + fuel_mass = 5.65, impulse = 190, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -0.95, 0, 0 } }, diff --git a/_G/weapons_table/weapons/missiles/LD-10.lua b/_G/weapons_table/weapons/missiles/LD-10.lua index 107a8cb5..6667bd8d 100644 --- a/_G/weapons_table/weapons/missiles/LD-10.lua +++ b/_G/weapons_table/weapons/missiles/LD-10.lua @@ -52,18 +52,18 @@ _G["weapons_table"]["weapons"]["missiles"]["LD-10"] = { fins_limit = 0.34906585039887, fins_limit_x = 0.087266462599716, loft_active_by_default = 0, - loft_add_pitch = 0.34906585039887, + loft_add_pitch = 0.26179938779915, loft_min_add_pitch = 0.17453292519943, - loft_min_dist = 1000, + loft_min_dist = 5000, loft_min_trig_ang = 0.087266462599716, - loft_trig_ang = 0.34906585039887, - loft_trig_change_max_dist = 35000, + loft_trig_ang = 0.17453292519943, + loft_trig_change_max_dist = 40000, loft_trig_change_min_dist = 20000, loft_trig_max_alt = 3000, - max_pitch_cmd = 0.55850536063819, + max_pitch_cmd = 0.34906585039887, max_signal_Fi = 0.20943951023932, min_a_conv_approach_vel = 100, - min_horiz_time = 1, + min_horiz_time = 3, null_roll = 0.78539816339745, op_time = 240, rotate_fins_output = 0, @@ -100,8 +100,8 @@ _G["weapons_table"]["weapons"]["missiles"]["LD-10"] = { K1 = { 0.00264, 0.00264, 0.00264, 0.00264, 0.00264, 0.00264, 0.0022, 0.001873, 0.0016435, 0.0014752, 0.0013448, 0.0012436, 0.0011534, 0.0010742, 0.0010149, 0.0009484, 0.0009016, 0.0008476, 0.000795, 0.0007529, 0.0007122, 0.0006727, 0.0006343, 0.0006058, 0.0005781, 0.00056 }, K2 = { -0.00257, -0.00257, -0.00257, -0.00257, -0.00257, -0.00265, -0.002274, -0.002034, -0.0018241, -0.0016225, -0.0014468, -0.001275, -0.0011248, -0.0009777, -0.0008514, -0.0007274, -0.0006236, -0.0005217, -0.0004393, -0.0003584, -0.0002968, -0.0002363, -0.0001949, -0.0001546, -0.0001335, -0.000114 }, L = 0.203, - Mxd = 17.19, - Mxw = -44.5, + Mxd = 5.73, + Mxw = -15.8, Mya = { -0.5, -0.5 }, Myw = { -2, -2 }, Mza = { -0.5, -0.5 }, @@ -142,13 +142,13 @@ _G["weapons_table"]["weapons"]["missiles"]["LD-10"] = { }, scheme = "schemes/missiles/anti_rad_missile.sch", seeker = { - FOV = 1.0471975511966, + FOV = 2.0943951023932, abs_err_val = 2, - aim_sigma = 4, - aim_y_offset = 2.5, + aim_sigma = 2, + aim_y_offset = 0.5, ang_err_val = 0.00013962634015955, blind_rad_val = 0.1, - calc_aim_dist = 500000, + calc_aim_dist = 200000, delay = 2.4, err_correct_time = 2, keep_aim_time = 5, @@ -254,18 +254,18 @@ _G["weapons_table"]["weapons"]["missiles"]["LD-10"] = { fins_limit = 0.34906585039887, fins_limit_x = 0.087266462599716, loft_active_by_default = 0, - loft_add_pitch = 0.34906585039887, + loft_add_pitch = 0.26179938779915, loft_min_add_pitch = 0.17453292519943, - loft_min_dist = 1000, + loft_min_dist = 5000, loft_min_trig_ang = 0.087266462599716, - loft_trig_ang = 0.34906585039887, - loft_trig_change_max_dist = 35000, + loft_trig_ang = 0.17453292519943, + loft_trig_change_max_dist = 40000, loft_trig_change_min_dist = 20000, loft_trig_max_alt = 3000, - max_pitch_cmd = 0.55850536063819, + max_pitch_cmd = 0.34906585039887, max_signal_Fi = 0.20943951023932, min_a_conv_approach_vel = 100, - min_horiz_time = 1, + min_horiz_time = 3, null_roll = 0.78539816339745, op_time = 240, rotate_fins_output = 0, @@ -302,8 +302,8 @@ _G["weapons_table"]["weapons"]["missiles"]["LD-10"] = { K1 = { 0.00264, 0.00264, 0.00264, 0.00264, 0.00264, 0.00264, 0.0022, 0.001873, 0.0016435, 0.0014752, 0.0013448, 0.0012436, 0.0011534, 0.0010742, 0.0010149, 0.0009484, 0.0009016, 0.0008476, 0.000795, 0.0007529, 0.0007122, 0.0006727, 0.0006343, 0.0006058, 0.0005781, 0.00056 }, K2 = { -0.00257, -0.00257, -0.00257, -0.00257, -0.00257, -0.00265, -0.002274, -0.002034, -0.0018241, -0.0016225, -0.0014468, -0.001275, -0.0011248, -0.0009777, -0.0008514, -0.0007274, -0.0006236, -0.0005217, -0.0004393, -0.0003584, -0.0002968, -0.0002363, -0.0001949, -0.0001546, -0.0001335, -0.000114 }, L = 0.203, - Mxd = 17.19, - Mxw = -44.5, + Mxd = 5.73, + Mxw = -15.8, Mya = { -0.5, -0.5 }, Myw = { -2, -2 }, Mza = { -0.5, -0.5 }, @@ -344,13 +344,13 @@ _G["weapons_table"]["weapons"]["missiles"]["LD-10"] = { }, scheme = "schemes/missiles/anti_rad_missile.sch", seeker = { - FOV = 1.0471975511966, + FOV = 2.0943951023932, abs_err_val = 2, - aim_sigma = 4, - aim_y_offset = 2.5, + aim_sigma = 2, + aim_y_offset = 0.5, ang_err_val = 0.00013962634015955, blind_rad_val = 0.1, - calc_aim_dist = 500000, + calc_aim_dist = 200000, delay = 2.4, err_correct_time = 2, keep_aim_time = 5, diff --git a/_G/weapons_table/weapons/nurs/UG_90MM.lua b/_G/weapons_table/weapons/nurs/UG_90MM.lua index 119e4210..49fd5565 100644 --- a/_G/weapons_table/weapons/nurs/UG_90MM.lua +++ b/_G/weapons_table/weapons/nurs/UG_90MM.lua @@ -11,31 +11,31 @@ _G["weapons_table"]["weapons"]["nurs"]["UG_90MM"] = { boost_factor = 1, boost_tail = 1, boost_time = 0, - fuel_mass = 5, - impulse = 205, + fuel_mass = 9, + impulse = 190, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -0.65, 0, 0 } }, smoke_color = { 0.9, 0.9, 0.9 }, smoke_transparency = 0.5, tail_width = 0.052, work_tail = 1, - work_time = 1.1 + work_time = 2.45 }, fm = { - I = 5, + I = 6.6666666666667, L = 2, - Ma = 2, - Mw = 5, + Ma = 0.84, + Mw = 3.5, caliber = 0.09, cx_coeff = { 1, 0.9, 0.6, 0.32, 2.1 }, freq = 7, - mass = 15, + mass = 20, rail_open = false, shapeName = "90-1", wind_sigma = 5, - wind_time = 1.1 + wind_time = 2.45 }, - mass = 15, + mass = 20, model = "90-1", name = "UG_90MM", properties = { @@ -83,7 +83,7 @@ _G["weapons_table"]["weapons"]["nurs"]["UG_90MM"] = { display_name = "UG_90MM", dist_max = 8000, dist_min = 600, - mass = 15, + mass = 20, model = "90-1", name = "UG_90MM", server = { @@ -95,31 +95,31 @@ _G["weapons_table"]["weapons"]["nurs"]["UG_90MM"] = { boost_factor = 1, boost_tail = 1, boost_time = 0, - fuel_mass = 5, - impulse = 205, + fuel_mass = 9, + impulse = 190, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -0.65, 0, 0 } }, smoke_color = { 0.9, 0.9, 0.9 }, smoke_transparency = 0.5, tail_width = 0.052, work_tail = 1, - work_time = 1.1 + work_time = 2.45 }, fm = { - I = 5, + I = 6.6666666666667, L = 2, - Ma = 2, - Mw = 5, + Ma = 0.84, + Mw = 3.5, caliber = 0.09, cx_coeff = { 1, 0.9, 0.6, 0.32, 2.1 }, freq = 7, - mass = 15, + mass = 20, rail_open = false, shapeName = "90-1", wind_sigma = 5, - wind_time = 1.1 + wind_time = 2.45 }, - mass = 15, + mass = 20, model = "90-1", name = "UG_90MM", properties = { @@ -165,23 +165,23 @@ _G["weapons_table"]["weapons"]["nurs"]["UG_90MM"] = { }, sight_data = { engine = { - fuel_mass = 5, - impulse = 205, - work_time = 1.1 + fuel_mass = 9, + impulse = 190, + work_time = 2.45 }, fm = { - I = 5, + I = 6.6666666666667, L = 2, - Ma = 2, - Mw = 5, + Ma = 0.84, + Mw = 3.5, caliber = 0.09, cx_coeff = { 1, 0.9, 0.6, 0.32, 2.1 }, freq = 7, - mass = 15, + mass = 20, rail_open = false, shapeName = "90-1", wind_sigma = 5, - wind_time = 1.1 + wind_time = 2.45 } }, sounderName = "Weapons/Rocket",