Merge branch 'master' of github.com:acemod/ACE3

addons/atragmx/XEH_postInit.sqf

@@ -6,16 +6,16 @@ if (count (profileNamespace getVariable ["ACE_ATragMX_gunList", []]) > 0) then {
     GVAR(gunList) = profileNamespace getVariable "ACE_ATragMX_gunList";
 } else {
     // Profile Name, Muzzle Velocity, Zero Range, Scope Base Angle, AirFriction, Bore Height, Scope Unit, Elevation Scope Step, Windage Scope Step, Maximum Elevation, Dialed Elevation, Dialed Windage, Mass, Ammo Class Name, Magazine Class Name, BC, Drag Model, Atmosphere Model
-    GVAR(gunList) =  [["12.7x108mm"       , 820, 100, 0.0659, -0.0008600, 3.81, 0, 0.338, 0.338, 120, 0, 0, 48.28, "B_127x108_Ball"  , "5Rnd_127x108_Mag"        , 0.700, 1, "ASM" ],
+    GVAR(gunList) =  [["12.7x108mm"       , 820, 100, 0.0659, -0.0008600, 3.81, 0, 0.338, 0.338, 120, 0, 0, 48.28, "B_127x108_Ball"        , "5Rnd_127x108_Mag"                 , 0.630, 1, "ASM" ],
-                      ["12.7x99mm"        , 880, 100, 0.0607, -0.0008600, 3.81, 0, 0.338, 0.338, 120, 0, 0, 41.92, "B_127x99_Ball"   , "5Rnd_mas_127x99_Stanag"  , 0.670, 1, "ASM" ],
+                      ["12.7x99mm"        , 880, 100, 0.0607, -0.0008600, 3.81, 0, 0.338, 0.338, 120, 0, 0, 41.92, "B_127x99_Ball"         , "5Rnd_mas_127x99_Stanag"           , 0.670, 1, "ASM" ],
-                      ["12.7x54mm"        , 290, 100, 0.3913, -0.0014000, 3.81, 0, 0.338, 0.338, 120, 0, 0, 61.56, "B_127x54_Ball"   , "10Rnd_127x54_Mag"        , 1.050, 1, "ASM" ],
+                      ["12.7x54mm"        , 290, 100, 0.3913, -0.0014000, 3.81, 0, 0.338, 0.338, 120, 0, 0, 61.56, "B_127x54_Ball"         , "10Rnd_127x54_Mag"                 , 1.050, 1, "ASM" ],
-                      ["10.4x77mm"        , 910, 100, 0.0572, -0.0004800, 3.81, 0, 0.338, 0.338, 120, 0, 0, 27.15, "B_408_Ball"      , "7Rnd_408_Mag"            , 0.970, 1, "ASM" ],
+                      ["10.4x77mm"        , 910, 100, 0.0572, -0.0004800, 3.81, 0, 0.338, 0.338, 120, 0, 0, 27.15, "B_408_Ball"            , "7Rnd_408_Mag"                     , 0.970, 1, "ASM" ],
-                      ["9.3×64mm"         , 870, 100, 0.0632, -0.0007500, 3.81, 0, 0.338, 0.338, 120, 0, 0, 16.20, "B_93x64_Ball"    , "10Rnd_93x64_DMR_05_Mag"  , 0.368, 1, "ASM" ],
+                      ["9.3×64mm"         , 870, 100, 0.0632, -0.0007500, 3.81, 0, 0.338, 0.338, 120, 0, 0, 16.20, "B_93x64_Ball"          , "10Rnd_93x64_DMR_05_Mag"           , 0.368, 1, "ASM" ],
-                      ["8.6×70mm"         , 915, 100, 0.0572, -0.0006100, 3.81, 0, 0.338, 0.338, 120, 0, 0, 16.20, "B_338_Ball"      , "10Rnd_338_Mag"           , 0.322, 7, "ICAO"],
+                      ["8.6×70mm"         , 915, 100, 0.0572, -0.0006100, 3.81, 0, 0.338, 0.338, 120, 0, 0, 16.20, "B_338_Ball"            , "10Rnd_338_Mag"                    , 0.322, 7, "ICAO"],
-                      ["7.62x51mm"        , 850, 100, 0.0639, -0.0010000, 3.81, 0, 0.338, 0.338, 120, 0, 0, 9.460, "B_762x51_Ball"   , "20Rnd_762x51_Mag"        , 0.393, 1, "ICAO"],
+                      ["7.62x51mm"        , 850, 100, 0.0639, -0.0010000, 3.81, 0, 0.338, 0.338, 120, 0, 0, 9.460, "B_762x51_Ball"         , "20Rnd_762x51_Mag"                 , 0.393, 1, "ICAO"],
-                      ["6.5x39mm"         , 800, 100, 0.0689, -0.0009000, 3.81, 0, 0.338, 0.338, 120, 0, 0, 7.776, "B_65x39_Caseless", "30Rnd_65x39_caseless_mag", 0.263, 1, "ICAO"],
+                      ["6.5x39mm"         , 800, 100, 0.0689, -0.0009000, 3.81, 0, 0.338, 0.338, 120, 0, 0, 7.776, "B_65x39_Caseless"      , "30Rnd_65x39_caseless_mag"         , 0.263, 1, "ICAO"],
-                      ["5.56x45mm"        , 920, 100, 0.0584, -0.0012650, 3.81, 0, 0.338, 0.338, 120, 0, 0, 4.000, "B_556x45_Ball"   , "30Rnd_556x45_Stanag"     , 0.304, 1, "ASM" ],
+                      ["5.56x45mm"        , 920, 100, 0.0584, -0.0012650, 3.81, 0, 0.338, 0.338, 120, 0, 0, 4.000, "B_556x45_Ball"         , "30Rnd_556x45_Stanag"              , 0.304, 1, "ASM" ],
-                      ["5.56x45mm Mk262"  , 850, 100, 0.0643, -0.0011250, 3.81, 0, 0.338, 0.338, 120, 0, 0, 4.990, "RH_556x45_Mk262" , "RH_30Rnd_556x45_Mk262"   , 0.361, 1, "ASM" ]];
+                      ["5.56x45mm Mk262"  , 850, 100, 0.0643, -0.0011250, 3.81, 0, 0.338, 0.338, 120, 0, 0, 4.990, "ACE_556x45_Ball_Mk262" , "ACE_30Rnd_556x45_Stanag_Mk262_mag", 0.361, 1, "ASM" ]];
     
     profileNamespace setVariable ["ACE_ATragMX_gunList", GVAR(gunList)];
 };

