Merge branch 'master' into release-3.11.0

This commit is contained in:
jonpas 2017-10-23 20:20:04 +02:00
commit 84cd5d8749
12 changed files with 329 additions and 122 deletions

View File

@ -32,51 +32,51 @@ if ((profileNamespace getVariable ["ACE_ATragMX_profileNamespaceVersion", 0]) ==
if (_resetGunList) then {
WARNING("Reseting Profile Gunlist");
// Profile Name, Muzzle Velocity, Zero Range, Scope Base Angle, AirFriction, Bore Height, Scope Unit, Scope Click Unit, Scope Click Number, Maximum Elevation, Dialed Elevation, Dialed Windage, Mass, Bullet Diameter, Rifle Twist, BC, Drag Model, Atmosphere Model, Muzzle Velocity vs. Temperature Interpolation, C1 Ballistic Coefficient vs. Distance Interpolation, Persistent
GVAR(gunList) = [["12.7x108mm" , 812, 100, 0.0666557, -0.00063800, 3.81, 0, 2, 10, 120, 0, 0, 48.28, 12.7, 38.10, 0.630, 1, "ASM" , [[-15,793],[0,800],[10,807],[15,812],[25,826],[30,835],[35,846]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
GVAR(gunList) = [["12.7x108mm" , 812, 100, 0.0958029, -0.00063800, 8.89, 0, 2, 10, 120, 0, 0, 48.28, 12.7, 38.10, 0.630, 1, "ASM" , [[-15,793],[0,800],[10,807],[15,812],[25,826],[30,835],[35,846]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["12.7x99mm AMAX" , 852, 100, 0.0615965, -0.00037397, 3.81, 0, 2, 10, 120, 0, 0, 48.60, 12.7, 38.10, 1.050, 1, "ASM" , [[-15,833],[0,840],[10,847],[15,852],[25,866],[30,875],[35,886]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["12.7x99mm" , 892, 100, 0.0588284, -0.00058679, 3.81, 0, 2, 10, 120, 0, 0, 41.92, 12.7, 38.10, 0.670, 1, "ASM" , [[-15,873],[0,880],[10,887],[15,892],[25,906],[30,915],[35,926]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["12.7x99mm AMAX" , 852, 100, 0.0907214, -0.00037397, 8.89, 0, 2, 10, 120, 0, 0, 48.60, 12.7, 38.10, 1.050, 1, "ASM" , [[-15,833],[0,840],[10,847],[15,852],[25,866],[30,875],[35,886]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["12.7x99mm" , 892, 100, 0.0879633, -0.00058679, 8.89, 0, 2, 10, 120, 0, 0, 41.92, 12.7, 38.10, 0.670, 1, "ASM" , [[-15,873],[0,880],[10,887],[15,892],[25,906],[30,915],[35,926]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["12.7x54mm" , 299, 100, 0.3406920, -0.00019568, 3.81, 0, 2, 10, 120, 0, 0, 48.60, 12.7, 24.13, 1.050, 1, "ASM" , [[-15,297],[0,298],[10,299],[15,299],[25,301],[30,302],[35,303]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["12.7x54mm" , 299, 100, 0.3567550, -0.00019568, 6.60, 0, 2, 10, 120, 0, 0, 48.60, 12.7, 24.13, 1.050, 1, "ASM" , [[-15,297],[0,298],[10,299],[15,299],[25,301],[30,302],[35,303]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".50 Beowulf" , 562, 100, 0.1262000, -0.00205896, 3.81, 0, 2, 10, 120, 0, 0, 21.71, 12.7, 50.80, 0.210, 1, "ASM" , [[-15,560],[0,561],[10,562],[15,562],[25,564],[30,565],[35,566]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".50 Beowulf" , 562, 100, 0.1425100, -0.00205896, 6.60, 0, 2, 10, 120, 0, 0, 21.71, 12.7, 50.80, 0.210, 1, "ASM" , [[-15,560],[0,561],[10,562],[15,562],[25,564],[30,565],[35,566]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".408 CheyTac 305gr", 1059, 100, 0.0482146, -0.00065414, 3.81, 0, 2, 10, 120, 0, 0, 19.76, 10.4, 33.02, 0.569, 1, "ICAO", [[-15,1040],[0,1047],[10,1054],[15,1059],[25,1073],[30,1082],[35,1093]], [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".408 CheyTac 419gr", 859, 100, 0.0611842, -0.00046249, 3.81, 0, 2, 10, 120, 0, 0, 27.15, 10.4, 33.02, 0.866, 1, "ICAO", [[-15,840],[0,847],[10,854],[15,859],[25,873],[30,882],[35,893]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".408 CheyTac 305gr", 1059, 100, 0.0686329, -0.00065414, 7.37, 0, 2, 10, 120, 0, 0, 19.76, 10.4, 33.02, 0.569, 1, "ICAO", [[-15,1040],[0,1047],[10,1054],[15,1059],[25,1073],[30,1082],[35,1093]], [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".408 CheyTac 419gr", 859, 100, 0.0816039, -0.00046249, 7.37, 0, 2, 10, 120, 0, 0, 27.15, 10.4, 33.02, 0.866, 1, "ICAO", [[-15,840],[0,847],[10,854],[15,859],[25,873],[30,882],[35,893]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["9.3×64mm" , 862, 100, 0.0627652, -0.00110727, 3.81, 0, 2, 10, 120, 0, 0, 14.90, 9.30, 35.56, 0.368, 1, "ASM" , [[-15,843],[0,850],[10,857],[15,862],[25,876],[30,885],[35,896]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["9.3×64mm" , 862, 100, 0.0875873, -0.00110727, 8.13, 0, 2, 10, 120, 0, 0, 14.90, 9.30, 35.56, 0.368, 1, "ASM" , [[-15,843],[0,850],[10,857],[15,862],[25,876],[30,885],[35,896]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".338LM 250gr" , 872, 100, 0.0604821, -0.00060841, 3.81, 0, 2, 10, 120, 0, 0, 16.20, 8.58, 25.40, 0.645, 1, "ICAO", [[-15,853],[0,860],[10,867],[15,872],[25,886],[30,895],[35,906]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".338LM 300gr" , 792, 100, 0.0685883, -0.00055706, 3.81, 0, 2, 10, 120, 0, 0, 19.44, 8.58, 25.40, 0.759, 1, "ICAO", [[-15,773],[0,780],[10,787],[15,792],[25,806],[30,815],[35,826]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".338LM API526" , 872, 100, 0.0602535, -0.00069220, 3.81, 0, 2, 10, 120, 0, 0, 16.39, 8.58, 25.40, 0.580, 1, "ICAO", [[-15,853],[0,860],[10,867],[15,872],[25,886],[30,895],[35,906]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".338LM 250gr" , 872, 100, 0.0809096, -0.00060841, 7.37, 0, 2, 10, 120, 0, 0, 16.20, 8.58, 25.40, 0.645, 1, "ICAO", [[-15,853],[0,860],[10,867],[15,872],[25,886],[30,895],[35,906]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".338LM 300gr" , 792, 100, 0.0890193, -0.00055706, 7.37, 0, 2, 10, 120, 0, 0, 19.44, 8.58, 25.40, 0.759, 1, "ICAO", [[-15,773],[0,780],[10,787],[15,792],[25,806],[30,815],[35,826]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".338LM API526" , 872, 100, 0.0810834, -0.00069220, 7.37, 0, 2, 10, 120, 0, 0, 16.39, 8.58, 25.40, 0.580, 1, "ICAO", [[-15,853],[0,860],[10,867],[15,872],[25,886],[30,895],[35,906]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".300WM Mk248 Mod0" , 857, 100, 0.0621425, -0.00072468, 3.81, 0, 2, 10, 120, 0, 0, 12.31, 7.80, 25.40, 0.537, 1, "ICAO", [[-15,838],[0,845],[10,852],[15,857],[25,871],[30,880],[35,891]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".300WM Mk248 Mod1" , 839, 100, 0.0637038, -0.00063027, 3.81, 0, 2, 10, 120, 0, 0, 14.26, 7.80, 25.40, 0.619, 1, "ICAO", [[-15,820],[0,827],[10,834],[15,839],[25,853],[30,862],[35,873]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".300WM Berger OTM" , 792, 100, 0.0686968, -0.00055262, 3.81, 0, 2, 10, 120, 0, 0, 14.90, 7.80, 25.40, 0.715, 1, "ICAO", [[-15,773],[0,780],[10,787],[15,792],[25,806],[30,815],[35,826]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".300WM Mk248 Mod0" , 857, 100, 0.0825862, -0.00072468, 7.37, 0, 2, 10, 120, 0, 0, 12.31, 7.80, 25.40, 0.537, 1, "ICAO", [[-15,838],[0,845],[10,852],[15,857],[25,871],[30,880],[35,891]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".300WM Mk248 Mod1" , 839, 100, 0.0841417, -0.00063027, 7.37, 0, 2, 10, 120, 0, 0, 14.26, 7.80, 25.40, 0.619, 1, "ICAO", [[-15,820],[0,827],[10,834],[15,839],[25,853],[30,862],[35,873]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
[".300WM Berger OTM" , 792, 100, 0.0891300, -0.00055262, 7.37, 0, 2, 10, 120, 0, 0, 14.90, 7.80, 25.40, 0.715, 1, "ICAO", [[-15,773],[0,780],[10,787],[15,792],[25,806],[30,815],[35,826]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x54mmR" , 812, 100, 0.0678441, -0.00102329, 3.81, 0, 2, 10, 120, 0, 0, 9.849, 7.92, 24.13, 0.400, 1, "ICAO", [[-15,793],[0,800],[10,807],[15,812],[25,826],[30,835],[35,846]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x54mmR" , 812, 100, 0.0868171, -0.00102329, 7.11, 0, 2, 10, 120, 0, 0, 9.849, 7.92, 24.13, 0.400, 1, "ICAO", [[-15,793],[0,800],[10,807],[15,812],[25,826],[30,835],[35,846]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm M80" , 802, 100, 0.0690229, -0.00103711, 3.81, 0, 2, 10, 120, 0, 0, 9.461, 7.82, 25.40, 0.398, 1, "ICAO", [[-15,783],[0,790],[10,797],[15,802],[25,816],[30,825],[35,836]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm M118LR" , 757, 100, 0.0739989, -0.00085157, 3.81, 0, 2, 10, 120, 0, 0, 11.34, 7.82, 25.40, 0.482, 1, "ICAO", [[-15,738],[0,745],[10,752],[15,757],[25,771],[30,780],[35,791]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm Mk316" , 781, 100, 0.0709422, -0.00084311, 3.81, 0, 2, 10, 120, 0, 0, 11.34, 7.82, 25.40, 0.483, 1, "ICAO", [[-15,777],[0,778],[10,779],[15,781],[25,783],[30,785],[35,787]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm Mk319" , 900, 100, 0.0593025, -0.00104515, 3.81, 0, 2, 10, 120, 0, 0, 8.424, 7.82, 25.40, 0.377, 1, "ICAO", [[-15,898],[0,899],[10,900],[15,900],[25,902],[30,903],[35,904]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm M993" , 912, 100, 0.0585007, -0.00109390, 3.81, 0, 2, 10, 120, 0, 0, 8.230, 7.82, 25.40, 0.359, 1, "ICAO", [[-15,893],[0,900],[10,907],[15,912],[25,926],[30,935],[35,946]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm Subsonic", 314, 100, 0.3168140, -0.00060194, 3.81, 0, 2, 10, 120, 0, 0, 12.96, 7.82, 25.40, 0.502, 1, "ICAO", [[-15,312],[0,313],[10,314],[15,314],[25,316],[30,317],[35,318]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm M80" , 802, 100, 0.0909184, -0.00103711, 7.62, 0, 2, 10, 120, 0, 0, 9.461, 7.82, 25.40, 0.398, 1, "ICAO", [[-15,783],[0,790],[10,797],[15,802],[25,816],[30,825],[35,836]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm M118LR" , 757, 100, 0.0958841, -0.00085157, 7.62, 0, 2, 10, 120, 0, 0, 11.34, 7.82, 25.40, 0.482, 1, "ICAO", [[-15,738],[0,745],[10,752],[15,757],[25,771],[30,780],[35,791]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm Mk316" , 781, 100, 0.0928267, -0.00084311, 7.62, 0, 2, 10, 120, 0, 0, 11.34, 7.82, 25.40, 0.483, 1, "ICAO", [[-15,777],[0,778],[10,779],[15,781],[25,783],[30,785],[35,787]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm Mk319" , 900, 100, 0.0811838, -0.00104515, 7.62, 0, 2, 10, 120, 0, 0, 8.424, 7.82, 25.40, 0.377, 1, "ICAO", [[-15,898],[0,899],[10,900],[15,900],[25,902],[30,903],[35,904]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm M993" , 912, 100, 0.0803840, -0.00109390, 7.62, 0, 2, 10, 120, 0, 0, 8.230, 7.82, 25.40, 0.359, 1, "ICAO", [[-15,893],[0,900],[10,907],[15,912],[25,926],[30,935],[35,946]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm Subsonic", 314, 100, 0.3344490, -0.00060194, 6.86, 0, 2, 10, 120, 0, 0, 12.96, 7.82, 25.40, 0.502, 1, "ICAO", [[-15,312],[0,313],[10,314],[15,314],[25,316],[30,317],[35,318]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x39mm" , 708, 100, 0.0846559, -0.00154815, 3.81, 0, 2, 10, 120, 0, 0, 7.970, 7.82, 25.40, 0.275, 1, "ICAO", [[-15,689],[0,696],[10,703],[15,708],[25,722],[30,731],[35,742]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x39mm" , 708, 100, 0.1066160, -0.00154815, 7.62, 0, 2, 10, 120, 0, 0, 7.970, 7.82, 25.40, 0.275, 1, "ICAO", [[-15,689],[0,696],[10,703],[15,708],[25,722],[30,731],[35,742]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["6.5x39mm" , 766, 100, 0.0725986, -0.00077363, 3.81, 0, 2, 10, 120, 0, 0, 7.970, 6.71, 22.86, 0.524, 1, "ICAO", [[-15,747],[0,754],[10,761],[15,766],[25,780],[30,789],[35,800]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["6.5x47mm Lapua" , 767, 100, 0.0722256, -0.00069003, 3.81, 0, 2, 10, 120, 0, 0, 9.007, 6.71, 22.86, 0.577, 1, "ICAO", [[-15,748],[0,755],[10,762],[15,767],[25,781],[30,790],[35,801]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["6.5mm Creedmor" , 822, 100, 0.0655022, -0.00062437, 3.81, 0, 2, 10, 120, 0, 0, 9.072, 6.71, 22.86, 0.632, 1, "ICAO", [[-15,803],[0,810],[10,817],[15,822],[25,836],[30,845],[35,856]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["6.5x39mm" , 766, 100, 0.0872025, -0.00077363, 6.35, 0, 2, 10, 120, 0, 0, 7.970, 6.71, 22.86, 0.524, 1, "ICAO", [[-15,747],[0,754],[10,761],[15,766],[25,780],[30,789],[35,800]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["6.5x47mm Lapua" , 767, 100, 0.0868248, -0.00069003, 6.35, 0, 2, 10, 120, 0, 0, 9.007, 6.71, 22.86, 0.577, 1, "ICAO", [[-15,748],[0,755],[10,762],[15,767],[25,781],[30,790],[35,801]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["6.5mm Creedmor" , 822, 100, 0.0800956, -0.00062437, 6.35, 0, 2, 10, 120, 0, 0, 9.072, 6.71, 22.86, 0.632, 1, "ICAO", [[-15,803],[0,810],[10,817],[15,822],[25,836],[30,845],[35,856]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.8x42mm DBP87" , 942, 100, 0.0566639, -0.00121087, 3.81, 0, 2, 10, 120, 0, 0, 4.150, 5.99, 24.40, 0.313, 1, "ICAO", [[-15,923],[0,930],[10,937],[15,942],[25,956],[30,965],[35,976]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.8x42mm DBP87" , 942, 100, 0.0916742, -0.00121087, 9.91, 0, 2, 10, 120, 0, 0, 4.150, 5.99, 24.40, 0.313, 1, "ICAO", [[-15,923],[0,930],[10,937],[15,942],[25,956],[30,965],[35,976]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.56x45mm M855" , 862, 100, 0.0635456, -0.00130094, 3.81, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.302, 1, "ASM" , [[-15,843],[0,849],[10,857],[15,862],[25,876],[30,885],[35,898]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.56x45mm Mk262" , 812, 100, 0.0682606, -0.00111805, 3.81, 0, 2, 10, 120, 0, 0, 4.990, 5.70, 17.78, 0.361, 1, "ASM" , [[-15,793],[0,800],[10,807],[15,812],[25,826],[30,835],[35,846]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.56x45mm Mk318" , 872, 100, 0.0624569, -0.00125880, 3.81, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.307, 1, "ASM" , [[-15,853],[0,860],[10,867],[15,872],[25,886],[30,895],[35,906]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.56x45mm M995" , 861, 100, 0.0635355, -0.00126182, 3.81, 0, 2, 10, 120, 0, 0, 4.536, 5.70, 17.78, 0.310, 1, "ASM" , [[-15,842],[0,849],[10,856],[15,861],[25,875],[30,884],[35,895]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.56x45mm M855" , 862, 100, 0.0825404, -0.00130094, 7.11, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.302, 1, "ASM" , [[-15,843],[0,849],[10,857],[15,862],[25,876],[30,885],[35,898]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.56x45mm Mk262" , 812, 100, 0.0872422, -0.00111805, 7.11, 0, 2, 10, 120, 0, 0, 4.990, 5.70, 17.78, 0.361, 1, "ASM" , [[-15,793],[0,800],[10,807],[15,812],[25,826],[30,835],[35,846]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.56x45mm Mk318" , 872, 100, 0.0814490, -0.00125880, 7.11, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.307, 1, "ASM" , [[-15,853],[0,860],[10,867],[15,872],[25,886],[30,895],[35,906]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.56x45mm M995" , 861, 100, 0.0825279, -0.00126182, 7.11, 0, 2, 10, 120, 0, 0, 4.536, 5.70, 17.78, 0.310, 1, "ASM" , [[-15,842],[0,849],[10,856],[15,861],[25,875],[30,884],[35,895]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.45x39mm 7N6M" , 727, 100, 0.0801269, -0.00119458, 3.81, 0, 2, 10, 120, 0, 0, 3.428, 5.59, 16.00, 0.336, 1, "ICAO", [[-15,708],[0,715],[10,722],[15,727],[25,741],[30,750],[35,761]], [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true]];
["5.45x39mm 7N6M" , 727, 100, 0.0802286, -0.00119458, 3.81, 0, 2, 10, 120, 0, 0, 3.428, 5.59, 16.00, 0.336, 1, "ICAO", [[-15,708],[0,715],[10,722],[15,727],[25,741],[30,750],[35,761]], [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true]];
[] call FUNC(clear_user_data);
profileNamespace setVariable ["ACE_ATragMX_gunList", GVAR(gunList)];

View File

@ -1,57 +1,61 @@
class Mode_SemiAuto;
class Mode_Burst;
class Mode_FullAuto;
class CfgWeapons {
class ItemCore;
class InventoryOpticsItem_Base_F;
class optic_Yorris : ItemCore {
ACE_ScopeHeightAboveRail = 0.4;
ACE_ScopeHeightAboveRail = 2.77224;
};
class optic_MRD : ItemCore {
ACE_ScopeHeightAboveRail = 0.6;
ACE_ScopeHeightAboveRail = 2.8;
};
class optic_Aco : ItemCore {
ACE_ScopeHeightAboveRail = 1.8;
ACE_ScopeHeightAboveRail = 3.69248;
};
class optic_ACO_grn : ItemCore {
ACE_ScopeHeightAboveRail = 1.8;
ACE_ScopeHeightAboveRail = 3.69248;
};
class optic_ACO_grn_smg : ItemCore {
ACE_ScopeHeightAboveRail = 1.8;
ACE_ScopeHeightAboveRail = 3.69248;
};
class optic_ACO_smg : ItemCore {
ACE_ScopeHeightAboveRail = 1.8;
ACE_ScopeHeightAboveRail = 3.69248;
};
class optic_Holosight : ItemCore {
ACE_ScopeHeightAboveRail = 2.4;
ACE_ScopeHeightAboveRail = 4.66933;
};
class optic_Holosight_smg : ItemCore {
ACE_ScopeHeightAboveRail = 2.4;
ACE_ScopeHeightAboveRail = 4.66933;
};
class optic_Arco : ItemCore {
ACE_ScopeHeightAboveRail = 3.0;
ACE_ScopeHeightAboveRail = 4.89287;
};
class optic_ERCO_blk_F : optic_Arco {
ACE_ScopeHeightAboveRail = 2.6;
ACE_ScopeHeightAboveRail = 3.48836;
};
class optic_Hamr : ItemCore {
ACE_ScopeHeightAboveRail = 3.2;
ACE_ScopeHeightAboveRail = 4.48584;
};
class optic_MRCO : ItemCore {
ACE_ScopeHeightAboveRail = 2.5;
ACE_ScopeHeightAboveRail = 3.88405;
};
class optic_Nightstalker : ItemCore {
ACE_ScopeHeightAboveRail = 4.2;
ACE_ScopeHeightAboveRail = 5.54325;
ACE_ScopeAdjust_Vertical[] = {-4, 30};
ACE_ScopeAdjust_Horizontal[] = {-6, 6};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -67,7 +71,7 @@ class CfgWeapons {
};
class optic_NVS : ItemCore {
ACE_ScopeHeightAboveRail = 4.2;
ACE_ScopeHeightAboveRail = 5.54325;
ACE_ScopeAdjust_Vertical[] = {-4, 30};
ACE_ScopeAdjust_Horizontal[] = {-6, 6};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -83,7 +87,7 @@ class CfgWeapons {
};
class optic_TWS : ItemCore {
ACE_ScopeHeightAboveRail = 4.2;
ACE_ScopeHeightAboveRail = 5.52874;
ACE_ScopeAdjust_Vertical[] = {-4, 30};
ACE_ScopeAdjust_Horizontal[] = {-6, 6};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -99,7 +103,7 @@ class CfgWeapons {
};
class optic_LRPS : ItemCore {
ACE_ScopeHeightAboveRail = 4.0;
ACE_ScopeHeightAboveRail = 4.2098;
ACE_ScopeAdjust_Vertical[] = {-4, 30};
ACE_ScopeAdjust_Horizontal[] = {-6, 6};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -119,7 +123,7 @@ class CfgWeapons {
};
class optic_SOS : ItemCore {
ACE_ScopeHeightAboveRail = 3.8;
ACE_ScopeHeightAboveRail = 4.41328;
ACE_ScopeAdjust_Vertical[] = {-4, 30};
ACE_ScopeAdjust_Horizontal[] = {-6, 6};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -135,7 +139,7 @@ class CfgWeapons {
};
class optic_DMS : ItemCore {
ACE_ScopeHeightAboveRail = 3.6;
ACE_ScopeHeightAboveRail = 3.86253;
ACE_ScopeAdjust_Vertical[] = {-4, 20};
ACE_ScopeAdjust_Horizontal[] = {-6, 6};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -151,7 +155,7 @@ class CfgWeapons {
};
class optic_AMS_base : ItemCore {
ACE_ScopeHeightAboveRail = 3.6;
ACE_ScopeHeightAboveRail = 3.8933;
ACE_ScopeAdjust_Vertical[] = {-4, 30};
ACE_ScopeAdjust_Horizontal[] = {-6, 6};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -171,7 +175,7 @@ class CfgWeapons {
};
class optic_KHS_base : ItemCore {
ACE_ScopeHeightAboveRail = 4.0;
ACE_ScopeHeightAboveRail = 4.30723;
ACE_ScopeAdjust_Vertical[] = {-4, 30};
ACE_ScopeAdjust_Horizontal[] = {-6, 6};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -191,7 +195,7 @@ class CfgWeapons {
};
class optic_KHS_old : ItemCore {
ACE_ScopeHeightAboveRail = 4.0;
ACE_ScopeHeightAboveRail = 4.30723;
ACE_ScopeAdjust_Vertical[] = {-4, 30};
ACE_ScopeAdjust_Horizontal[] = {-6, 6};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -209,4 +213,177 @@ class CfgWeapons {
};
};
};
class Rifle_Base_F;
class Rifle_Short_Base_F: Rifle_Base_F {};
class Rifle_Long_Base_F: Rifle_Base_F {};
class DMR_07_base_F: Rifle_Long_Base_F {
ACE_RailHeightAboveBore = 5.07109;
};
class arifle_MX_Base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {};
class FullAuto: Mode_FullAuto {};
};
class arifle_MX_SW_F: arifle_MX_Base_F {
ACE_RailHeightAboveBore = 2.40874;
};
class arifle_MXM_F: arifle_MX_Base_F {
ACE_RailHeightAboveBore = 2.40323;
};
class arifle_SPAR_01_base_F: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.20768;
};
class arifle_SPAR_02_base_F: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.22175;
};
class arifle_SPAR_03_base_F: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.71491;
};
class LMG_Mk200_F: Rifle_Long_Base_F {
ACE_RailHeightAboveBore = 2.68925;
};
class LMG_Zafir_F: Rifle_Long_Base_F {
ACE_RailHeightAboveBore = 0.996651;
};
class LMG_03_base_F: Rifle_Long_Base_F {
ACE_RailHeightAboveBore = 4.24282;
};
class pdw2000_base_F: Rifle_Short_Base_F {
ACE_RailHeightAboveBore = 3.08883;
};
class arifle_AKS_base_F: Rifle_Base_F {
ACE_RailHeightAboveBore = 0;
};
class arifle_AKM_base_F: Rifle_Base_F {
ACE_RailHeightAboveBore = 0;
};
class arifle_AK12_base_F: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.82508;
};
class arifle_CTAR_base_F: Rifle_Base_F {
ACE_RailHeightAboveBore = 6.07588;
};
class arifle_CTARS_base_F: Rifle_Base_F {
ACE_RailHeightAboveBore = 6.0787;
};
class arifle_ARX_base_F: Rifle_Base_F {
ACE_RailHeightAboveBore = 2.81635;
};
class arifle_katiba_Base_F: Rifle_Base_F {};
class arifle_Katiba_F: arifle_katiba_Base_F {
ACE_RailHeightAboveBore = 5.75468;
};
class arifle_Katiba_C_F: arifle_katiba_Base_F {
ACE_RailHeightAboveBore = 5.75468;
};
class arifle_Katiba_GL_F: arifle_katiba_Base_F {
ACE_RailHeightAboveBore = 5.75468;
};
class arifle_MX_F: arifle_MX_Base_F {
ACE_RailHeightAboveBore = 2.80201;
};
class arifle_MX_GL_F: arifle_MX_Base_F {
ACE_RailHeightAboveBore = 2.80201;
};
class arifle_MXC_F: arifle_MX_Base_F {
ACE_RailHeightAboveBore = 2.40874;
};
class SDAR_base_F: Rifle_Base_F {};
class arifle_SDAR_F: SDAR_base_F {
ACE_RailHeightAboveBore = 0;
};
class SMG_01_Base: Rifle_Short_Base_F {
ACE_RailHeightAboveBore = 4.85355;
};
class SMG_02_base_F: Rifle_Short_Base_F {
ACE_RailHeightAboveBore = 4.41831;
};
class SMG_05_base_F: Rifle_Short_Base_F {
ACE_RailHeightAboveBore = 4.05169;
};
class Tavor_base_F: Rifle_Base_F {};
class arifle_TRG20_F: Tavor_base_F {
ACE_RailHeightAboveBore = 4.30954;
};
class arifle_TRG21_F: Tavor_base_F {
ACE_RailHeightAboveBore = 4.30954;
};
class arifle_TRG21_GL_F: arifle_TRG21_F {
ACE_RailHeightAboveBore = 4.30954;
};
class mk20_base_F: Rifle_Base_F {};
class arifle_Mk20_F: mk20_base_F {
ACE_RailHeightAboveBore = 4.57255;
};
class arifle_Mk20C_F: mk20_base_F {
ACE_RailHeightAboveBore = 4.41539;
};
class arifle_Mk20_GL_F: mk20_base_F {
ACE_RailHeightAboveBore = 4.41539;
};
class EBR_base_F: Rifle_Long_Base_F {};
class LRR_base_F: Rifle_Long_Base_F {};
class GM6_base_F: Rifle_Long_Base_F {};
class DMR_01_base_F: Rifle_Long_Base_F {};
class DMR_02_base_F: Rifle_Long_Base_F {};
class DMR_03_base_F: Rifle_Long_Base_F {};
class DMR_04_base_F: Rifle_Long_Base_F {};
class DMR_05_base_F: Rifle_Long_Base_F {};
class DMR_06_base_F: Rifle_Long_Base_F {};
class srifle_EBR_F: EBR_base_F {
ACE_RailHeightAboveBore = 1.98812;
};
class srifle_LRR_F: LRR_base_F {
ACE_RailHeightAboveBore = 3.20864;
};
class srifle_GM6_F: GM6_base_F {
ACE_RailHeightAboveBore = 4.75572;
};
class srifle_DMR_01_F: DMR_01_base_F {
ACE_RailHeightAboveBore = 2.83284;
};
class srifle_DMR_02_F: DMR_02_base_F {
ACE_RailHeightAboveBore = 3.43913;
};
class srifle_DMR_03_F: DMR_03_base_F {
ACE_RailHeightAboveBore = 4.0795;
};
class srifle_DMR_04_F: DMR_04_base_F {
ACE_RailHeightAboveBore = 2.38022;
};
class srifle_DMR_05_blk_F: DMR_05_base_F {
ACE_RailHeightAboveBore = 3.91334;
};
class srifle_DMR_06_camo_F: DMR_06_base_F {
ACE_RailHeightAboveBore = 3.27488;
};
class MMG_01_base_F;
class MMG_02_base_F;
class MMG_01_hex_F: MMG_01_base_F {
ACE_RailHeightAboveBore = 4.73961;
};
class MMG_02_camo_F: MMG_02_base_F {
ACE_RailHeightAboveBore = 5.01913;
};
};

View File

@ -34,7 +34,7 @@ playSound selectRandom ["ACE_Scopes_Click_1", "ACE_Scopes_Click_2", "ACE_Scopes_
// slightly rotate the player if looking through optic
if (cameraView == "GUNNER") then {
// Convert adjustmentDifference from mils to degrees
_adjustmentDifference = _adjustmentDifference apply {_x * 0.05625};
_adjustmentDifference = _adjustmentDifference apply {MRAD_TO_DEG(_x)};
_adjustmentDifference params ["_elevationDifference", "_windageDifference"];
private _pitchBankYaw = [_unit] call EFUNC(common,getPitchBankYaw);
_pitchBankYaw params ["_pitch", "_bank", "_yaw"];

View File

@ -28,7 +28,7 @@ private _zeroing = +(_adjustment select _weaponIndex);
TRACE_1("Adjusting With",_zeroing);
// Convert zeroing from mils to degrees
_zeroing = _zeroing vectorMultiply 0.05625;
_zeroing = _zeroing vectorMultiply MRAD_TO_DEG(1);
if (GVAR(correctZeroing)) then {
private _advancedBallistics = missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false];

View File

@ -32,7 +32,7 @@ if (isNumber (_weaponConfig >> "ACE_RailHeightAboveBore")) then {
_railHeightAboveBore = getNumber(_weaponConfig >> "ACE_RailHeightAboveBore");
} else {
switch (_weaponIndex) do {
case 0: { _railHeightAboveBore = 2.0; }; // Rifle
case 0: { _railHeightAboveBore = 3.0; }; // Rifle
case 2: { _railHeightAboveBore = 0.7; }; // Pistol
};
};
@ -43,7 +43,7 @@ if (isNumber (_opticConfig >> "ACE_ScopeHeightAboveRail")) then {
_scopeHeightAboveRail = getNumber(_opticConfig >> "ACE_ScopeHeightAboveRail");
} else {
switch (getNumber(_opticConfig >> "ItemInfo" >> "opticType")) do {
case 1: { _scopeHeightAboveRail = 3.0; }; // RCO or similar
case 1: { _scopeHeightAboveRail = 4.5; }; // RCO or similar
case 2: { _scopeHeightAboveRail = 4.0; }; // High power scope
default {
switch (_weaponIndex) do {

View File

@ -22,4 +22,6 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_SCOPES
#endif
#define MRAD_TO_DEG(d) (d / 17.45329252) // Conversion factor: 9 / (50 * PI)
#include "\z\ace\addons\main\script_macros.hpp"

View File

@ -62,7 +62,7 @@ tpM | ACSE Dev Lead - Sounds, SME
* BlackQwar
* Brakoviejo
* Brisse
* Brostrom.A | Evul
* Brostrom.A (Evul)
* BullHorn
* chris579
* classicarma

View File

@ -4,7 +4,7 @@ class CfgWeapons {
class Pistol_Base_F;
class Rifle_Base_F;
class R3F_Famas_F1: Rifle_Base_F {
ACE_RailHeightAboveBore = 10.6;
ACE_RailHeightAboveBore = 10.1796;
ACE_barrelTwist = 304.8; // 1:12"
ACE_barrelLength = 488.0;
muzzles[] = {"this"};
@ -13,7 +13,7 @@ class CfgWeapons {
muzzles[] = {"this","Lance_Grenades"};
};
class R3F_Famas_surb: R3F_Famas_F1 {
ACE_RailHeightAboveBore = 5.4;
ACE_RailHeightAboveBore = 5.08219;
ACE_barrelTwist = 228.6; // 1:9"
ACE_barrelLength = 450.0; // Beretta barrel
};
@ -21,7 +21,7 @@ class CfgWeapons {
muzzles[] = {"this","Lance_Grenades"};
};
class R3F_Famas_G2: R3F_Famas_F1 {
ACE_RailHeightAboveBore = 10.6;
ACE_RailHeightAboveBore = 10.1808;
ACE_barrelTwist = 228.6; // 1:9"
ACE_barrelLength = 488.0;
};
@ -29,12 +29,12 @@ class CfgWeapons {
muzzles[] = {"this","Lance_Grenades"};
};
class R3F_Famas_felin: R3F_Famas_G2 {
ACE_RailHeightAboveBore = 5.4;
ACE_RailHeightAboveBore = 5.14504;
ACE_barrelTwist = 177.8; // 1:7"
ACE_barrelLength = 450.0; // Beretta barrel
};
class R3F_FRF2: Rifle_Base_F {
ACE_RailHeightAboveBore = 2.2;
ACE_RailHeightAboveBore = 1.79013;
ACE_barrelTwist = 294.6;
ACE_barrelLength = 650.0;
class Single: Mode_SemiAuto {
@ -43,7 +43,7 @@ class CfgWeapons {
muzzles[] = {"this"};
};
class R3F_PGM_Hecate_II: Rifle_Base_F {
ACE_RailHeightAboveBore = 2.0;
ACE_RailHeightAboveBore = 1.84858;
ACE_barrelTwist = 381.0;
ACE_barrelLength = 700.0;
class Single: Mode_SemiAuto {
@ -52,7 +52,7 @@ class CfgWeapons {
muzzles[] = {"this"};
};
class R3F_M107: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.6;
ACE_RailHeightAboveBore = 3.13099;
ACE_barrelTwist = 381.0;
ACE_barrelLength = 736.6;
class Single: Mode_SemiAuto {
@ -61,7 +61,7 @@ class CfgWeapons {
muzzles[] = {"this"};
};
class R3F_TAC50: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.2;
ACE_RailHeightAboveBore = 2.99563;
ACE_barrelTwist = 381.0;
ACE_barrelLength = 736.6;
class Single: Mode_SemiAuto {
@ -70,45 +70,41 @@ class CfgWeapons {
muzzles[] = {"this"};
};
class R3F_Minimi: Rifle_Base_F {
ACE_RailHeightAboveBore = 4.0;
ACE_RailHeightAboveBore = 3.81385;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 347.98;
muzzles[] = {"this"};
initSpeed = 915; // R3F config
};
class R3F_Minimi_762: R3F_Minimi {
ACE_RailHeightAboveBore = 4.0;
ACE_RailHeightAboveBore = 3.80834;
ACE_barrelTwist = 304.8;
ACE_barrelLength = 502.92;
initSpeed = 820; // R3F config
};
class R3F_SIG551: Rifle_Base_F {
ACE_RailHeightAboveBore = 4.2;
ACE_RailHeightAboveBore = 3.95288;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 363.0;
muzzles[] = {"this"};
};
class R3F_HK417M: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.4;
ACE_RailHeightAboveBore = 3.23377;
ACE_barrelTwist = 279.4;
ACE_barrelLength = 406.0;
muzzles[] = {"this"};
};
class R3F_HK417S_HG: R3F_HK417M {
ACE_RailHeightAboveBore = 3.4;
ACE_barrelTwist = 279.4;
ACE_barrelLength = 305.0;
};
class R3F_HK417L: R3F_HK417M {
ACE_RailHeightAboveBore = 3.4;
ACE_barrelTwist = 279.4;
ACE_barrelLength = 508.0;
class Single: Mode_SemiAuto {
dispersion = 0.00029; // 1 MOA, default 0.00020
};
};
class R3F_HK416M: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.4;
ACE_RailHeightAboveBore = 2.84776;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 368.3;
muzzles[] = {"this"};
@ -118,24 +114,20 @@ class CfgWeapons {
};
class R3F_HK416M_HG: R3F_HK416M {};
class R3F_HK416S_HG: R3F_HK416M_HG {
ACE_RailHeightAboveBore = 3.4;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 279.4;
};
class R3F_MP5SD: Rifle_Base_F {
ACE_RailHeightAboveBore = 4.5;
ACE_RailHeightAboveBore = 4.21816;
ACE_barrelTwist = 254.0;
ACE_barrelLength = 144.78;
muzzles[] = {"this"};
};
class R3F_MP5A5: R3F_MP5SD {
ACE_RailHeightAboveBore = 4.5;
ACE_barrelTwist = 254.0;
ACE_barrelLength = 226.06;
muzzles[] = {"this"};
};
class R3F_M4S90: Rifle_Base_F {
ACE_RailHeightAboveBore = 2.2;
ACE_RailHeightAboveBore = 1.86213;
ACE_twistDirection = 0;
ACE_barrelTwist = 0;
ACE_barrelLength = 144.78;
@ -151,17 +143,17 @@ class CfgWeapons {
ACE_barrelLength = 121.0;
muzzles[] = {"this"};
initSpeed = -1.0; // default 410
};
};
class ItemCore;
class InventoryOpticsItem_Base_F;
class R3F_AIMPOINT: ItemCore {
ACE_ScopeHeightAboveRail = 3.0;
ACE_ScopeHeightAboveRail = 3.1916;
};
class R3F_EOTECH: ItemCore {
ACE_ScopeHeightAboveRail = 3.8;
ACE_ScopeHeightAboveRail = 4.25923;
};
class R3F_J4: ItemCore {
ACE_ScopeHeightAboveRail = 3.0;
ACE_ScopeHeightAboveRail = 3.20641;
ACE_ScopeAdjust_Vertical[] = {-8, 8};
ACE_ScopeAdjust_Horizontal[] = {-8, 8};
ACE_ScopeAdjust_VerticalIncrement = 0.2;
@ -176,13 +168,13 @@ class CfgWeapons {
};
};
class R3F_FELIN: ItemCore {
ACE_ScopeHeightAboveRail = 4.2;
ACE_ScopeHeightAboveRail = 8.13689;
};
class R3F_FELIN_FRF2: ItemCore {
ACE_ScopeHeightAboveRail = 4.0;
ACE_ScopeHeightAboveRail = 4.28091;
};
class R3F_J8: ItemCore {
ACE_ScopeHeightAboveRail = 4.4;
ACE_ScopeHeightAboveRail = 4.474;
ACE_ScopeAdjust_Vertical[] = {-10, 10};
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -197,7 +189,6 @@ class CfgWeapons {
};
};
class R3F_J8_MILDOT: R3F_J8 { // Scope rail 30 MOA
ACE_ScopeHeightAboveRail = 4.4;
ACE_ScopeAdjust_Vertical[] = {-2, 18};
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -213,7 +204,7 @@ class CfgWeapons {
};
class R3F_J10: ItemCore {
ACE_ScopeZeroRange = 1400; // Inaccurate reticle, designed to work with the vanilla ballistic.
ACE_ScopeHeightAboveRail = 4.4;
ACE_ScopeHeightAboveRail = 4.474;
ACE_ScopeAdjust_Vertical[] = {-10, 10};
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -229,7 +220,6 @@ class CfgWeapons {
};
class R3F_J10_MILDOT: R3F_J10 { // Scope rail 30 MOA
ACE_ScopeZeroRange = 100;
ACE_ScopeHeightAboveRail = 4.4;
ACE_ScopeAdjust_Vertical[] = {-2, 18};
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -244,7 +234,7 @@ class CfgWeapons {
};
};
class R3F_ZEISS: ItemCore {
ACE_ScopeHeightAboveRail = 4.6;
ACE_ScopeHeightAboveRail = 4.96547;
ACE_ScopeAdjust_Vertical[] = {0, 23};
ACE_ScopeAdjust_Horizontal[] = {-7, 7};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -259,7 +249,7 @@ class CfgWeapons {
};
};
class R3F_NF: ItemCore {
ACE_ScopeHeightAboveRail = 4.2;
ACE_ScopeHeightAboveRail = 4.30469;
ACE_ScopeAdjust_Vertical[] = {0, 30};
ACE_ScopeAdjust_Horizontal[] = {-11, 11};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -274,7 +264,7 @@ class CfgWeapons {
};
};
class R3F_NF42: ItemCore {
ACE_ScopeHeightAboveRail = 4.2;
ACE_ScopeHeightAboveRail = 4.30469;
ACE_ScopeAdjust_Vertical[] = {0, 24};
ACE_ScopeAdjust_Horizontal[] = {-9, 9};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -289,7 +279,7 @@ class CfgWeapons {
};
};
class R3F_OB50: ItemCore {
ACE_ScopeHeightAboveRail = 4.0;
ACE_ScopeHeightAboveRail = 4.13217;
};
class InventoryMuzzleItem_Base_F;
class R3F_SILENCIEUX_HK416: ItemCore {

View File

@ -5,15 +5,18 @@ class CfgWeapons {
/* Scopes */
class InventoryOpticsItem_Base_F;
// This would require MOA turrets
/*class RH_shortdot : ItemCore {
ACE_ScopeAdjust_Vertical[] = { -1, 25 };
ACE_ScopeAdjust_Horizontal[] = { -13, 13 };
ACE_ScopeAdjust_VerticalIncrement = 0.5;
ACE_ScopeAdjust_Unit = "MOA";
};*/
class RH_shortdot : ItemCore {
ACE_ScopeHeightAboveRail = 4.40511;
/* // This would require MOA turrets
ACE_ScopeAdjust_Vertical[] = { -1, 25 };
ACE_ScopeAdjust_Horizontal[] = { -13, 13 };
ACE_ScopeAdjust_VerticalIncrement = 0.5;
ACE_ScopeAdjust_Unit = "MOA";
*/
};
class RH_accupoint : ItemCore {
ACE_ScopeHeightAboveRail = 3.726;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -29,6 +32,7 @@ class CfgWeapons {
};
class RH_m3lr : ItemCore {
ACE_ScopeHeightAboveRail = 3.5751;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -44,6 +48,7 @@ class CfgWeapons {
};
class RH_leu_mk4 : ItemCore {
ACE_ScopeHeightAboveRail = 4.64216;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -59,6 +64,7 @@ class CfgWeapons {
};
class RH_c79 : ItemCore {
ACE_ScopeHeightAboveRail = 4.16731;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -74,6 +80,7 @@ class CfgWeapons {
};
class RH_c79_2d : ItemCore {
ACE_ScopeHeightAboveRail = 4.16731;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -89,6 +96,7 @@ class CfgWeapons {
};
class RH_anpvs10 : ItemCore {
ACE_ScopeHeightAboveRail = 2.64379;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -104,6 +112,7 @@ class CfgWeapons {
};
class RH_pas13cm : ItemCore {
ACE_ScopeHeightAboveRail = 10.601;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -119,6 +128,7 @@ class CfgWeapons {
};
class RH_pas13cmg : ItemCore {
ACE_ScopeHeightAboveRail = 10.601;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -134,6 +144,7 @@ class CfgWeapons {
};
class RH_pas13ch : ItemCore {
ACE_ScopeHeightAboveRail = 10.6017;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;

View File

@ -12,27 +12,44 @@ class CfgWeapons {
};
class rhs_weap_ak74m_Base_F;
class rhs_weap_ak74m: rhs_weap_ak74m_Base_F {
ACE_RailHeightAboveBore = -0.456233;
ACE_barrelTwist = 199.898;
ACE_barrelLength = 414.02;
};
class rhs_weap_akm: rhs_weap_ak74m {
ACE_RailHeightAboveBore = -0.456233;//from rhs_weap_akmn and rhs_weap_ak74m
ACE_barrelTwist = 199.898;
ACE_barrelLength = 414.02;
};
class rhs_weap_aks74;
class rhs_weap_aks74u: rhs_weap_aks74 {
ACE_RailHeightAboveBore = -0.30262;
ACE_barrelTwist = 160.02;
ACE_barrelLength = 210.82;
};
class rhs_weap_svd: rhs_weap_ak74m {
ACE_RailHeightAboveBore = -0.617396;
ACE_barrelTwist = 238.76;
ACE_barrelLength = 619.76;
};
class rhs_weap_svdp;
class rhs_weap_svdp_npz: rhs_weap_svdp {
ACE_RailHeightAboveBore = 4.3348;
};
class rhs_weap_svdp_wd: rhs_weap_svdp {
ACE_RailHeightAboveBore = -0.617396;
};
class rhs_weap_svdp_wd_npz: rhs_weap_svdp_wd {
ACE_RailHeightAboveBore = 4.3348;
};
class rhs_weap_svds: rhs_weap_svdp {
ACE_RailHeightAboveBore = -0.617396;
ACE_barrelTwist = 238.76;
ACE_barrelLength = 563.88;
};
class rhs_weap_svds_npz: rhs_weap_svds {
ACE_RailHeightAboveBore = 4.3348;
};
class rhs_pkp_base;
class rhs_weap_pkp: rhs_pkp_base {
ACE_barrelTwist = 240.03;
@ -50,16 +67,18 @@ class CfgWeapons {
class rhs_weap_t5000: rhs_weap_orsis_Base_F { // http://en.orsis.com/production/catalog/19046/
ACE_barrelTwist = 254.0; // 1:10"
ACE_barrelLength = 698.5; // 27.5"
ACE_RailHeightAboveBore = 2.4;
ACE_RailHeightAboveBore = 2.12198;
};
class rhs_acc_sniper_base;
class rhs_acc_pso1m2: rhs_acc_sniper_base {
ACE_ScopeHeightAboveRail = 4.41386;
ACE_ScopeAdjust_Vertical[] = {0, 0};
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
ACE_ScopeAdjust_VerticalIncrement = 0.5;
ACE_ScopeAdjust_HorizontalIncrement = 0.5;
};
class rhs_acc_pso1m21: rhs_acc_sniper_base {
ACE_ScopeHeightAboveRail = 7.75566;
ACE_ScopeAdjust_Vertical[] = {0, 0};
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
ACE_ScopeAdjust_VerticalIncrement = 0.5;
@ -68,7 +87,7 @@ class CfgWeapons {
class ItemCore;
class InventoryOpticsItem_Base_F;
class rhs_acc_dh520x56: ItemCore { // http://nightvision.ru/catalog/4/item/35
ACE_ScopeHeightAboveRail = 4.6;
ACE_ScopeHeightAboveRail = 4.71476;
ACE_ScopeAdjust_Vertical[] = {0, 33};
ACE_ScopeAdjust_Horizontal[] = {-9, 9};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -102,7 +121,7 @@ class CfgWeapons {
class rhs_gssh18: H_HelmetB {
HEARING_PROTECTION_EARMUFF
};
class rhs_weap_d81;
class rhs_weap_2a70: rhs_weap_d81 { // "Low pressure" 100mm cannon
ace_overpressure_range = 15;

View File

@ -13,26 +13,27 @@ class CfgWeapons {
class rhs_weap_M107_Base_F: GM6_base_F {
ACE_barrelTwist = 381.0;
ACE_barrelLength = 736.6;
ACE_RailHeightAboveBore = 3.8;
ACE_RailHeightAboveBore = 4.18639;
};
class rhs_weap_XM2010_Base_F: Rifle_Base_F {
ACE_barrelTwist = 254.0;
ACE_barrelLength = 609.6;
ACE_Overheating_dispersion = 0.75;
ACE_RailHeightAboveBore = 3.6;
ACE_RailHeightAboveBore = 3.1028;
};
class rhs_weap_m24sws: rhs_weap_XM2010_Base_F {
ACE_barrelTwist = 285.75;
ACE_barrelLength = 609.6;
ACE_RailHeightAboveBore = 1.8;
ACE_RailHeightAboveBore = 2.41891;
};
class rhs_weap_m40a5: rhs_weap_XM2010_Base_F {
ACE_barrelTwist = 304.8; // 1:12"
ACE_barrelLength = 635.0; // 25"
ACE_RailHeightAboveBore = 2.6;
ACE_RailHeightAboveBore = 2.46368;
};
class arifle_MX_Base_F;
class rhs_weap_m4_Base: arifle_MX_Base_F {
ACE_RailHeightAboveBore = 2.56518;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 368.3;
class M203_GL: UGL_F {
@ -42,6 +43,7 @@ class CfgWeapons {
};
class rhs_weap_m4a1;
class rhs_weap_hk416d10: rhs_weap_m4a1 {
ACE_RailHeightAboveBore = 3.56139;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 254;
};
@ -50,31 +52,37 @@ class CfgWeapons {
ACE_barrelLength = 368.3;
};
class rhs_weap_m27iar: rhs_weap_m4a1 {
ACE_RailHeightAboveBore = 3.56139;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 419.1;
};
class rhs_weap_m4a1_blockII;
class rhs_weap_mk18: rhs_weap_m4a1_blockII {
ACE_RailHeightAboveBore = 2.6068;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 261.62;
};
class rhs_weap_m16a4: rhs_weap_m4_Base {
ACE_RailHeightAboveBore = 2.59324;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 508.0;
};
class rhs_weap_lmg_minimi_railed; // Rifle_Base_F - scope = private;
class rhs_weap_m249_pip_S: rhs_weap_lmg_minimi_railed {
ACE_RailHeightAboveBore = 4.11044;
ACE_barrelLength = 348;
ACE_barrelTwist = 177.8;
ACE_Overheating_allowSwapBarrel = 1;
};
class rhs_weap_m249_pip_L: rhs_weap_lmg_minimi_railed {
ACE_RailHeightAboveBore = 4.34899;
ACE_barrelLength = 464.8;
ACE_barrelTwist = 177.8;
ACE_Overheating_allowSwapBarrel = 1;
};
class rhs_weap_m240_base; // Rifle_Long_Base_F
class rhs_weap_m240B: rhs_weap_m240_base {
ACE_RailHeightAboveBore = 4.3987;
ACE_barrelTwist = 304.8;
ACE_barrelLength = 629.92;
ACE_Overheating_allowSwapBarrel = 1;
@ -83,17 +91,17 @@ class CfgWeapons {
ACE_barrelTwist = 304.8;
ACE_barrelLength = 558.8;
ACE_Overheating_dispersion = 0.75;
ACE_RailHeightAboveBore = 3.3;
ACE_RailHeightAboveBore = 3.08341;
};
class rhs_weap_sr25: rhs_weap_m14ebrri {
ACE_barrelTwist = 285.75;
ACE_barrelLength = 609.6;
ACE_RailHeightAboveBore = 3.4;
ACE_RailHeightAboveBore = 3.13162;
};
class rhs_weap_sr25_ec: rhs_weap_sr25 {
ACE_barrelTwist = 285.75;
ACE_barrelLength = 508.0;
ACE_RailHeightAboveBore = 3.4;
ACE_RailHeightAboveBore = 3.13689;
};
class rhs_weap_M590_5RD: Rifle_Base_F {
ACE_barrelTwist = 0.0;
@ -107,6 +115,7 @@ class CfgWeapons {
};
class SMG_02_base_F;
class rhsusf_weap_MP7A1_base_f: SMG_02_base_F {
ACE_RailHeightAboveBore = 5;
ACE_barrelTwist = 160.0;
ACE_barrelLength = 180.0;
};
@ -143,10 +152,10 @@ class CfgWeapons {
};
};
class rhsusf_acc_LEUPOLDMK4: rhsusf_acc_sniper_base {
ACE_ScopeHeightAboveRail = 2.4;
ACE_ScopeHeightAboveRail = 2.62567;
};
class rhsusf_acc_LEUPOLDMK4_2: rhsusf_acc_sniper_base {
ACE_ScopeHeightAboveRail = 3.8;
ACE_ScopeHeightAboveRail = 3.86377;
class ItemInfo: InventoryOpticsItem_Base_F {
class OpticsModes {
class pso1_scope {
@ -156,11 +165,8 @@ class CfgWeapons {
};
};
};
class rhsusf_acc_LEUPOLDMK4_2_d: rhsusf_acc_LEUPOLDMK4_2 {
ACE_ScopeHeightAboveRail = 3.8;
};
class rhsusf_acc_premier: rhsusf_acc_LEUPOLDMK4_2 {
ACE_ScopeHeightAboveRail = 5.4;
ACE_ScopeHeightAboveRail = 5.26066;
class ItemInfo: InventoryOpticsItem_Base_F {
class OpticsModes {
class pso1_scope {
@ -171,10 +177,10 @@ class CfgWeapons {
};
};
class rhsusf_acc_premier_low: rhsusf_acc_premier {
ACE_ScopeHeightAboveRail = 4.0;
ACE_ScopeHeightAboveRail = 3.90899;
};
class rhsusf_acc_premier_anpvs27: rhsusf_acc_premier {
ACE_ScopeHeightAboveRail = 5.4;
ACE_ScopeHeightAboveRail = 5.25066;
class ItemInfo: InventoryOpticsItem_Base_F {
class OpticsModes {
class pso1_nvg {
@ -185,7 +191,7 @@ class CfgWeapons {
};
};
class rhsusf_acc_M8541: rhsusf_acc_premier { // http://www.schmidtundbender.de/en/products/police-and-military-forces/3-12x50-pm-iilpmtc.html
ACE_ScopeHeightAboveRail = 4.0;
ACE_ScopeHeightAboveRail = 4.2235;
ACE_ScopeAdjust_Vertical[] = {0, 22};
ACE_ScopeAdjust_Horizontal[] = {-6, 6};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -200,7 +206,7 @@ class CfgWeapons {
};
};
class rhsusf_acc_M8541_low: rhsusf_acc_M8541 {
ACE_ScopeHeightAboveRail = 3.0;
ACE_ScopeHeightAboveRail = 2.9789;
};
// RHS lauchers
class rhs_weap_fgm148: launch_O_Titan_F {

View File

@ -2,8 +2,9 @@
class CfgWeapons {
class ItemCore;
class InventoryOpticsItem_Base_F;
class RKSL_optic_PMII_312 : ItemCore {
ACE_ScopeHeightAboveRail = 4.2235;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
@ -19,6 +20,7 @@ class CfgWeapons {
};
class RKSL_optic_PMII_312_sunshade : ItemCore {
ACE_ScopeHeightAboveRail = 4.2235;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;