Merge branch 'master' of https://github.com/Theseus-Aegis/GTArmory

Theseus-Aegis · Sep 15, 2020 · 5abbf86 · 5abbf86
2 parents 40e2bc0 + 58815d2
commit 5abbf86
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 70 deletions.
diff --git a/addons/ammunition/CfgMagazineWells.hpp b/addons/ammunition/CfgMagazineWells.hpp
@@ -11,14 +11,14 @@ class CfgMagazineWells {
         };
     };
 
-    class CLASS(8rnd_12g) {
+    class CBA_12g_8rnds {
         ADDON[] = {
             QCLASS(8Rnd_P_000),
             QCLASS(8Rnd_S_AP20)
         };
     };
 
-    class CLASS(6rnd_12g) {
+    class CBA_12g_6rnds {
         ADDON[] = {
             QCLASS(6Rnd_P_000),
             QCLASS(6Rnd_S_AP20)

diff --git a/addons/gimmick/stringtable.xml b/addons/gimmick/stringtable.xml
@@ -7,7 +7,7 @@
         <Key ID="STR_TACGT_Gimmick_MSBS65_Gimmick_M_Red_Name">
             <English>MSBS Y33T Magazine Red</English>
         </Key>
-        <Key ID="STR_TACGT_Gimmick_MSBS65_Gimmick_M_Red_Name">
+        <Key ID="STR_TACGT_Gimmick_MSBS65_Gimmick_M_Green_Name">
             <English>MSBS Y33T Magazine Green</English>
         </Key>
     </Package>

diff --git a/addons/m1014/CfgWeapons.hpp b/addons/m1014/CfgWeapons.hpp
@@ -11,12 +11,6 @@ class CfgWeapons {
             "tacgt_8Rnd_S_AP20",
             "tacgt_6Rnd_S_AP20"
         };
-        magazineWell[] = {
-            "CBA_12g_8rnds",
-            "CBA_12g_6rnds",
-            "tacgt_8rnd_12g",
-            "tacgt_6rnd_12g"
-        };
 
         class Single: Mode_SemiAuto {
             class BaseSoundModeType;
@@ -35,10 +29,6 @@ class CfgWeapons {
             "tacgt_6Rnd_P_000",
             "tacgt_6Rnd_S_AP20"
         };
-        magazineWell[] = {
-            "CBA_12g_6rnds",
-            "tacgt_6rnd_12g"
-        };
 
         class Single: Single {
             class BaseSoundModeType;

diff --git a/addons/rebalance/s4_lbt.hpp b/addons/rebalance/s4_lbt.hpp
@@ -36,31 +36,20 @@ class lbt_operator_od: lbt_pouchless_coy {};
 class lbt_operator_aor1: lbt_pouchless_coy {};
 class lbt_operator_aor2: lbt_pouchless_coy {};
 class lbt_operator_mc: lbt_pouchless_coy {};
-
-class lbt_weapons_coy: lbt_pouchless_coy {
-    MACRO_HITPROTECTION_LBT
-};
+class lbt_weapons_coy: lbt_pouchless_coy {};
 class lbt_weapons_od: lbt_weapons_coy {};
 class lbt_weapons_aor1: lbt_weapons_coy {};
 class lbt_weapons_aor2: lbt_weapons_coy {};
 class lbt_weapons_mc: lbt_pouchless_coy {};
-
-class lbt_medical_coy: lbt_pouchless_coy {
-    MACRO_HITPROTECTION_LBT
-};
+class lbt_medical_coy: lbt_pouchless_coy {};
 class lbt_medical_od: lbt_medical_coy {};
 class lbt_medical_aor1: lbt_medical_coy {};
 class lbt_medical_aor2: lbt_medical_coy {};
-
-class lbt_medical_mc: lbt_pouchless_coy {
-    MACRO_HITPROTECTION_LBT
-};
-
+class lbt_medical_mc: lbt_pouchless_coy {};
 class lbt_comms_coy: lbt_pouchless_coy {};
 class lbt_comms_od: lbt_comms_coy {};
 class lbt_comms_aor1: lbt_comms_coy {};
 class lbt_comms_aor2: lbt_comms_coy {};
-
 class lbt_comms_mc: lbt_pouchless_coy {};
 class lbt_light_od: lbt_pouchless_coy {};
 class lbt_light_mc: lbt_pouchless_coy {};

diff --git a/addons/remass/CUP.hpp b/addons/remass/CUP.hpp
@@ -194,38 +194,3 @@
     class CUP_30Rnd_9x39_SP5_VIKHR_M: CA_Magazine {
         mass = 10;
     };
-
-    // Shotgun Magazines
-    class CUP_8Rnd_B_Saiga12_74Slug_M: CA_Magazine {
-        mass = 10;
-    };
-    class CUP_8Rnd_B_Saiga12_74Pellets_M: CA_Magazine {
-        mass = 10;
-    };
-    class CUP_20Rnd_B_Saiga12_74Slug_M: CUP_8Rnd_B_Saiga12_74Slug_M {
-        mass = 15;
-    };
-    class CUP_20Rnd_B_Saiga12_74Pellets_M: CUP_8Rnd_B_Saiga12_74Pellets_M {
-        mass = 15;
-    };
-    class CUP_20Rnd_B_AA12_Pellets: CA_Magazine {
-        mass = 15;
-    };
-    class CUP_20Rnd_B_AA12_74Slug: CA_Magazine {
-        mass = 15;
-    };
-    class CUP_20Rnd_B_AA12_HE: CA_Magazine {
-        mass = 15;
-    };
-    class CUP_8Rnd_B_Beneli_74Slug: CA_Magazine {
-        mass = 8;
-    };
-    class CUP_8Rnd_B_Beneli_74Pellets: CA_Magazine {
-        mass = 8;
-    };
-    class CUP_6Rnd_B_Benelli_74Slug: CUP_8Rnd_B_Beneli_74Slug {
-        mass = 6;
-    };
-    class CUP_6Rnd_B_Beneli_74Pellets: CUP_8Rnd_B_Beneli_74Pellets {
-        mass = 6;
-    };
diff --git a/addons/saiga12/CfgMagazines.hpp b/addons/saiga12/CfgMagazines.hpp
@@ -1,23 +1,24 @@
 class CfgMagazines {
     class CA_Magazine;
+
     // 8Rnd
-    class CUP_8Rnd_B_Saiga12_74Pellets_M: CA_Magazine {
+    class CUP_5Rnd_B_Saiga12_Buck_00: CA_Magazine {
         count = 8;
         displayName = CSTRING(8Rnd_Pellet_Display);
         ammo = QCLASS(P_12G_000);
     };
-    class CUP_8Rnd_B_Saiga12_74Slug_M: CA_Magazine {
+    class CUP_5Rnd_B_Saiga12_Slug: CA_Magazine {
         count = 8;
         displayName = CSTRING(8Rnd_Slug_Display);
         ammo = QCLASS(S_12G_AP20);
     };
     // 20Rnd
-    class CUP_20Rnd_B_Saiga12_74Pellets_M: CUP_8Rnd_B_Saiga12_74Pellets_M {
+    class CUP_12Rnd_B_Saiga12_Buck_00: CUP_5Rnd_B_Saiga12_Buck_00 {
         count = 20;
         displayName = CSTRING(20Rnd_Pellet_Display);
         ammo = QCLASS(P_12G_000);
     };
-    class CUP_20Rnd_B_Saiga12_74Slug_M: CUP_8Rnd_B_Saiga12_74Slug_M {
+    class CUP_12Rnd_B_Saiga12_Slug: CUP_5Rnd_B_Saiga12_Slug {
         count = 20;
         displayName = CSTRING(20Rnd_Slug_Display);
         ammo = QCLASS(S_12G_AP20);

diff --git a/addons/saiga12/stringtable.xml b/addons/saiga12/stringtable.xml
@@ -2,16 +2,16 @@
 <Project name="TACGT">
     <Package name="Saiga12">
         <Key ID="STR_TACGT_Saiga12_8Rnd_Slug_Display">
-            <English>8Rnd Saiga 12k Slug</English>
+            <English>8Rnd Saiga 12k Slug (AP-20)</English>
         </Key>
         <Key ID="STR_TACGT_Saiga12_8Rnd_Pellet_Display">
-            <English>8Rnd Saiga 12k Pellets</English>
+            <English>8Rnd Saiga 12k Pellets (Magnum)</English>
         </Key>
         <Key ID="STR_TACGT_Saiga12_20Rnd_Slug_Display">
-            <English>20Rnd Saiga 12k Slug</English>
+            <English>20Rnd Saiga 12k Slug (AP-20)</English>
         </Key>
         <Key ID="STR_TACGT_Saiga12_20Rnd_Pellet_Display">
-            <English>20Rnd Saiga 12k Pellets</English>
+            <English>20Rnd Saiga 12k Pellets (Magnum)</English>
         </Key>
     </Package>
 </Project>