addons/ballistics/CfgAmmo.hpp

@@ -502,8 +502,6 @@ class CfgAmmo {
     class ACE_338_Ball : B_338_Ball {
         airFriction=-0.000526;
         caliber=1.55;
-        deflecting=12;
-        hit=20;
         typicalSpeed=826;
         ACE_caliber=0.338;
         ACE_bulletLength=1.70;
@@ -516,6 +514,21 @@ class CfgAmmo {
         ACE_muzzleVelocities[]={800, 820, 826, 830};
         ACE_barrelLengths[]={20, 24, 26.5, 28};
     };
+    class ACE_338_Ball_API526 : B_338_Ball {
+        airFriction=-0.000526;
+        caliber=2.4;
+        typicalSpeed=826;
+        ACE_caliber=0.338;
+        ACE_bulletLength=1.535;
+        ACE_bulletMass=253;
+        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.290};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ICAO";
+        ACE_dragModel=7;
+        ACE_muzzleVelocities[]={880, 915, 925};
+        ACE_barrelLengths[]={20, 26, 28};
+    };
     class B_127x54_Ball : BulletBase {
         airFriction=-0.00014;
         typicalSpeed=300;
@@ -545,6 +558,8 @@ class CfgAmmo {
         ACE_barrelLengths[]={29};
     };
     class ACE_127x99_Ball_AMAX : B_127x99_Ball {
+        airFriction=-0.000374;
+        typicalSpeed=860;
         ACE_caliber=0.510;
         ACE_bulletLength=2.540;
         ACE_bulletMass=750;
@@ -557,6 +572,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={29};
     };
     class B_127x108_Ball : BulletBase {
+        airFriction=-0.00064;
         typicalSpeed=820;
         ACE_caliber=0.511;
         ACE_bulletLength=2.520;

addons/ballistics/CfgMagazines.hpp

@@ -171,6 +171,33 @@ class CfgMagazines {
         descriptionShort = "$STR_ACE_10Rnd_338_300gr_HPBT_Mag_Description";
         initSpeed = 800;
     };
+    class ACE_10Rnd_338_API526_Mag: 10Rnd_338_Mag {
+        author = "$STR_ACE_Common_ACETeam";
+        ammo = "ACE_338_Ball_API526";
+        displayName = "$STR_ACE_10Rnd_338_API526_Mag_Name";
+        displayNameShort = "$STR_ACE_10Rnd_338_API526_Mag_NameShort";
+        descriptionShort = "$STR_ACE_10Rnd_338_API526_Mag_Description";
+        initSpeed = 880;
+    };
+    
+    class 5Rnd_127x108_Mag;
+    class ACE_5Rnd_127x99_Mag: 5Rnd_127x108_Mag {
+        author = "$STR_ACE_Common_ACETeam";
+        ammo = "B_127x99_Ball";
+        displayName = "$STR_ACE_5Rnd_127x99_Mag_Name";
+        displayNameShort = "$STR_ACE_5Rnd_127x99_Mag_NameShort";
+        descriptionShort = "$STR_ACE_5Rnd_127x99_Mag_Description";
+        initSpeed = 853;
+    };
+    class ACE_5Rnd_127x99_AMAX_Mag: 5Rnd_127x108_Mag {
+        author = "$STR_ACE_Common_ACETeam";
+        ammo = "ACE_127x99_Ball_AMAX";
+        displayName = "$STR_ACE_5Rnd_127x99_AMAX_Mag_Name";
+        displayNameShort = "$STR_ACE_5Rnd_127x99_AMAX_Mag_NameShort";
+        descriptionShort = "$STR_ACE_5Rnd_127x99_AMAX_Mag_Description";
+        initSpeed = 860;
+    };
+    
     
     class 30Rnd_9x21_Mag: CA_Magazine {
         initSpeed = 450;

addons/ballistics/CfgVehicles.hpp

@@ -23,6 +23,10 @@ class CfgVehicles {
             MACRO_ADDMAGAZINE(ACE_100Rnd_65x39_caseless_mag_Tracer_Dim,4);
             MACRO_ADDMAGAZINE(ACE_200Rnd_65x39_cased_Box_Tracer_Dim,4);
             MACRO_ADDMAGAZINE(ACE_30Rnd_556x45_Stanag_Tracer_Dim,1);
+            MACRO_ADDMAGAZINE(ACE_10Rnd_338_300gr_HPBT_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_10Rnd_338_API526_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_5Rnd_127x99_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_5Rnd_127x99_AMAX_Mag,4);
         };
     };
 
@@ -32,6 +36,10 @@ class CfgVehicles {
             MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_M118LR_Mag,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_M118LR_Mag,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4);
+            MACRO_ADDMAGAZINE(ACE_10Rnd_338_300gr_HPBT_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_10Rnd_338_API526_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_5Rnd_127x99_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_5Rnd_127x99_AMAX_Mag,4);
         };
     };
 
@@ -41,6 +49,10 @@ class CfgVehicles {
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_M118LR_Mag,6);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_SD,3);
+            MACRO_ADDMAGAZINE(ACE_10Rnd_338_300gr_HPBT_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_10Rnd_338_API526_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_5Rnd_127x99_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_5Rnd_127x99_AMAX_Mag,4);
         };
     };
 
