mp5 inheritance and 9x19 added (#12)

FFAAMOD-Team · Jul 20, 2020 · e2bc6d5 · e2bc6d5
1 parent 1de285e
commit e2bc6d5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/addons/main/CfgAmmo.hpp b/addons/main/CfgAmmo.hpp
@@ -25,18 +25,19 @@ class CfgAmmo {
         ACE_muzzleVelocities[]={900};
         ACE_barrelLengths[]={736.6};
     };
-    class ffaa_5x28: BulletBase {
-        ACE_caliber=5.7;
-        ACE_bulletLength=23.012;
-        ACE_bulletMass=15;
-        ACE_ammoTempMuzzleVelocityShifts[]={-26.55,-25.47,-22.85,-20.12,-16.98,-12.8,-7.64,-1.53,5.96,15.17,26.19};
-        ACE_ballisticCoefficients[]={0.31};
-        ACE_velocityBoundaries[]={};
-        ACE_standardAtmosphere="ASM";
-        ACE_dragModel=1;
-        ACE_muzzleVelocities[]={280, 300, 320};
-        ACE_barrelLengths[]={254.0, 414.02, 508.0};
-    };
+    class ffaa_B_9x19_Ball: BulletBase
+	{
+		ACE_caliber = 9.017;
+		ACE_bulletLength = 15.494;
+		ACE_bulletMass = 8.0352;
+		ACE_ammoTempMuzzleVelocityShifts[] = {-2.655,-2.547,-2.285,-2.012,-1.698,-1.28,-0.764,-0.153,0.596,1.517,2.619};
+		ACE_ballisticCoefficients[] = {0.165};
+		ACE_velocityBoundaries[] = {};
+		ACE_standardAtmosphere = "ASM";
+		ACE_dragModel = 1;
+		ACE_muzzleVelocities[] = {340,370,400};
+		ACE_barrelLengths[] = {101.6,127.0,228.6};
+	};
     class ffaa_granada_m_alhambra: GrenadeHand {
         ace_frag_metal=296;
         ace_frag_charge=180;

diff --git a/addons/main/CfgWeapons.hpp b/addons/main/CfgWeapons.hpp
@@ -396,19 +396,19 @@ class CfgWeapons {
         };
     };
     // SUBFUSILES
-    class ffaa_armas_hkmp510a3: Rifle_Base_F {
+	class ffaa_armas_hkmp5pdw : Rifle_Base_F {
         ACE_barrelTwist=250;
-        ACE_barrelLength=146;
+        ACE_barrelLength=148;
     };
-    class ffaa_armas_hkmp5a5: ffaa_armas_hkmp510a3 {
+    class ffaa_armas_hkmp510a3: ffaa_armas_hkmp5pdw {
         ACE_barrelTwist=250;
-        ACE_barrelLength=225;
+        ACE_barrelLength=146;
     };
-    class ffaa_armas_hkmp5pdw: ffaa_armas_hkmp5a5 {
+    class ffaa_armas_hkmp5a5 : ffaa_armas_hkmp5pdw {
         ACE_barrelTwist=250;
-        ACE_barrelLength=148;
+        ACE_barrelLength=225;
     };
-    class ffaa_armas_ump: ffaa_armas_hkmp5a5 {
+    class ffaa_armas_ump: ffaa_armas_hkmp5pdw {
         ACE_barrelTwist=305;
         ACE_barrelLength=200;
     };