From 874bd44749bbb6c119cd68f0abfc7208d179a271 Mon Sep 17 00:00:00 2001 From: TheBamse Date: Mon, 22 Jun 2015 21:34:40 +0200 Subject: [PATCH 1/4] Add HuntIR to all RHS AR15s that has M203 or M320 attached. --- optionals/compat_rhs_usf3/CfgWeapons.hpp | 95 +++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-) diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index e2e1efc00e..68793ad01c 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -5,7 +5,8 @@ class CfgWeapons class Rifle_Base_F; class srifle_EBR_F; class launch_O_Titan_F; - + class UGL_F; + class rhs_weap_XM2010_Base_F: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=609.6; @@ -14,6 +15,98 @@ class CfgWeapons class rhs_weap_m4_Base: arifle_MX_Base_F { 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" + }; + }; }; class rhs_weap_m4a1; class rhs_weap_mk18: rhs_weap_m4a1 { From e7c06fb8d7a1de777120c1961cdb29ab05b5887f Mon Sep 17 00:00:00 2001 From: TheBamse Date: Mon, 22 Jun 2015 21:37:14 +0200 Subject: [PATCH 2/4] Added me to the authors list. --- AUTHORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index 737bfb590b..ef9579191b 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -101,3 +101,4 @@ Valentin Torikian VyMajoris(W-Cephei) Winter zGuba +Bamse \ No newline at end of file From 61b77332a1e1a558a8d6f02d273012ef3991026e Mon Sep 17 00:00:00 2001 From: TheBamse Date: Tue, 23 Jun 2015 13:24:13 +0200 Subject: [PATCH 3/4] Fixed spacings and alphabetical order. --- AUTHORS.txt | 4 ++-- optionals/compat_rhs_usf3/CfgWeapons.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index ef9579191b..de1ce8afef 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -37,6 +37,7 @@ Aleksey EpMAK Yermakov Alganthe Anthariel Asgar Serran +Bamse Bla1337 BlackPixxel BlackQwar @@ -100,5 +101,4 @@ Tourorist Valentin Torikian VyMajoris(W-Cephei) Winter -zGuba -Bamse \ No newline at end of file +zGuba \ No newline at end of file diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index 68793ad01c..1c01cca0f2 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -15,7 +15,7 @@ class CfgWeapons class rhs_weap_m4_Base: arifle_MX_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; - class M203_GL : UGL_F { + class M203_GL : UGL_F { magazines[] = { "rhs_mag_M441_HE", "rhs_mag_M433_HEDP", @@ -61,7 +61,7 @@ class CfgWeapons "ACE_HuntIR_M203" }; }; - class M320_GL : M203_GL { + class M320_GL : M203_GL { magazines[] = { "rhs_mag_M441_HE", "rhs_mag_M433_HEDP", From d9ddb597a165f0fe9493cb248531d17a6e17ae8e Mon Sep 17 00:00:00 2001 From: TheBamse Date: Tue, 23 Jun 2015 19:55:10 +0200 Subject: [PATCH 4/4] Tabs converted to four spaces --- optionals/compat_rhs_usf3/CfgWeapons.hpp | 182 +++++++++++------------ 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index 1c01cca0f2..eb51ffc5c3 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -6,7 +6,7 @@ class CfgWeapons class srifle_EBR_F; class launch_O_Titan_F; class UGL_F; - + class rhs_weap_XM2010_Base_F: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=609.6; @@ -15,98 +15,98 @@ class CfgWeapons class rhs_weap_m4_Base: arifle_MX_Base_F { 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", + 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" + }; + }; + 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" - }; - }; + //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 rhs_weap_m4a1; class rhs_weap_mk18: rhs_weap_m4a1 {