From 39181fdea5df708acaac7d5828060c136f6f0b92 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 9 Jan 2017 12:11:31 -0600 Subject: [PATCH] Simplify huntIR configs using += (#4521) * Add huntIR magazine to GL_3GL_F via sub config * Cleanup RHS 40mm huntIR GL config * Add huntir to standalone m320 - #4199 --- addons/huntir/CfgWeapons.hpp | 8 +- addons/huntir/subConfig/config.cpp | 26 +++++ optionals/compat_rhs_usf3/CfgWeapons.hpp | 109 ++---------------- .../compat_rhs_usf3/subConfig/config.cpp | 26 +++++ 4 files changed, 65 insertions(+), 104 deletions(-) create mode 100644 addons/huntir/subConfig/config.cpp create mode 100644 optionals/compat_rhs_usf3/subConfig/config.cpp diff --git a/addons/huntir/CfgWeapons.hpp b/addons/huntir/CfgWeapons.hpp index 799cfcb976..8a3b57c4b0 100644 --- a/addons/huntir/CfgWeapons.hpp +++ b/addons/huntir/CfgWeapons.hpp @@ -19,11 +19,5 @@ class CfgWeapons { class UGL_F: GrenadeLauncher { magazines[] += {"ACE_HuntIR_M203"}; }; - class Rifle_Base_F; - class arifle_MX_Base_F: Rifle_Base_F { - class GL_3GL_F: UGL_F { - //magazines[] += {"ACE_HuntIR_M203"}; - magazines[] = {"1Rnd_HE_Grenade_shell","UGL_FlareWhite_F","UGL_FlareGreen_F","UGL_FlareRed_F","UGL_FlareYellow_F","UGL_FlareCIR_F","1Rnd_Smoke_Grenade_shell","1Rnd_SmokeRed_Grenade_shell","1Rnd_SmokeGreen_Grenade_shell","1Rnd_SmokeYellow_Grenade_shell","1Rnd_SmokePurple_Grenade_shell","1Rnd_SmokeBlue_Grenade_shell","1Rnd_SmokeOrange_Grenade_shell","3Rnd_HE_Grenade_shell","3Rnd_UGL_FlareWhite_F","3Rnd_UGL_FlareGreen_F","3Rnd_UGL_FlareRed_F","3Rnd_UGL_FlareYellow_F","3Rnd_UGL_FlareCIR_F","3Rnd_Smoke_Grenade_shell","3Rnd_SmokeRed_Grenade_shell","3Rnd_SmokeGreen_Grenade_shell","3Rnd_SmokeYellow_Grenade_shell","3Rnd_SmokePurple_Grenade_shell","3Rnd_SmokeBlue_Grenade_shell","3Rnd_SmokeOrange_Grenade_shell","ACE_HuntIR_M203"}; - }; - }; + // Added to the GL_3GL_F in subconfig }; diff --git a/addons/huntir/subConfig/config.cpp b/addons/huntir/subConfig/config.cpp new file mode 100644 index 0000000000..29a9f0ca25 --- /dev/null +++ b/addons/huntir/subConfig/config.cpp @@ -0,0 +1,26 @@ +#include "\z\ace\addons\huntir\script_component.hpp" +#undef COMPONENT +#define COMPONENT huntir_sub + +class CfgPatches { + class ADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_huntir"}; + author = ECSTRING(common,ACETeam); + url = ECSTRING(main,URL); + VERSION_CONFIG; + }; +}; + +class CfgWeapons { + class UGL_F; + class Rifle_Base_F; + class arifle_MX_Base_F: Rifle_Base_F { + class GL_3GL_F: UGL_F { + magazines[] += {"ACE_HuntIR_M203"}; + }; + }; +}; diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index 126f79b8bf..dcdb3586e1 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -5,7 +5,10 @@ class CfgWeapons { class srifle_EBR_F; class launch_O_Titan_F; class UGL_F; - + + class rhs_weap_M320_Base_F: Pistol_Base_F { // Standalone M320 (pistol slot) + magazines[] += {"ACE_HuntIR_M203"}; + }; class GM6_base_F; class rhs_weap_M107_Base_F: GM6_base_F { ACE_barrelTwist = 381.0; @@ -16,7 +19,7 @@ class CfgWeapons { ACE_barrelLength = 609.6; ACE_Overheating_dispersion = 0.75; }; - class rhs_weap_m24sws : rhs_weap_XM2010_Base_F { + class rhs_weap_m24sws: rhs_weap_XM2010_Base_F { ACE_barrelTwist = 285.75; ACE_barrelLength = 609.6; }; @@ -25,97 +28,9 @@ class CfgWeapons { ACE_barrelTwist = 177.8; ACE_barrelLength = 368.3; class M203_GL: UGL_F { - magazines[] = { - "rhs_mag_M441_HE", - "rhs_mag_M433_HEDP", - "rhs_mag_M4009", - "rhs_mag_m576", - "rhs_mag_M585_white", - "rhs_mag_M661_green", - "rhs_mag_M662_red", - "rhs_mag_M713_red", - "rhs_mag_M714_white", - "rhs_mag_M715_green", - "rhs_mag_M716_yellow", - - // bis compatibility - "1Rnd_HE_Grenade_shell", - "UGL_FlareWhite_F", - "UGL_FlareGreen_F", - "UGL_FlareRed_F", - "UGL_FlareYellow_F", - "UGL_FlareCIR_F", - "1Rnd_Smoke_Grenade_shell", - "1Rnd_SmokeRed_Grenade_shell", - "1Rnd_SmokeGreen_Grenade_shell", - "1Rnd_SmokeYellow_Grenade_shell", - "1Rnd_SmokePurple_Grenade_shell", - "1Rnd_SmokeBlue_Grenade_shell", - "1Rnd_SmokeOrange_Grenade_shell", - "3Rnd_HE_Grenade_shell", - "3Rnd_UGL_FlareWhite_F", - "3Rnd_UGL_FlareGreen_F", - "3Rnd_UGL_FlareRed_F", - "3Rnd_UGL_FlareYellow_F", - "3Rnd_UGL_FlareCIR_F", - "3Rnd_Smoke_Grenade_shell", - "3Rnd_SmokeRed_Grenade_shell", - "3Rnd_SmokeGreen_Grenade_shell", - "3Rnd_SmokeYellow_Grenade_shell", - "3Rnd_SmokePurple_Grenade_shell", - "3Rnd_SmokeBlue_Grenade_shell", - "3Rnd_SmokeOrange_Grenade_shell", - - // ACE3 Compatibility - "ACE_HuntIR_M203" - }; - }; - class M320_GL : M203_GL { - magazines[] = { - "rhs_mag_M441_HE", - "rhs_mag_M433_HEDP", - "rhs_mag_M4009", - "rhs_mag_m576", - "rhs_mag_M585_white", - "rhs_mag_M661_green", - "rhs_mag_M662_red", - "rhs_mag_M713_red", - "rhs_mag_M714_white", - "rhs_mag_M715_green", - "rhs_mag_M716_yellow", - - // bis compatibility - "1Rnd_HE_Grenade_shell", - "UGL_FlareWhite_F", - "UGL_FlareGreen_F", - "UGL_FlareRed_F", - "UGL_FlareYellow_F", - "UGL_FlareCIR_F", - "1Rnd_Smoke_Grenade_shell", - "1Rnd_SmokeRed_Grenade_shell", - "1Rnd_SmokeGreen_Grenade_shell", - "1Rnd_SmokeYellow_Grenade_shell", - "1Rnd_SmokePurple_Grenade_shell", - "1Rnd_SmokeBlue_Grenade_shell", - "1Rnd_SmokeOrange_Grenade_shell", - "3Rnd_HE_Grenade_shell", - "3Rnd_UGL_FlareWhite_F", - "3Rnd_UGL_FlareGreen_F", - "3Rnd_UGL_FlareRed_F", - "3Rnd_UGL_FlareYellow_F", - "3Rnd_UGL_FlareCIR_F", - "3Rnd_Smoke_Grenade_shell", - "3Rnd_SmokeRed_Grenade_shell", - "3Rnd_SmokeGreen_Grenade_shell", - "3Rnd_SmokeYellow_Grenade_shell", - "3Rnd_SmokePurple_Grenade_shell", - "3Rnd_SmokeBlue_Grenade_shell", - "3Rnd_SmokeOrange_Grenade_shell", - - // ACE3 Compatibility - "ACE_HuntIR_M203" - }; + magazines[] += {"ACE_HuntIR_M203"}; }; + // Added to the M320_GL in subConfig }; class rhs_weap_m4a1; class rhs_weap_hk416d10: rhs_weap_m4a1 { @@ -141,7 +56,7 @@ class CfgWeapons { }; class rhs_weap_lmg_minimi_railed; // Rifle_Base_F - scope = private; class rhs_weap_m249_pip_S: rhs_weap_lmg_minimi_railed { - ACE_barrelLength = 348; + ACE_barrelLength = 348; ACE_barrelTwist = 177.8; ACE_Overheating_allowSwapBarrel = 1; }; @@ -180,9 +95,9 @@ class CfgWeapons { ACE_barrelLength = 508.0; }; class SMG_01_F; - class rhsusf_weap_MP7A1_base_f : SMG_01_F { + class rhsusf_weap_MP7A1_base_f: SMG_01_F { ACE_barrelTwist = 160.0; - ACE_barrelLength = 180.0; + ACE_barrelLength = 180.0; }; // RHS pistols class hgun_ACPC2_F; @@ -227,7 +142,7 @@ class CfgWeapons { }; }; }; - class rhsusf_acc_LEUPOLDMK4_2_d : rhsusf_acc_LEUPOLDMK4_2 {}; + class rhsusf_acc_LEUPOLDMK4_2_d: rhsusf_acc_LEUPOLDMK4_2 {}; class rhsusf_acc_premier: rhsusf_acc_LEUPOLDMK4_2 { class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { @@ -238,7 +153,7 @@ class CfgWeapons { }; }; }; - class rhsusf_acc_premier_low : rhsusf_acc_premier {}; + class rhsusf_acc_premier_low: rhsusf_acc_premier {}; class rhsusf_acc_premier_anpvs27: rhsusf_acc_premier { class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { diff --git a/optionals/compat_rhs_usf3/subConfig/config.cpp b/optionals/compat_rhs_usf3/subConfig/config.cpp new file mode 100644 index 0000000000..e3c3b30ae0 --- /dev/null +++ b/optionals/compat_rhs_usf3/subConfig/config.cpp @@ -0,0 +1,26 @@ +#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp" +#undef COMPONENT +#define COMPONENT compat_rhs_usf3_sub + +class CfgPatches { + class ADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_compat_rhs_usf3"}; + author = ECSTRING(common,ACETeam); + url = ECSTRING(main,URL); + VERSION_CONFIG; + }; +}; + +class CfgWeapons { + class arifle_MX_Base_F; + class rhs_weap_m4_Base: arifle_MX_Base_F { + class M203_GL; + class M320_GL: M203_GL { + magazines[] += {"ACE_HuntIR_M203"}; + }; + }; +};