From e3986f4528432c353c705f6c03a62c72cdfbb912 Mon Sep 17 00:00:00 2001
From: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Date: Sun, 10 Oct 2021 14:02:26 -0300
Subject: [PATCH] Small Arms - Fix FNX-45 magazine round count (#8352)

* Change FNX-45 magazine round count

* Style pass
---
 addons/smallarms/CfgMagazines.hpp | 26 +++++++++++++-------------
 addons/smallarms/stringtable.xml  | 11 +++++++++++
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/addons/smallarms/CfgMagazines.hpp b/addons/smallarms/CfgMagazines.hpp
index 1f245b150d..cb3a3fca1f 100644
--- a/addons/smallarms/CfgMagazines.hpp
+++ b/addons/smallarms/CfgMagazines.hpp
@@ -7,53 +7,49 @@ class CfgMagazines {
 
     // 6.5mm //////////////////////////////////////////
 
-    class 30Rnd_65x39_caseless_mag : CA_Magazine { // MX!!
+    class 30Rnd_65x39_caseless_mag: CA_Magazine { // MX!!
         tracersEvery = 0;
         lastRoundsTracer = 0;
     };
 
-    class 30Rnd_65x39_caseless_green : 30Rnd_65x39_caseless_mag { // Katiba!!
+    class 30Rnd_65x39_caseless_green: 30Rnd_65x39_caseless_mag { // Katiba!!
         tracersEvery = 0;
         lastRoundsTracer = 0;
     };
 
-    class 100Rnd_65x39_caseless_mag : CA_Magazine { // Katiba!!
+    class 100Rnd_65x39_caseless_mag: CA_Magazine { // Katiba!!
         tracersEvery = 5;
         lastRoundsTracer = 3;
     };
 
-    class 200Rnd_65x39_cased_Box : 100Rnd_65x39_caseless_mag {
+    class 200Rnd_65x39_cased_Box: 100Rnd_65x39_caseless_mag {
         tracersEvery = 5;
         lastRoundsTracer = 3;
     };
 
     // 7.62mm //////////////////////////////////////////
 
-    class 150Rnd_762x51_Box : CA_Magazine {
+    class 150Rnd_762x51_Box: CA_Magazine {
         tracersEvery = 5;
         lastRoundsTracer = 3;
     };
 
     // SMG & Pistol ////////////////////////////
 
-    class 30Rnd_9x21_Mag : CA_Magazine {
+    class 30Rnd_9x21_Mag: CA_Magazine {
         lastRoundsTracer = 0;
     };
 
     class 16Rnd_9x21_Mag: 30Rnd_9x21_Mag {
         displayname = CSTRING(17Rnd_9x19_Name);
-
         count = 17;
     };
 
-    class 30Rnd_45ACP_Mag_SMG_01 : 30Rnd_9x21_Mag {
+    class 30Rnd_45ACP_Mag_SMG_01: 30Rnd_9x21_Mag {
         displayname = CSTRING(25Rnd_45_Name);
         displaynameshort = ".45";
-
         picture = "\A3\weapons_f\data\ui\M_30Rnd_9x21_CA.paa";
-
         count = 25;
-
         tracersEvery = 0;
         lastRoundsTracer = 0;
     };
@@ -70,10 +66,14 @@ class CfgMagazines {
         displayname = CSTRING(25Rnd_45_Tracer_Yellow_Name);
     };
 
-    class 9Rnd_45ACP_Mag : 30Rnd_45ACP_Mag_SMG_01 {
+    class 9Rnd_45ACP_Mag: 30Rnd_45ACP_Mag_SMG_01 {
         displayname = CSTRING(8Rnd_45_Name);
         displaynameshort = ".45";
-
         count = 8;
     };
+
+    class 11Rnd_45ACP_Mag: CA_Magazine {
+        displayname = CSTRING(15Rnd_45_Name);
+        count = 15;
+    };
 };
diff --git a/addons/smallarms/stringtable.xml b/addons/smallarms/stringtable.xml
index 04685e5e6d..2277426d78 100644
--- a/addons/smallarms/stringtable.xml
+++ b/addons/smallarms/stringtable.xml
@@ -72,5 +72,16 @@
             <Turkish>.45 ACP 8 Merm. Şarjör</Turkish>
             <Japanese>.45 ACP 8Rnd マガジン</Japanese>
         </Key>
+        <Key ID="STR_ACE_SmallArms_15Rnd_45_Name">
+            <English>.45 ACP 15Rnd Mag</English>
+            <Polish>15-nab. mag. .45 ACP </Polish>
+            <Russian>Магазин, 15 патр. .45 ACP</Russian>
+            <French>Mag. 15 balles .45 ACP</French>
+            <Spanish>Cargador de 15 proyectiles de .45 ACP</Spanish>
+            <German>15-Schuss-.45-ACP-Magazin</German>
+            <Czech>.45 ACP, 15ks zásobník</Czech>
+            <Turkish>.45 ACP 15 Merm. Şarjör</Turkish>
+            <Japanese>.45 ACP 15Rnd マガジン</Japanese>
+        </Key>
     </Package>
 </Project>