fix some magwells

acemod · Feb 28, 2020 · a374eec · a374eec
1 parent c949a07
commit a374eec
Show file tree

Hide file tree

Showing 6 changed files with 335 additions and 38 deletions.
diff --git a/addons/ballistics/CfgMagazineWells.hpp b/addons/ballistics/CfgMagazineWells.hpp
@@ -1,5 +1,4 @@
 class CfgMagazineWells {
-
     class CBA_12g_2rnds {
         ADDON[] = {
             "ACE_2Rnd_12Gauge_Pellets_No0_Buck",
@@ -33,17 +32,20 @@ class CfgMagazineWells {
         };
     };
 
-    class CBA_65x39_MX {
+    class MX_65x39 { //Vanilla magwell
         ADDON[] = {
             "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim",
-            "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim"
+            "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim",
+            "ACE_30Rnd_65x47_Scenar_mag",
+            "ACE_30Rnd_65_Creedmor_mag"
         };
     };
-    class CBA_65x39_MX_XL {
+    class MX_65x39_Large { //Vanilla magwell
         ADDON[] = {
             "ACE_100Rnd_65x39_caseless_mag_Tracer_Dim"
         };
     };
+
     class CBA_65x39_Mk200 {
         ADDON[] = {
             "ACE_200Rnd_65x39_cased_Box_Tracer_Dim"
@@ -128,10 +130,15 @@ class CfgMagazineWells {
         };
     };
 
-//Missing in CBA
-//ACE_20Rnd_762x67_Mk248_Mod_0_Mag
-//ACE_20Rnd_762x67_Mk248_Mod_1_Mag
-//ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag
+    class MAR10_338 { //Vanilla magwell
+        ADDON[] = {
+            "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"
+        };
+    };
 
     class CBA_65C_AR10 {
         ADDON[] = {
@@ -194,5 +201,4 @@ class CfgMagazineWells {
             "ACE_10Rnd_762x54_Tracer_mag"
         };
     };
-
 };
diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
@@ -45,13 +45,6 @@ class CfgWeapons {
         ACE_barrelLength = 508.0;
         ACE_barrelTwist = 254.0;
         initSpeed = -1.0;
-        magazines[] += {
-            "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"
-        };
     };
 
     // SIG 556
@@ -90,7 +83,7 @@ class CfgWeapons {
         ACE_barrelLength = 640.0;
         ACE_barrelTwist = 228.6;
         initSpeed = -0.99998;
-        magazines[] += {
+        magazines[] += { //No Vanilla magwell
             "ACE_20Rnd_65x47_Scenar_mag",
             "ACE_20Rnd_65_Creedmor_mag"
         };
@@ -148,27 +141,6 @@ class CfgWeapons {
     class arifle_MXM_F: arifle_MX_Base_F {
         ACE_barrelLength = 457.2;
         initSpeed = -1.0;
-        magazines[] += {
-            "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim",
-            "ACE_30Rnd_65x47_Scenar_mag",
-            "ACE_30Rnd_65_Creedmor_mag"
-        };
-    };
-
-    class arifle_MXM_Black_F: arifle_MXM_F {
-        magazines[] += {
-            "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim",
-            "ACE_30Rnd_65x47_Scenar_mag",
-            "ACE_30Rnd_65_Creedmor_mag"
-        };
-    };
-
-    class arifle_MXM_khk_F: arifle_MXM_Black_F {
-        magazines[] += {
-            "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim",
-            "ACE_30Rnd_65x47_Scenar_mag",
-            "ACE_30Rnd_65_Creedmor_mag"
-        };
     };
 
     // MX

diff --git a/addons/realisticdispersion/$PBOPREFIX$ b/addons/realisticdispersion/$PBOPREFIX$
@@ -0,0 +1 @@
+z\ace\addons\realisticdispersion