RHS Compat - Improve macro usage (#9262)

* macro usage, swap barrel on PKP

* revert barrel swap
This commit is contained in:
Grim 2023-07-16 20:27:09 +03:00 committed by GitHub
parent 510d35497f
commit b54a5463ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 11 deletions

View File

@ -79,7 +79,7 @@ class CfgWeapons {
ACE_barrelLength = 657.86; ACE_barrelLength = 657.86;
}; };
class rhs_weap_pkm: rhs_weap_pkp { class rhs_weap_pkm: rhs_weap_pkp {
ACE_Overheating_allowSwapBarrel = 1; EGVAR(overheating,allowSwapBarrel) = 1;
ACE_barrelTwist = 240.03; ACE_barrelTwist = 240.03;
ACE_barrelLength = 645.16; ACE_barrelLength = 645.16;
}; };

View File

@ -109,11 +109,11 @@ class CfgWeapons {
}; };
class rhs_weap_Izh18: Rifle_Base_F { class rhs_weap_Izh18: Rifle_Base_F {
ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"}; EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"};
}; };
class rhs_weap_m79: Rifle_Base_F { class rhs_weap_m79: Rifle_Base_F {
ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"}; EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"};
}; };
CREATE_CSW_PROXY(rhs_weap_DSHKM); CREATE_CSW_PROXY(rhs_weap_DSHKM);

View File

@ -56,7 +56,7 @@ class CfgWeapons {
class rhs_weap_m84: Rifle_Long_Base_F { class rhs_weap_m84: Rifle_Long_Base_F {
ACE_barrelLength = 658; ACE_barrelLength = 658;
ACE_barrelTwist = 240; ACE_barrelTwist = 240;
ACE_Overheating_allowSwapBarrel = 1; EGVAR(overheating,allowSwapBarrel) = 1;
}; };
class hgun_P07_F; class hgun_P07_F;

View File

@ -23,7 +23,7 @@ class CfgWeapons {
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;
ACE_Overheating_dispersion = 0.75; EGVAR(overheating,dispersion) = 0.75;
ACE_RailHeightAboveBore = 3.1028; ACE_RailHeightAboveBore = 3.1028;
}; };
class rhs_weap_m24sws: rhs_weap_XM2010_Base_F { class rhs_weap_m24sws: rhs_weap_XM2010_Base_F {
@ -96,24 +96,23 @@ class CfgWeapons {
ACE_RailHeightAboveBore = 4.3987; ACE_RailHeightAboveBore = 4.3987;
ACE_barrelTwist = 304.8; ACE_barrelTwist = 304.8;
ACE_barrelLength = 629.92; ACE_barrelLength = 629.92;
ACE_Overheating_allowSwapBarrel = 1;
}; };
class rhs_weap_m14_base; class rhs_weap_m14_base;
class rhs_weap_m14: rhs_weap_m14_base { class rhs_weap_m14: rhs_weap_m14_base {
ACE_barrelTwist = 304.8; ACE_barrelTwist = 304.8;
ACE_barrelLength = 558.8; ACE_barrelLength = 558.8;
ACE_Overheating_dispersion = 0.75; EGVAR(overheating,dispersion) = 0.75;
}; };
class rhs_weap_m14ebrri: rhs_weap_m14ebrri_base { class rhs_weap_m14ebrri: rhs_weap_m14ebrri_base {
ACE_barrelTwist = 304.8; ACE_barrelTwist = 304.8;
ACE_barrelLength = 558.8; ACE_barrelLength = 558.8;
ACE_Overheating_dispersion = 0.75; EGVAR(overheating,dispersion) = 0.75;
ACE_RailHeightAboveBore = 3.08341; ACE_RailHeightAboveBore = 3.08341;
}; };
class rhs_weap_m14_socom_base: rhs_weap_m14_base { class rhs_weap_m14_socom_base: rhs_weap_m14_base {
ACE_barrelTwist = 304.8; ACE_barrelTwist = 304.8;
ACE_barrelLength = 413; //16.25 in (413 mm) ACE_barrelLength = 413; //16.25 in (413 mm)
ACE_Overheating_dispersion = 0.75; EGVAR(overheating,dispersion) = 0.75;
}; };
class rhs_weap_sr25: rhs_weap_m14ebrri { class rhs_weap_sr25: rhs_weap_m14ebrri {
ACE_barrelTwist = 285.75; ACE_barrelTwist = 285.75;
@ -158,7 +157,7 @@ class CfgWeapons {
ACE_barrelLength = 508.0; ACE_barrelLength = 508.0;
}; };
class rhs_weap_m32_Base_F: Rifle_Base_F { class rhs_weap_m32_Base_F: Rifle_Base_F {
ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"}; EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"};
}; };
class SMG_02_base_F; class SMG_02_base_F;
class rhsusf_weap_MP7A1_base_f: SMG_02_base_F { class rhsusf_weap_MP7A1_base_f: SMG_02_base_F {
@ -184,7 +183,7 @@ class CfgWeapons {
ACE_barrelLength = 124.46; ACE_barrelLength = 124.46;
}; };
class rhs_weap_M320_Base_F: Pistol_Base_F { class rhs_weap_M320_Base_F: Pistol_Base_F {
ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"}; EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"};
}; };
// RHS sniper scopes // RHS sniper scopes