Merge pull request #1588 from acemod/rhs38_us_compat

Update RHS compat for 0.3.8
This commit is contained in:
ulteq 2015-06-13 09:38:07 +02:00
commit b4e0504747

View File

@ -6,74 +6,56 @@ class CfgWeapons
class srifle_EBR_F; class srifle_EBR_F;
class launch_O_Titan_F; class launch_O_Titan_F;
class rhs_weap_XM2010_Base_F: Rifle_Base_F class rhs_weap_XM2010_Base_F: Rifle_Base_F {
{
ACE_barrelTwist=254.0; ACE_barrelTwist=254.0;
ACE_barrelLength=609.6; ACE_barrelLength=609.6;
}; };
class arifle_MX_Base_F; class arifle_MX_Base_F;
class rhs_weap_m4_Base: arifle_MX_Base_F class rhs_weap_m4_Base: arifle_MX_Base_F {
{
ACE_barrelTwist=177.8; ACE_barrelTwist=177.8;
ACE_barrelLength=368.3; ACE_barrelLength=368.3;
}; };
class rhs_weap_m4a1; class rhs_weap_m4a1;
class rhs_weap_mk18: rhs_weap_m4a1 class rhs_weap_mk18: rhs_weap_m4a1 {
{
ACE_barrelTwist=177.8; ACE_barrelTwist=177.8;
ACE_barrelLength=261.62; ACE_barrelLength=261.62;
}; };
class rhs_weap_m16a4: rhs_weap_m4_Base class rhs_weap_m16a4: rhs_weap_m4_Base {
{
ACE_barrelTwist=177.8; ACE_barrelTwist=177.8;
ACE_barrelLength=508.0; ACE_barrelLength=508.0;
}; };
class rhs_M249_base; class rhs_weap_m240_base;
class rhs_weap_m249_pip: rhs_M249_base class rhs_weap_m240B: rhs_weap_m240_base {
{
ACE_barrelTwist=177.8;
ACE_barrelLength=414.02;
};
class weap_m240_base;
class rhs_weap_m240B: weap_m240_base
{
ACE_barrelTwist=304.8; ACE_barrelTwist=304.8;
ACE_barrelLength=629.92; ACE_barrelLength=629.92;
}; };
class rhs_weap_m14ebrri: srifle_EBR_F class rhs_weap_m14ebrri: srifle_EBR_F {
{
ACE_barrelTwist=304.8; ACE_barrelTwist=304.8;
ACE_barrelLength=558.8; ACE_barrelLength=558.8;
}; };
class rhs_weap_sr25: rhs_weap_m14ebrri class rhs_weap_sr25: rhs_weap_m14ebrri {
{
ACE_barrelTwist=285.75; ACE_barrelTwist=285.75;
ACE_barrelLength=609.6; ACE_barrelLength=609.6;
}; };
class rhs_weap_sr25_ec: rhs_weap_sr25 class rhs_weap_sr25_ec: rhs_weap_sr25 {
{
ACE_barrelTwist=285.75; ACE_barrelTwist=285.75;
ACE_barrelLength=508.0; ACE_barrelLength=508.0;
}; };
class rhs_weap_M590_5RD: Rifle_Base_F class rhs_weap_M590_5RD: Rifle_Base_F {
{
ACE_barrelTwist=0.0; ACE_barrelTwist=0.0;
ACE_twistDirection=0; ACE_twistDirection=0;
ACE_barrelLength=469.9; ACE_barrelLength=469.9;
}; };
class rhs_weap_M590_8RD: rhs_weap_M590_5RD class rhs_weap_M590_8RD: rhs_weap_M590_5RD {
{
ACE_barrelTwist=0.0; ACE_barrelTwist=0.0;
ACE_twistDirection=0; ACE_twistDirection=0;
ACE_barrelLength=508.0; ACE_barrelLength=508.0;
}; };
class hgun_ACPC2_F; class hgun_ACPC2_F;
class rhsusf_weap_m1911a1: hgun_ACPC2_F class rhsusf_weap_m1911a1: hgun_ACPC2_F {
{
ACE_barrelTwist=406.4; ACE_barrelTwist=406.4;
ACE_barrelLength=127.0; ACE_barrelLength=127.0;
}; };
class rhsusf_acc_sniper_base; class rhsusf_acc_sniper_base;
class rhsusf_acc_LEUPOLDMK4: rhsusf_acc_sniper_base { class rhsusf_acc_LEUPOLDMK4: rhsusf_acc_sniper_base {
ACE_ScopeAdjust_Vertical[] = { -4, 30 }; ACE_ScopeAdjust_Vertical[] = { -4, 30 };
@ -87,7 +69,6 @@ class CfgWeapons
ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_VerticalIncrement = 0.1;
ACE_ScopeAdjust_HorizontalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1;
}; };
class rhs_weap_fgm148 : launch_O_Titan_F { class rhs_weap_fgm148 : launch_O_Titan_F {
ace_javelin_enabled = 1; ace_javelin_enabled = 1;
weaponInfoType = "ACE_RscOptics_javelin"; weaponInfoType = "ACE_RscOptics_javelin";