From fc13775786a73f926f1a917f5334ee2ee04c44fc Mon Sep 17 00:00:00 2001 From: Brandon Danyluk Date: Thu, 2 Jan 2020 20:57:30 -0700 Subject: [PATCH] Update CSW RHS compat for new Mk-19 ammo type (#7354) * Update RHS compat for new Mk-19 ammo type * Formatting fix --- optionals/compat_rhs_usf3/CfgMagazineGroups.hpp | 4 ++++ optionals/compat_rhs_usf3/CfgMagazines.hpp | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/optionals/compat_rhs_usf3/CfgMagazineGroups.hpp b/optionals/compat_rhs_usf3/CfgMagazineGroups.hpp index 44d29c1f8a..333aacbcfe 100644 --- a/optionals/compat_rhs_usf3/CfgMagazineGroups.hpp +++ b/optionals/compat_rhs_usf3/CfgMagazineGroups.hpp @@ -16,6 +16,10 @@ class ace_csw_groups { RHS_48Rnd_40mm_MK19_M430I = 1; RHS_96Rnd_40mm_MK19_M430I = 1; }; + class GVAR(48Rnd_40mm_MK19_M430A1) { + RHS_48Rnd_40mm_MK19_M430A1 = 1; + RHS_96Rnd_40mm_MK19_M430A1 = 1; + }; class GVAR(48Rnd_40mm_MK19_M1001) { RHS_48Rnd_40mm_MK19_M1001 = 1; RHS_96Rnd_40mm_MK19_M1001 = 1; diff --git a/optionals/compat_rhs_usf3/CfgMagazines.hpp b/optionals/compat_rhs_usf3/CfgMagazines.hpp index 2dd486d3eb..7bc33accc7 100644 --- a/optionals/compat_rhs_usf3/CfgMagazines.hpp +++ b/optionals/compat_rhs_usf3/CfgMagazines.hpp @@ -204,6 +204,15 @@ class cfgMagazines { model = "\A3\Structures_F_EPB\Items\Military\Ammobox_rounds_F.p3d"; // ammo can instead of any special model so no one gets especially confused over what it is picture = QPATHTOEF(csw,UI\ammoBox_50bmg_ca.paa); }; + class RHS_48Rnd_40mm_MK19_M430A1; + class GVAR(48Rnd_40mm_MK19_M430A1): RHS_48Rnd_40mm_MK19_M430A1 { + scope = 2; + type = 256; + count = 48; + mass = 40; + model = "\A3\Structures_F_EPB\Items\Military\Ammobox_rounds_F.p3d"; // ammo can instead of any special model so no one gets especially confused over what it is + picture = QPATHTOEF(csw,UI\ammoBox_50bmg_ca.paa); + }; class RHS_48Rnd_40mm_MK19_M1001; class GVAR(48Rnd_40mm_MK19_M1001): RHS_48Rnd_40mm_MK19_M1001 { scope = 2;