Skip to content

Commit

Permalink
2.7.14.23966
Browse files Browse the repository at this point in the history
  • Loading branch information
Quaggles committed May 19, 2022
1 parent df57b9c commit 8f7fe54
Show file tree
Hide file tree
Showing 34 changed files with 304 additions and 286 deletions.
2 changes: 1 addition & 1 deletion _G/__DCS_VERSION__.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.12.23362
2.7.14.23966
6 changes: 3 additions & 3 deletions _G/bombs/FAB_100M.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions _G/bombs/FAB_50.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions _G/db/Units/Cars/Car/HQ-7_LN_SP.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 } },
Expand Down Expand Up @@ -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",
Expand Down
40 changes: 0 additions & 40 deletions _G/db/Units/Cars/Car/HQ-7_STR_SP.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion _G/db/Units/Cars/Car/Infantry AK Ins.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion _G/db/Units/Cars/Car/soldier_mauser98.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion _G/db/Units/Cars/Car/soldier_wwii_br_01.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion _G/db/Units/Cars/Car/soldier_wwii_us.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
30 changes: 20 additions & 10 deletions _G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion _G/db/Units/Helicopters/Helicopter/Mi-24P.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
74 changes: 57 additions & 17 deletions _G/db/Units/Helicopters/Helicopter/SA342L.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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,
Expand All @@ -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 = {},
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 1 addition & 4 deletions _G/db/Units/Helicopters/Helicopter/SA342M.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
14 changes: 10 additions & 4 deletions _G/db/Units/Helicopters/Helicopter/SA342Minigun.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down
Loading

0 comments on commit 8f7fe54

Please sign in to comment.