Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify huntIR configs using += (#4521)

Browse Source 
* Add huntIR magazine to GL_3GL_F via sub config

* Cleanup RHS 40mm huntIR GL config

* Add huntir to standalone m320 - #4199
This commit is contained in:
PabstMirror 2017-01-09 12:11:31 -06:00 committed by GitHub
parent 8752b03c12
commit 39181fdea5
4 changed files with 65 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/huntir/CfgWeapons.hpp
View File

@ -19,11 +19,5 @@ class CfgWeapons {
class UGL_F: GrenadeLauncher { class UGL_F: GrenadeLauncher {
magazines[] += {"ACE_HuntIR_M203"}; magazines[] += {"ACE_HuntIR_M203"};
}; };
class Rifle_Base_F; // Added to the GL_3GL_F in subconfig
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"};
};
};
}; };

26
addons/huntir/subConfig/config.cpp Normal file
View File

@ -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"};
};
};
};

103
optionals/compat_rhs_usf3/CfgWeapons.hpp
View File

@ -6,6 +6,9 @@ class CfgWeapons {
class launch_O_Titan_F; class launch_O_Titan_F;
class UGL_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 GM6_base_F;
class rhs_weap_M107_Base_F: GM6_base_F { class rhs_weap_M107_Base_F: GM6_base_F {
ACE_barrelTwist = 381.0; ACE_barrelTwist = 381.0;
@ -16,7 +19,7 @@ class CfgWeapons {
ACE_barrelLength = 609.6; ACE_barrelLength = 609.6;
ACE_Overheating_dispersion = 0.75; 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_barrelTwist = 285.75;
ACE_barrelLength = 609.6; ACE_barrelLength = 609.6;
}; };
@ -25,97 +28,9 @@ class CfgWeapons {
ACE_barrelTwist = 177.8; ACE_barrelTwist = 177.8;
ACE_barrelLength = 368.3; ACE_barrelLength = 368.3;
class M203_GL: UGL_F { class M203_GL: UGL_F {
magazines[] = { magazines[] += {"ACE_HuntIR_M203"};
"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"
};
}; };
// Added to the M320_GL in subConfig
}; };
class rhs_weap_m4a1; class rhs_weap_m4a1;
class rhs_weap_hk416d10: rhs_weap_m4a1 { class rhs_weap_hk416d10: rhs_weap_m4a1 {
@ -180,7 +95,7 @@ class CfgWeapons {
ACE_barrelLength = 508.0; ACE_barrelLength = 508.0;
}; };
class SMG_01_F; 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_barrelTwist = 160.0;
ACE_barrelLength = 180.0; ACE_barrelLength = 180.0;
}; };
@ -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 rhsusf_acc_premier: rhsusf_acc_LEUPOLDMK4_2 {
class ItemInfo: InventoryOpticsItem_Base_F { class ItemInfo: InventoryOpticsItem_Base_F {
class OpticsModes { 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 rhsusf_acc_premier_anpvs27: rhsusf_acc_premier {
class ItemInfo: InventoryOpticsItem_Base_F { class ItemInfo: InventoryOpticsItem_Base_F {
class OpticsModes { class OpticsModes {

26
optionals/compat_rhs_usf3/subConfig/config.cpp Normal file
View File

@ -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"};
};
};
};