Ammunition - Khaki 6.5 (#282)

Theseus-Aegis · Jan 15, 2025 · 67bac61 · 67bac61
1 parent 2e9e6ce
commit 67bac61
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 3 deletions.
diff --git a/addons/ammunition/bi/65x39.hpp b/addons/ammunition/bi/65x39.hpp
@@ -44,6 +44,24 @@ class CLASS(30Rnd_65x39_AP_MX_Black): CLASS(30Rnd_65x39_AP_MX_Sand) {
     displayName = "6.5mm 30Rnd MX Black (AP)";
 };
 
+// 6.5x39mm (MX, Khaki)
+class CLASS(30Rnd_65x39_Ball_MX_Khaki): CLASS(30Rnd_65x39_Ball_MX_Sand) {
+    MACRO_65_MAGAZINE_MX_Khaki;
+    displayName = "6.5mm 30Rnd MX Khaki (Ball)";
+};
+class CLASS(30Rnd_65x39_Ball_Tracer_MX_Khaki): CLASS(30Rnd_65x39_Ball_Tracer_MX_Sand) {
+    MACRO_65_MAGAZINE_MX_Khaki;
+    displayName = "6.5mm 30Rnd MX Khaki [T] (Ball)";
+};
+class CLASS(30Rnd_65x39_EPR_MX_Khaki): CLASS(30Rnd_65x39_EPR_MX_Sand) {
+    MACRO_65_MAGAZINE_MX_Khaki;
+    displayName = "6.5mm 30Rnd MX Khaki (EPR)";
+};
+class CLASS(30Rnd_65x39_AP_MX_Khaki): CLASS(30Rnd_65x39_AP_MX_Sand) {
+    MACRO_65_MAGAZINE_MX_Khaki;
+    displayName = "6.5mm 30Rnd MX Khaki (AP)";
+};
+
 // 6.5x39mm (MX, MG Sand)
 class CLASS(100Rnd_65x39_Ball_MX_LSW_Sand): 100Rnd_65x39_caseless_mag {
     MACRO_SCOPE;
@@ -80,6 +98,20 @@ class CLASS(100Rnd_65x39_EPR_MX_LSW_Black): CLASS(100Rnd_65x39_EPR_MX_LSW_Sand)
     displayName = "6.5mm 100Rnd MX LSW Black [TE4] (EPR)";
 };
 
+// 6.5x39mm (MX, MG Khaki)
+class CLASS(100Rnd_65x39_Ball_MX_LSW_Khaki): CLASS(100Rnd_65x39_Ball_MX_LSW_Sand) {
+    MACRO_65_MAGAZINE_MX_LSW_Khaki;
+    displayName = "6.5mm 100Rnd MX LSW Khaki [TE4] (Ball)";
+};
+class CLASS(100Rnd_65x39_Ball_Tracer_MX_LSW_Khaki): CLASS(100Rnd_65x39_Ball_Tracer_MX_LSW_Sand) {
+    MACRO_65_MAGAZINE_MX_LSW_Khaki;
+    displayName = "6.5mm 100Rnd MX LSW Khaki [T] (Ball)";
+};
+class CLASS(100Rnd_65x39_EPR_MX_LSW_Khaki): CLASS(100Rnd_65x39_EPR_MX_LSW_Sand) {
+    MACRO_65_MAGAZINE_MX_LSW_Khaki;
+    displayName = "6.5mm 100Rnd MX LSW Khaki [TE4] (EPR)";
+};
+
 // 6.5x39mm (GROT/MSBS)
 class CLASS(30Rnd_65x39_Ball_MSBS): 30Rnd_65x39_caseless_msbs_mag {
     MACRO_SCOPE;

diff --git a/addons/ammunition/magwells/rifle.hpp b/addons/ammunition/magwells/rifle.hpp
@@ -130,7 +130,11 @@ class CBA_65x39_MX {
         QCLASS(30Rnd_65x39_Ball_MX_Black),
         QCLASS(30Rnd_65x39_Ball_Tracer_MX_Black),
         QCLASS(30Rnd_65x39_EPR_MX_Black),
-        QCLASS(30Rnd_65x39_AP_MX_Black)
+        QCLASS(30Rnd_65x39_AP_MX_Black),
+        QCLASS(30Rnd_65x39_Ball_MX_Khaki),
+        QCLASS(30Rnd_65x39_Ball_Tracer_MX_Khaki),
+        QCLASS(30Rnd_65x39_EPR_MX_Khaki),
+        QCLASS(30Rnd_65x39_AP_MX_Khaki)
     };
 };
 
@@ -141,7 +145,10 @@ class CBA_65x39_MX_XL {
         QCLASS(100Rnd_65x39_EPR_MX_LSW_Sand),
         QCLASS(100Rnd_65x39_Ball_MX_LSW_Black),
         QCLASS(100Rnd_65x39_Ball_Tracer_MX_LSW_Black),
-        QCLASS(100Rnd_65x39_EPR_MX_LSW_Black)
+        QCLASS(100Rnd_65x39_EPR_MX_LSW_Black),
+        QCLASS(100Rnd_65x39_Ball_MX_LSW_Khaki),
+        QCLASS(100Rnd_65x39_Ball_Tracer_MX_LSW_Khaki),
+        QCLASS(100Rnd_65x39_EPR_MX_LSW_Khaki)
     };
 };
 

