Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compat_RHSus : Change for default ACE_12.7x99 #4184

Merged
merged 4 commits into from
Sep 3, 2016
Merged

compat_RHSus : Change for default ACE_12.7x99 #4184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e344e36
Change for default ACE_12.7x99
Laid3acK Jul 30, 2016
fd86583
Default ACE3 12.7x99 and recheck bullets values
Laid3acK Aug 15, 2016
586be30
Accurate M249s' barrel length
Laid3acK Aug 15, 2016
4f1e009
Little add and fix for Atragmx "GunList" (#1)
Laid3acK Aug 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions addons/atragmx/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,27 @@ if ((profileNamespace getVariable ["ACE_ATragMX_profileNamespaceVersion", 0]) ==

["12.7x99mm AMAX" , 860, 100, 0.0611565, -0.00036645, 3.81, 0, 2, 10, 120, 0, 0, 48.60, 12.7, 38.10, 1.050, 1, "ASM" ],
["12.7x99mm" , 900, 100, 0.0582418, -0.00057503, 3.81, 0, 2, 10, 120, 0, 0, 41.92, 12.7, 38.10, 0.670, 1, "ASM" ],
["12.7x99mm API" , 900, 100, 0.0582418, -0.00057503, 3.81, 0, 2, 10, 120, 0, 0, 41.99, 12.9, 38.10, 0.670, 1, "ASM" ],

["12.7x54mm" , 300, 100, 0.3394630, -0.00019268, 3.81, 0, 2, 10, 120, 0, 0, 48.60, 12.7, 24.13, 1.050, 1, "ASM" ],

[".408 Chey Tac" , 910, 100, 0.0569400, -0.00038944, 3.81, 0, 2, 10, 120, 0, 0, 27.15, 10.4, 33.02, 0.970, 1, "ASM" ],
[".408 Chey Tac" , 910, 100, 0.0569400, -0.00038944, 3.81, 0, 2, 10, 120, 0, 0, 26.57, 10.4, 33.02, 0.970, 1, "ASM" ],

["9.3×64mm" , 870, 100, 0.0619295, -0.00108571, 3.81, 0, 2, 10, 120, 0, 0, 14.90, 9.30, 35.56, 0.368, 1, "ASM" ],

[".338LM 250gr" , 880, 100, 0.0598469, -0.00059133, 3.81, 0, 2, 10, 120, 0, 0, 16.20, 8.58, 25.40, 0.322, 7, "ICAO"],
[".338LM 300gr" , 800, 100, 0.0677343, -0.00052190, 3.81, 0, 2, 10, 120, 0, 0, 19.44, 8.58, 25.40, 0.381, 7, "ICAO"],
[".338LM API526" , 895, 100, 0.0588865, -0.00069611, 3.81, 0, 2, 10, 120, 0, 0, 16.39, 8.58, 25.40, 0.560, 1, "ASM" ],

[".300WM Mk248 Mod 0", 900, 100, 0.0584442, -0.00070530, 3.81, 0, 2, 10, 120, 0, 0, 13.31, 7.80, 25.40, 0.268, 7, "ICAO"],
[".300WM Mk248 Mod 1", 867, 100, 0.0610738, -0.00061188, 3.81, 0, 2, 10, 120, 0, 0, 14.26, 7.80, 25.40, 0.310, 7, "ICAO"],
[".300WM Mk248 Mod0" , 900, 100, 0.0584442, -0.00070530, 3.81, 0, 2, 10, 120, 0, 0, 12.31, 7.80, 25.40, 0.268, 7, "ICAO"],
[".300WM Mk248 Mod1" , 867, 100, 0.0610738, -0.00061188, 3.81, 0, 2, 10, 120, 0, 0, 14.26, 7.80, 25.40, 0.310, 7, "ICAO"],
[".300WM Berger OTM" , 853, 100, 0.0622179, -0.00053733, 3.81, 0, 2, 10, 120, 0, 0, 14.90, 7.80, 25.40, 0.368, 7, "ICAO"],

["7.62x54mmR" , 800, 100, 0.0691878, -0.00100023, 3.81, 0, 2, 10, 120, 0, 0, 9.849, 7.92, 24.13, 0.400, 1, "ICAO"],

["7.62x51mm M80" , 810, 100, 0.0679374, -0.00100957, 3.81, 0, 2, 10, 120, 0, 0, 9.525, 7.82, 25.40, 0.200, 7, "ICAO"],
["7.62x51mm M80" , 810, 100, 0.0679374, -0.00100957, 3.81, 0, 2, 10, 120, 0, 0, 9.461, 7.82, 25.40, 0.200, 7, "ICAO"],
["7.62x51mm M118LR" , 780, 100, 0.0710319, -0.00082828, 3.81, 0, 2, 10, 120, 0, 0, 11.34, 7.82, 25.40, 0.243, 7, "ICAO"],
["7.62x51mm Mk316" , 780, 100, 0.0710319, -0.00082029, 3.81, 0, 2, 10, 120, 0, 0, 11.34, 7.82, 25.40, 0.243, 7, "ICAO"],
["7.62x51mm Mk319" , 910, 100, 0.0584524, -0.00102338, 3.81, 0, 2, 10, 120, 0, 0, 8.424, 7.82, 25.40, 0.377, 1, "ICAO"],
["7.62x51mm M993" , 930, 100, 0.0570316, -0.00107148, 3.81, 0, 2, 10, 120, 0, 0, 8.230, 7.82, 25.40, 0.359, 1, "ICAO"],
["7.62x51mm Subsonic", 320, 100, 0.3059680, -0.00049899, 3.81, 0, 2, 10, 120, 0, 0, 12.96, 7.82, 25.40, 0.235, 7, "ICAO"],
Expand Down
47 changes: 27 additions & 20 deletions optionals/compat_rhs_usf3/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@
class CfgAmmo {
class BulletBase;
class B_127x99_Ball;
class rhsusf_ammo_127x99_M33_Ball: B_127x99_Ball {
class rhsusf_ammo_127x99_M33_Ball: B_127x99_Ball { // B_127x99_Ball (ballistics/CfgAmmo.hpp)
ACE_caliber = 12.954;
ACE_bulletLength = 58.674;
ACE_bulletMass = 42.83; // 661gr - Barret technical data
ACE_bulletMass = 41.9256;
ACE_ammoTempMuzzleVelocityShifts[] = {-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
ACE_ballisticCoefficients[] = {0.620}; // Barret technical data
ACE_ballisticCoefficients[] = {0.670};
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ASM";
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {900};
ACE_barrelLengths[] = {736.6};
};
class rhsusf_ammo_127x99_mk211: rhsusf_ammo_127x99_M33_Ball {
class rhsusf_ammo_127x99_mk211: rhsusf_ammo_127x99_M33_Ball { // ACE_127x99_API (ballistics/CfgAmmo.hpp)
ACE_caliber = 12.954;
ACE_bulletLength = 58.674;
ACE_bulletMass = 43; // Nammo AS technical data
ACE_bulletMass = 41.9904;
ACE_ammoTempMuzzleVelocityShifts[] = {-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
ACE_ballisticCoefficients[] = {0.670}; // ?
ACE_ballisticCoefficients[] = {0.670};
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ASM";
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {900};
ACE_barrelLengths[] = {736.6};
};
class B_762x54_Ball;
class rhsusf_B_300winmag: B_762x54_Ball {
class rhsusf_B_300winmag: B_762x54_Ball { // ACE_762x67_Ball_Mk248_Mod_1 (ballistics/CfgAmmo.hpp)
ACE_caliber = 7.823;
ACE_bulletLength = 37.821;
ACE_bulletMass = 14.256;
Expand All @@ -40,7 +40,7 @@ class CfgAmmo {
ACE_barrelLengths[] = {508.0, 609.6, 660.4};
};
class B_556x45_Ball;
class rhs_ammo_556x45_M855A1_Ball: B_556x45_Ball {
class rhs_ammo_556x45_M855A1_Ball: B_556x45_Ball { // B_556x45_Ball (ballistics/CfgAmmo.hpp)
ACE_caliber = 5.69;
ACE_bulletLength = 23.012;
ACE_bulletMass = 4.0176;
Expand All @@ -52,7 +52,11 @@ class CfgAmmo {
ACE_muzzleVelocities[] = {723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900};
ACE_barrelLengths[] = {210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508.0, 609.6};
};
class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball {
class rhs_ammo_556x45_M855A1_Ball_Red: rhs_ammo_556x45_M855A1_Ball {}; // B_556x45_Ball (ballistics/CfgAmmo.hpp)
class rhs_ammo_556x45_M855A1_Ball_Green: rhs_ammo_556x45_M855A1_Ball_Red {}; // B_556x45_Ball (ballistics/CfgAmmo.hpp)
class rhs_ammo_556x45_M855A1_Ball_Yellow: rhs_ammo_556x45_M855A1_Ball_Red {}; // B_556x45_Ball (ballistics/CfgAmmo.hpp)
class rhs_ammo_556x45_M855A1_Ball_Orange: rhs_ammo_556x45_M855A1_Ball_Red {}; // B_556x45_Ball (ballistics/CfgAmmo.hpp)
class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball { // ACE_556x45_Ball_Mk318 (ballistics/CfgAmmo.hpp)
ACE_caliber = 5.69;
ACE_bulletLength = 23.012;
ACE_bulletMass = 4.0176;
Expand All @@ -64,7 +68,7 @@ class CfgAmmo {
ACE_muzzleVelocities[] = {780, 886, 950};
ACE_barrelLengths[] = {254.0, 393.7, 508.0};
};
class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball {
class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball { // ACE_556x45_Ball_Mk262 (ballistics/CfgAmmo.hpp)
ACE_caliber = 5.69;
ACE_bulletLength = 23.012;
ACE_bulletMass = 4.9896;
Expand All @@ -76,7 +80,7 @@ class CfgAmmo {
ACE_muzzleVelocities[] = {624, 816, 832, 838};
ACE_barrelLengths[] = {190.5, 368.3, 457.2, 508.0};
};
class rhs_ammo_762x51_M80_Ball: BulletBase {
class rhs_ammo_762x51_M80_Ball: BulletBase { // B_762x51_Ball (ballistics/CfgAmmo.hpp)
ACE_caliber = 7.823;
ACE_bulletLength = 28.956;
ACE_bulletMass = 9.4608;
Expand All @@ -88,7 +92,10 @@ class CfgAmmo {
ACE_muzzleVelocities[] = {700, 800, 820, 833, 845};
ACE_barrelLengths[] = {254.0, 406.4, 508.0, 609.6, 660.4};
};
class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball {
class rhs_ammo_762x51_M61_AP: rhs_ammo_762x51_M80_Ball {}; // B_762x51_Ball (ballistics/CfgAmmo.hpp)
class rhs_ammo_762x51_M62_tracer: rhs_ammo_762x51_M80_Ball {}; // B_762x51_Ball (ballistics/CfgAmmo.hpp)
class rhs_ammo_762x51_M80A1EPR_Ball: rhs_ammo_762x51_M80_Ball {}; // B_762x51_Ball (ballistics/CfgAmmo.hpp)
class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball { // ACE_762x51_Ball_M118LR (ballistics/CfgAmmo.hpp)
ACE_caliber = 7.823;
ACE_bulletLength = 31.496;
ACE_bulletMass = 11.34;
Expand All @@ -100,17 +107,17 @@ class CfgAmmo {
ACE_muzzleVelocities[] = {750, 780, 790, 794};
ACE_barrelLengths[] = {406.4, 508.0, 609.6, 660.4};
};
class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball {
class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball { // ACE_762x51_Ball_M993_AP (ballistics/CfgAmmo.hpp)
ACE_caliber = 7.823;
ACE_bulletLength = 31.496;
ACE_bulletMass = 8.2296;
ACE_bulletMass = 8.22946157;
ACE_ammoTempMuzzleVelocityShifts[] = {-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
ACE_ballisticCoefficients[] = {0.377};
ACE_ballisticCoefficients[] = {0.359};
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ICAO";
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {875, 910, 930};
ACE_barrelLengths[] = {330.2, 406.4, 508.0};
ACE_muzzleVelocities[] = {875, 910, 930, 945};
ACE_barrelLengths[] = {330.2, 406.4, 508.0, 609.6};
};
class rhs_ammo_46x30_FMJ: rhs_ammo_556x45_M855A1_Ball { // RUAG Ammotec
ACE_caliber = 4.65;
Expand Down Expand Up @@ -148,7 +155,7 @@ class CfgAmmo {
ACE_muzzleVelocities[] = {680};
ACE_barrelLengths[] = {180};
};
class rhs_ammo_45ACP_MHP: BulletBase {
class rhs_ammo_45ACP_MHP: BulletBase { // B_45ACP_Ball (ballistics/CfgAmmo.hpp)
ACE_caliber = 11.481;
ACE_bulletLength = 17.272;
ACE_bulletMass = 14.904;
Expand All @@ -160,7 +167,7 @@ class CfgAmmo {
ACE_muzzleVelocities[] = {230, 250, 285};
ACE_barrelLengths[] = {101.6, 127.0, 228.6};
};
class rhs_ammo_9x19_FMJ: BulletBase {
class rhs_ammo_9x19_FMJ: BulletBase { // ACE_9x19_Ball (ballistics/CfgAmmo.hpp)
ACE_caliber = 9.017;
ACE_bulletLength = 15.494;
ACE_bulletMass = 8.0352;
Expand All @@ -172,7 +179,7 @@ class CfgAmmo {
ACE_muzzleVelocities[] = {340, 370, 400};
ACE_barrelLengths[] = {101.6, 127.0, 228.6};
};
class rhs_ammo_9x19_JHP: BulletBase {
class rhs_ammo_9x19_JHP: BulletBase { // ACE_9x19_Ball (ballistics/CfgAmmo.hpp)
ACE_caliber = 9.017;
ACE_bulletLength = 15.494;
ACE_bulletMass = 8.0352;
Expand Down
4 changes: 2 additions & 2 deletions optionals/compat_rhs_usf3/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ class CfgWeapons {
};
class rhs_weap_lmg_minimi_railed; // Rifle_Base_F - scope = private;
class rhs_weap_m249_pip_S: rhs_weap_lmg_minimi_railed {
ACE_barrelLength = 414; // 16.3" FN America
ACE_barrelLength = 348;
ACE_barrelTwist = 177.8;
ACE_Overheating_allowSwapBarrel = 1;
};
class rhs_weap_m249_pip_L: rhs_weap_lmg_minimi_railed {
ACE_barrelLength = 520.7; // 20.5" FN America
ACE_barrelLength = 464.8;
ACE_barrelTwist = 177.8;
ACE_Overheating_allowSwapBarrel = 1;
};
Expand Down