@@ -159,6 +171,10 @@ class CfgVehicles {
             MACRO_ADDMAGAZINE(ACE_100Rnd_65x39_caseless_mag_Tracer_Dim,4);
             MACRO_ADDMAGAZINE(ACE_200Rnd_65x39_cased_Box_Tracer_Dim,4);
             MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
+            MACRO_ADDMAGAZINE(ACE_10Rnd_338_300gr_HPBT_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_10Rnd_338_API526_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_5Rnd_127x99_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_5Rnd_127x99_AMAX_Mag,4);
         };
     };
 };

addons/ballistics/CfgWeapons.hpp

@@ -522,14 +522,21 @@ class CfgWeapons {
         ACE_barrelLength=29;
     };
     class srifle_GM6_F: GM6_base_F {
+        magazines[] = {
+            "5Rnd_127x108_Mag",
+            "5Rnd_127x108_APDS_Mag",
+            "ACE_5Rnd_127x99_Mag",
+            "ACE_5Rnd_127x99_AMAX_Mag"
+        };
         initSpeed = -1.0;
         ACE_barrelTwist=15;
-        ACE_barrelLength=43.3;
+        ACE_barrelLength=36.6;
     };
     class srifle_DMR_02_F: DMR_02_base_F {
         magazines[] = {
             "10Rnd_338_Mag",
             "ACE_10Rnd_338_300gr_HPBT_Mag",
+            "ACE_10Rnd_338_API526_Mag",
             "ACE_20Rnd_762x67_Mk248_Mod_0_Mag",
             "ACE_20Rnd_762x67_Mk248_Mod_1_Mag",
             "ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag"

addons/ballistics/stringtable.xml

@@ -438,23 +438,6 @@
             <Italian>Calibro: 7.62x51 mm AP&lt;br /&gt;Munizioni: 20&lt;br /&gt;In uso su: Mk18 ABR</Italian>
             <Russian>Калибр: 7.62x51 мм дозвуковые&lt;br /&gt;Патронов: 20&lt;br /&gt;Применимы в: Mk18 ABR</Russian>
         </Key>
-        <!-- .338 Lapua Magnum -->
-        <Key ID="STR_ACE_10Rnd_338_Mag_APName">
-            <English>.338 LM 10Rnd AP Mag</English>
-            <German>.338 LM 10-Schuss-Magazin Hartkern</German>
-            <Polish>Magazynek .338 LM 10rd AP</Polish>
-        </Key>
-        <Key ID="STR_ACE_10Rnd_338_Mag_APNameShort">
-            <English>.338 LM AP</English>
-            <German>.338 LM AP</German>
-            <Polish>.338 LM AP</Polish>
-            <Czech>.338 LM AP</Czech>
-        </Key>
-        <Key ID="STR_ACE_10Rnd_338_Mag_APDescription">
-            <English>Caliber: .338 Lapua Magnum AP&lt;br /&gt;Rounds: 10&lt;br /&gt;Used in: MAR-10</English>
-            <German>Kaliber: .338 Lapua Magnum Hartkern&lt;br /&gt;Schuss: 10&lt;br /&gt;Verwendet für: MAR-10</German>
-            <Polish>Kaliber: .338 Lapua Magnum AP&lt;br /&gt;Pociski: 10&lt;br /&gt;Używany w: MAR-10</Polish>
-        </Key>
         <!-- .338 Norma Magnum -->
         <Key ID="STR_ACE_130Rnd_338_Mag_TracerName">
             <English>.338 NM 130Rnd Tracer Belt</English>
@@ -756,7 +739,7 @@
             <English>Caliber: 6.5x47mm (HPBT Scenar)&lt;br /&gt;Rounds: 30</English>
         </Key>
         <Key ID="STR_ACE_10Rnd_338_300gr_HPBT_Mag_Name">
-            <English>8.6x70mm 10Rnd Mag (300gr Sierra MatchKing HPBT)</English>
+            <English>.338 10Rnd Mag (300gr Sierra MatchKing HPBT)</English>
         </Key>
         <Key ID="STR_ACE_10Rnd_338_300gr_HPBT_Mag_NameShort">
             <English>.338 (HPBT)</English>
@@ -764,5 +747,32 @@
         <Key ID="STR_ACE_10Rnd_338_300gr_HPBT_Mag_Description">
             <English>Caliber: 8.6x70mm (300gr Sierra MatchKing HPBT)&lt;br /&gt;Rounds: 10</English>
         </Key>
+        <Key ID="STR_ACE_10Rnd_338_API526_Mag_Name">
+            <English>.338 10Rnd Mag (API526)</English>
+        </Key>
+        <Key ID="STR_ACE_10Rnd_338_API526_Mag_NameShort">
+            <English>.338 AP</English>
+        </Key>
+        <Key ID="STR_ACE_10Rnd_338_API526_Mag_Description">
+            <English>Caliber: 8.6x70mm (API526)&lt;br /&gt;Rounds: 10</English>
+        </Key>
+        <Key ID="STR_ACE_5Rnd_127x99_Mag_Name">
+            <English>12.7x99mm 5Rnd Mag</English>
+        </Key>
+        <Key ID="STR_ACE_5Rnd_127x99_Mag_NameShort">
+            <English>12.7mm</English>
+        </Key>
+        <Key ID="STR_ACE_5Rnd_127x99_Mag_Description">
+            <English>Caliber: 12.7x99mm&lt;br /&gt;Rounds: 5</English>
+        </Key>
+        <Key ID="STR_ACE_5Rnd_127x99_AMAX_Mag_Name">
+            <English>12.7x99mm 5Rnd Mag (AMAX)</English>
+        </Key>
+        <Key ID="STR_ACE_5Rnd_127x99_AMAX_Mag_NameShort">
+            <English>12.7mm</English>
+        </Key>
+        <Key ID="STR_ACE_5Rnd_127x99_AMAX_Mag_Description">
+            <English>Caliber: 12.7x99mm (AMAX)&lt;br /&gt;Rounds: 5</English>
+        </Key>
     </Package>
 </Project>