Skip to content

Commit

Permalink
AB : update R3F compat (#5541)
Browse files Browse the repository at this point in the history 
* Create CfgMagazines.hpp

* Update CfgAmmo.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgMagazines.hpp

* Update CfgMagazines.hpp

* Update config.cpp

* Update CfgWeapons.hpp

* Update CfgAmmo.hpp

* Update CfgAmmo.hpp

* Update CfgWeapons.hpp

* Update CfgMagazines.hpp

* Update CfgAmmo.hpp

* Update CfgMagazines.hpp

* spaces

* Update CfgWeapons.hpp

* typo
  • Loading branch information
@Laid3acK @jonpas
Laid3acK authored and jonpas committed Sep 22, 2017
1 parent eb6e8c0 commit 25119d4
Show file tree
Hide file tree
Showing 5 changed files with 253 additions and 33 deletions.
77 changes: 55 additions & 22 deletions optionals/compat_r3f/CfgAmmo.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
class CfgAmmo {
class Default;
class BulletBase;
class R3F_9x19_Ball: BulletBase { // ACE_9x19_Ball
class R3F_9x19_Ball: BulletBase { // https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L360
typicalSpeed = 350; // R3F config
airFriction = -0.0019835001; // ACE3 value, default -0.001413
ACE_caliber = 9.017;
ACE_bulletLength = 15.494;
ACE_bulletMass = 8.0352;
Expand All @@ -13,88 +15,119 @@ class CfgAmmo {
ACE_muzzleVelocities[] = {340, 370, 400};
ACE_barrelLengths[] = {101.6, 127.0, 228.6};
};
class R3F_556x45_Ball: BulletBase { // B_556x45_Ball, AtragMx GunList: 5.56x45mm M855
class R3F_556x45_Ball: BulletBase { // https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L9
typicalSpeed = 930; // R3F config
airFriction = -0.00126466; // ACE3 value, default -0.001625
ACE_caliber = 5.69;
ACE_bulletLength = 23.012;
ACE_bulletMass = 4.0176;
ACE_ammoTempMuzzleVelocityShifts[] = {-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75};
ACE_ballisticCoefficients[] = {0.151};
ACE_ballisticCoefficients[] = {0.302}; // AtragMx G1 BC
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ASM";
ACE_dragModel = 7;
ACE_dragModel = 1;
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 R3F_762x51_Ball: BulletBase { // B_762x51_Ball, AtragMx GunList: 7.62x51mm M80
class R3F_762x51_Ball: BulletBase { // https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L152
typicalSpeed = 820; // R3F config
airFriction = -0.00100957; // ACE3 value, default -0.001625
ACE_caliber = 7.823;
ACE_bulletLength = 28.956;
ACE_bulletMass = 9.4608;
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.2};
ACE_ballisticCoefficients[] = {0.398}; // AtragMx G1 BC
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ICAO";
ACE_dragModel = 7;
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {700, 800, 820, 833, 845};
ACE_barrelLengths[] = {254.0, 406.4, 508.0, 609.6, 660.4};
};
class R3F_127x99_Ball: BulletBase { // B_127x99_Ball, AtragMx GunList: 12.7x99mm
class R3F_762x51_Ball2: R3F_762x51_Ball { // https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L152
typicalSpeed = 850; // R3F config
airFriction = -0.00100957; // ACE3 value, default -0.001625
ACE_caliber = 7.823;
ACE_bulletLength = 28.956;
ACE_bulletMass = 9.4608;
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.398}; // AtragMx G1 BC
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ICAO";
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {850};
ACE_barrelLengths[] = {650};
};
class R3F_762x51_Minimi_Ball: R3F_762x51_Ball { // https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L152
airFriction = -0.00100957; // ACE3 value, default -0.002000
};
class R3F_127x99_Ball: BulletBase { // https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L494
typicalSpeed = 780; // R3F config
airFriction = -0.00057503; // ACE3 value, default -0.00086
ACE_caliber = 12.954;
ACE_bulletLength = 58.674;
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.670};
ACE_ballisticCoefficients[] = {0.670}; // AtragMx G1 BC
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ASM";
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {900};
ACE_muzzleVelocities[] = {780};
ACE_barrelLengths[] = {700};
};
class R3F_127x99_PEI: R3F_127x99_Ball { // B_127x99_Ball, AtragMx GunList: 12.7x99mm
class R3F_127x99_PEI: R3F_127x99_Ball { // https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L494
typicalSpeed = 780; // R3F config
airFriction = -0.00057503; // ACE3 value, default -0.00086
ACE_caliber = 12.954;
ACE_bulletLength = 58.674;
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.670};
ACE_ballisticCoefficients[] = {0.670}; // AtragMx G1 BC
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ASM";
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {900};
ACE_muzzleVelocities[] = {780};
ACE_barrelLengths[] = {700};
};
class R3F_127x99_Ball2: BulletBase { // B_127x99_Ball, AtragMx GunList: 12.7x99mm
class R3F_127x99_Ball2: BulletBase { // https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L494
typicalSpeed = 850; // R3F config
airFriction = -0.00057503; // ACE3 value, default -0.00086
ACE_caliber = 12.954;
ACE_bulletLength = 58.674;
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.670};
ACE_ballisticCoefficients[] = {0.670}; // AtragMx G1 BC
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ASM";
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {900};
ACE_muzzleVelocities[] = {850};
ACE_barrelLengths[] = {736.6};
};
class R3F_127x99_PEI2: R3F_127x99_Ball2 { // B_127x99_Ball, AtragMx GunList: 12.7x99mm
class R3F_127x99_PEI2: R3F_127x99_Ball2 { // https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L494
typicalSpeed = 850; // R3F config
airFriction = -0.00057503; // ACE3 value, default -0.00086
ACE_caliber = 12.954;
ACE_bulletLength = 58.674;
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.670};
ACE_ballisticCoefficients[] = {0.670}; // AtragMx G1 BC
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ASM";
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {900};
ACE_muzzleVelocities[] = {850};
ACE_barrelLengths[] = {736.6};
};
class R3F_127x99_Ball3: BulletBase { // B_127x99_Ball, AtragMx GunList: 12.7x99mm
class R3F_127x99_Ball3: BulletBase { // https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L494
typicalSpeed = 820; // R3F config
airFriction = -0.00057503; // ACE3 value, default -0.00086
ACE_caliber = 12.954;
ACE_bulletLength = 58.674;
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.670};
ACE_ballisticCoefficients[] = {0.670}; // AtragMx G1 BC
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ASM";
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {900};
ACE_muzzleVelocities[] = {820};
ACE_barrelLengths[] = {736.6};
};
};
59 changes: 59 additions & 0 deletions optionals/compat_r3f/CfgMagazines.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
class CfgMagazines {
class CA_magazine;
class R3F_securite_mag: CA_magazine {
scope = 0; // default 2
};
class R3F_15Rnd_9x19_PAMAS: CA_magazine {
initSpeed = 350; // R3F config
};
class R3F_15Rnd_9x19_HKUSP: CA_magazine {
initSpeed = 350; // R3F config
};
class R3F_30Rnd_9x19_MP5: CA_magazine {
initSpeed = 400; // R3F config
};
class R3F_25Rnd_556x45_FAMAS: CA_magazine { // AtragMx GunList: 5.56x45mm M855
initSpeed = 960; // R3F config
};
class R3F_25Rnd_556x45_TRACER_FAMAS: R3F_25Rnd_556x45_FAMAS {}; // AtragMx GunList: 5.56x45mm M855
class R3F_30Rnd_556x45_FAMAS: CA_magazine { // AtragMx GunList: 5.56x45mm M855
initSpeed = 925; // R3F config
};
class R3F_30Rnd_556x45_TRACER_FAMAS: R3F_30Rnd_556x45_FAMAS {}; // AtragMx GunList: 5.56x45mm M855
class R3F_30Rnd_556x45_HK416: CA_magazine { // AtragMx GunList: 5.56x45mm M855
initSpeed = 850; // R3F config
};
class R3F_30Rnd_556x45_TRACER_HK416: R3F_30Rnd_556x45_HK416 {}; // AtragMx GunList: 5.56x45mm M855
class R3F_30Rnd_556x45_SIG551: CA_magazine { // AtragMx GunList: 5.56x45mm M855
initSpeed = 850; // R3F config
};
class R3F_30Rnd_556x45_TRACER_SIG551: R3F_30Rnd_556x45_SIG551 {}; // AtragMx GunList: 5.56x45mm M855
class R3F_10Rnd_762x51_FRF2: CA_magazine { // AtragMx GunList: 5.56x45mm M855
initSpeed = 850; // R3F config
};
class R3F_200Rnd_556x45_MINIMI: CA_magazine { // AtragMx GunList: 5.56x45mm M855
initSpeed = 915; // R3F config
};
class R3F_100Rnd_762x51_MINIMI: CA_magazine { // AtragMx GunList: 7.62x51mm M80
initSpeed = 820; // R3F config
};
class R3F_20Rnd_762x51_HK417: CA_magazine { // AtragMx GunList: 7.62x51mm M80
initSpeed = 820; // R3F config
};
class R3F_20Rnd_762x51_TRACER_HK417: R3F_20Rnd_762x51_HK417 {}; // AtragMx GunList: 7.62x51mm M80
class R3F_7Rnd_127x99_PGM: CA_magazine { // AtragMx GunList: 12.7x99mm
initSpeed = 780; // R3F config
};
class R3F_7Rnd_127x99_PEI_PGM: R3F_7Rnd_127x99_PGM { // AtragMx GunList: 12.7x99mm
initSpeed = 780; // R3F config
};
class R3F_10Rnd_127x99_M107: CA_magazine { // AtragMx GunList: 12.7x99mm
initSpeed = 850; // R3F config
};
class R3F_10Rnd_127x99_PEI_M107: R3F_10Rnd_127x99_M107 { // AtragMx GunList: 12.7x99mm
initSpeed = 850; // R3F config
};
class R3F_5Rnd_127x99_TAC50: CA_magazine { // AtragMx GunList: 12.7x99mm
initSpeed = 820; // R3F config
};
};
Loading

0 comments on commit 25119d4

Please sign in to comment.