diff --git a/addons/ammunition/script_macros.hpp b/addons/ammunition/script_macros.hpp
@@ -54,11 +54,21 @@
     hiddenSelectionsTextures[] = {"\A3\Weapons_F_EPB\Rifles\MX_Black\Data\XMX_Base_Black_co.paa"}; \
     picture = "\a3\Weapons_F\MagazineProxies\data\UI\icon_30Rnd_65x39_caseless_black_mag_CA.paa"
 
+#define MACRO_65_MAGAZINE_MX_Khaki \
+    hiddenSelections[] = {"camo"}; \
+    hiddenSelectionsTextures[] = {"\A3\Weapons_F_Exp\Rifles\MX\Data\XMX_Base_khk_co.paa"}; \
+    picture = "\a3\Weapons_F\MagazineProxies\data\UI\icon_30Rnd_65x39_caseless_khaki_mag_CA.paa"
+
 #define MACRO_65_MAGAZINE_MX_LSW_Black \
     hiddenSelections[] = {"camo"}; \
     hiddenSelectionsTextures[] = {"\A3\Weapons_F_EPB\Rifles\MX_Black\Data\XMX_lmg_Black_co.paa"}; \
     picture = "\a3\Weapons_F\MagazineProxies\data\UI\icon_100Rnd_65x39_caseless_black_mag_CA.paa"
 
+#define MACRO_65_MAGAZINE_MX_LSW_Khaki \
+    hiddenSelections[] = {"camo"}; \
+    hiddenSelectionsTextures[] = {"\A3\Weapons_F_Exp\Rifles\MX\Data\XMX_LMG_khk_co.paa"}; \
+    picture = "\a3\Weapons_F\MagazineProxies\data\UI\icon_100Rnd_65x39_caseless_khaki_mag_CA.paa"
+
 #define MACRO_762_AK12_MAGAZINE_TAN \
     hiddenSelections[] = {"Camo"}; \
     hiddenSelectionsMaterials[] = {"a3\Weapons_F_Enoch\Rifles\AK12\Data\AK12_F_2_camo.rvmat"}; \

diff --git a/addons/ammunition/ws/magazines/556x45.hpp b/addons/ammunition/ws/magazines/556x45.hpp
@@ -57,7 +57,7 @@ class CLASS(30Rnd_556x45_Ball_Camo_Stanag): 30Rnd_556x45_Stanag_Tracer_Yellow_ca
     lastRoundsTracer = 4;
 };
 class CLASS(30Rnd_556x45_Ball_Tracer_Camo_Stanag): CLASS(30Rnd_556x45_Ball_Camo_Stanag) {
-    displayName = "5.56mm 30Rnd Stanag [T] Camo (Ball)";
+    displayName = "5.56mm 30Rnd Stanag Camo [T] (Ball)";
     displayNameShort = "Ball Tracer";
     descriptionShort = "5.56x45mm Ball Tracer";
     tracersEvery = 1;