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

fix conflict

Browse Source
This commit is contained in:
bux578 2015-07-26 21:29:53 +02:00
commit bd6cff2e37
2 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -37,6 +37,7 @@ Aleksey EpMAK Yermakov <epmak777@gmail.com>
Alganthe <alganthe@live.fr>
Anthariel <Contact@storm-simulation.com>
Asgar Serran <piechottaf@web.de>
Bamse <bamsis@gmail.com>
Bla1337
BlackPixxel <blackpixxel96@gmail.com>
BlackQwar

93
optionals/compat_rhs_usf3/CfgWeapons.hpp
View File

@ -5,6 +5,7 @@ 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;
@ -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 {