diff --git a/optionals/compat_rhs_afrf3/CfgAmmo.hpp b/optionals/compat_rhs_afrf3/CfgAmmo.hpp index fec7eca805..323634f02c 100644 --- a/optionals/compat_rhs_afrf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_afrf3/CfgAmmo.hpp @@ -1,10 +1,10 @@ class CfgAmmo { - class BulletBase; - class B_556x45_Ball; - class rhs_B_545x39_Ball: B_556x45_Ball - { + class BulletBase; + class B_556x45_Ball; + class rhs_B_545x39_Ball: B_556x45_Ball + { ACE_caliber=0.220; ACE_bulletLength=0.85; ACE_bulletMass=52.9; @@ -15,9 +15,9 @@ class CfgAmmo ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; ACE_barrelLengths[]={10, 16.3, 20}; - }; - class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball - { + }; + class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball + { ACE_caliber=0.220; ACE_bulletLength=0.85; ACE_bulletMass=49.8; @@ -28,10 +28,10 @@ class CfgAmmo ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; ACE_barrelLengths[]={10, 16.3, 20}; - }; - class B_762x51_Ball; - class rhs_B_762x54_Ball: B_762x51_Ball - { + }; + class B_762x51_Ball; + class rhs_B_762x54_Ball: B_762x51_Ball + { ACE_caliber=0.312; ACE_bulletLength=1.14; ACE_bulletMass=152; @@ -42,9 +42,9 @@ class CfgAmmo ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; ACE_barrelLengths[]={16, 20, 24, 26}; - }; - class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball - { + }; + class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball + { ACE_caliber=0.312; ACE_bulletLength=1.14; ACE_bulletMass=149; @@ -55,9 +55,9 @@ class CfgAmmo ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; ACE_barrelLengths[]={16, 20, 24, 26}; - }; - class rhs_B_762x54_7N1_Ball: rhs_B_762x54_Ball - { + }; + class rhs_B_762x54_7N1_Ball: rhs_B_762x54_Ball + { ACE_caliber=0.312; ACE_bulletLength=1.14; ACE_bulletMass=152; @@ -68,9 +68,9 @@ class CfgAmmo ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; ACE_barrelLengths[]={16, 20, 24, 26}; - }; - class rhs_B_762x39_Ball: B_762x51_Ball - { + }; + class rhs_B_762x39_Ball: B_762x51_Ball + { ACE_caliber=0.308; ACE_bulletLength=1.14; ACE_bulletMass=123; @@ -81,9 +81,9 @@ class CfgAmmo ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; ACE_barrelLengths[]={10, 16.3, 20}; - }; - class rhs_B_762x39_Tracer: rhs_B_762x39_Ball - { + }; + class rhs_B_762x39_Tracer: rhs_B_762x39_Ball + { ACE_caliber=0.308; ACE_bulletLength=1.14; ACE_bulletMass=117; @@ -94,10 +94,10 @@ class CfgAmmo ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; ACE_barrelLengths[]={10, 16.3, 20}; - }; - class B_9x21_Ball; - class rhs_B_9x19_7N21: B_9x21_Ball - { + }; + class B_9x21_Ball; + class rhs_B_9x19_7N21: B_9x21_Ball + { ACE_caliber=0.355; ACE_bulletLength=0.610; ACE_bulletMass=80.2; @@ -108,9 +108,9 @@ class CfgAmmo ACE_dragModel=1; ACE_muzzleVelocities[]={445, 460, 480}; ACE_barrelLengths[]={4, 5, 9}; - }; - class rhs_B_9x18_57N181S: B_9x21_Ball - { + }; + class rhs_B_9x18_57N181S: B_9x21_Ball + { ACE_caliber=0.365; ACE_bulletLength=0.610; ACE_bulletMass=92.6; @@ -121,5 +121,5 @@ class CfgAmmo ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; ACE_barrelLengths[]={3.8, 5, 9}; - }; + }; }; \ No newline at end of file diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp index ea10b518d7..880b9f791f 100644 --- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp @@ -1,60 +1,60 @@ class CfgWeapons { - class hgun_Rook40_F; - class rhs_weap_pya: hgun_Rook40_F - { + class hgun_Rook40_F; + class rhs_weap_pya: hgun_Rook40_F + { ACE_barrelTwist=10; ACE_barrelLength=4.4; - }; - class Pistol_Base_F; - class rhs_weap_makarov_pmm: rhs_weap_pya - { + }; + class Pistol_Base_F; + class rhs_weap_makarov_pmm: rhs_weap_pya + { ACE_barrelTwist=9.45; ACE_barrelLength=3.68; - }; - class rhs_weap_ak74m_Base_F; - class rhs_weap_ak74m: rhs_weap_ak74m_Base_F - { + }; + class rhs_weap_ak74m_Base_F; + class rhs_weap_ak74m: rhs_weap_ak74m_Base_F + { ACE_barrelTwist=7.87; ACE_barrelLength=16.3; - }; - class rhs_weap_akm: rhs_weap_ak74m - { + }; + class rhs_weap_akm: rhs_weap_ak74m + { ACE_barrelTwist=7.87; ACE_barrelLength=16.3; - }; + }; class rhs_weap_aks74; - class rhs_weap_aks74u: rhs_weap_aks74 - { + class rhs_weap_aks74u: rhs_weap_aks74 + { ACE_barrelTwist=6.3; ACE_barrelLength=8.3; - }; - class rhs_weap_svd: rhs_weap_ak74m - { + }; + class rhs_weap_svd: rhs_weap_ak74m + { ACE_barrelTwist=9.4; ACE_barrelLength=24.4; - }; + }; class rhs_weap_svdp; - class rhs_weap_svds: rhs_weap_svdp - { + class rhs_weap_svds: rhs_weap_svdp + { ACE_barrelTwist=9.4; ACE_barrelLength=22.2; - }; - class rhs_pkp_base; - class rhs_weap_pkp: rhs_pkp_base - { + }; + class rhs_pkp_base; + class rhs_weap_pkp: rhs_pkp_base + { ACE_barrelTwist=9.45; ACE_barrelLength=25.9; - }; - class rhs_weap_pkm: rhs_weap_pkp - { + }; + class rhs_weap_pkm: rhs_weap_pkp + { ACE_barrelTwist=9.45; ACE_barrelLength=25.4; - }; - class rhs_weap_rpk74m: rhs_weap_pkp - { + }; + class rhs_weap_rpk74m: rhs_weap_pkp + { ACE_barrelTwist=7.68; ACE_barrelLength=23.2; - }; + }; }; \ No newline at end of file diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index bf12ca3313..68a8c8f7fd 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -1,9 +1,9 @@ class CfgAmmo { - class BulletBase; - class rhsusf_B_300winmag: BulletBase - { + class BulletBase; + class rhsusf_B_300winmag: BulletBase + { ACE_caliber=0.308; ACE_bulletLength=1.489; ACE_bulletMass=220; @@ -14,10 +14,10 @@ class CfgAmmo ACE_dragModel=7; ACE_muzzleVelocities[]={847, 867, 877}; ACE_barrelLengths[]={20, 24, 26}; - }; - class B_556x45_Ball; - class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball - { + }; + class B_556x45_Ball; + class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball + { ACE_caliber=0.224; ACE_bulletLength=0.906; ACE_bulletMass=62; @@ -28,9 +28,9 @@ class CfgAmmo ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; ACE_barrelLengths[]={10, 15.5, 20}; - }; - class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball - { + }; + class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball + { ACE_caliber=0.224; ACE_bulletLength=0.906; ACE_bulletMass=77; @@ -41,9 +41,9 @@ class CfgAmmo ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; ACE_barrelLengths[]={7.5, 14.5, 18, 20}; - }; - class rhs_ammo_762x51_M80_Ball: BulletBase - { + }; + class rhs_ammo_762x51_M80_Ball: BulletBase + { ACE_caliber=0.308; ACE_bulletLength=1.14; ACE_bulletMass=146; @@ -54,9 +54,9 @@ class CfgAmmo ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; ACE_barrelLengths[]={10, 16, 20, 24, 26}; - }; - class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball - { + }; + class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball + { ACE_caliber=0.308; ACE_bulletLength=1.24; ACE_bulletMass=175; @@ -67,9 +67,9 @@ class CfgAmmo ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; ACE_barrelLengths[]={16, 20, 24, 26}; - }; - class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball - { + }; + class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball + { ACE_caliber=0.308; ACE_bulletLength=1.24; ACE_bulletMass=127; @@ -80,9 +80,9 @@ class CfgAmmo ACE_dragModel=1; ACE_muzzleVelocities[]={875, 910, 930}; ACE_barrelLengths[]={13, 16, 20}; - }; - class rhs_ammo_45ACP_MHP: BulletBase - { + }; + class rhs_ammo_45ACP_MHP: BulletBase + { ACE_caliber=0.452; ACE_bulletLength=0.68; ACE_bulletMass=230; @@ -93,5 +93,5 @@ class CfgAmmo ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; ACE_barrelLengths[]={4, 5, 9}; - }; + }; }; \ No newline at end of file diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index ab1ae0029a..054cfe16df 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -1,74 +1,74 @@ class CfgWeapons { - class Pistol_Base_F; - class Rifle_Base_F; - class srifle_EBR_F; - class rhs_weap_XM2010_Base_F: Rifle_Base_F - { + class Pistol_Base_F; + class Rifle_Base_F; + class srifle_EBR_F; + class rhs_weap_XM2010_Base_F: Rifle_Base_F + { ACE_barrelTwist=10; ACE_barrelLength=24; - }; - class arifle_MX_Base_F; - class rhs_weap_m4_Base: arifle_MX_Base_F - { + }; + class arifle_MX_Base_F; + class rhs_weap_m4_Base: arifle_MX_Base_F + { ACE_barrelTwist=7; ACE_barrelLength=14.5; - }; + }; class rhs_weap_m4a1; - class rhs_weap_mk18: rhs_weap_m4a1 - { + class rhs_weap_mk18: rhs_weap_m4a1 + { ACE_barrelTwist=7; ACE_barrelLength=10.3; - }; - class rhs_weap_m16a4: rhs_weap_m4_Base - { + }; + class rhs_weap_m16a4: rhs_weap_m4_Base + { ACE_barrelTwist=7; ACE_barrelLength=20; - }; - class rhs_M249_base; - class rhs_weap_m249_pip: rhs_M249_base - { + }; + class rhs_M249_base; + class rhs_weap_m249_pip: rhs_M249_base + { ACE_barrelTwist=7; ACE_barrelLength=16.3; - }; - class weap_m240_base; - class rhs_weap_m240B: weap_m240_base - { + }; + class weap_m240_base; + class rhs_weap_m240B: weap_m240_base + { ACE_barrelTwist=12; ACE_barrelLength=24.8; - }; - class rhs_weap_m14ebrri: srifle_EBR_F - { + }; + class rhs_weap_m14ebrri: srifle_EBR_F + { ACE_barrelTwist=12; ACE_barrelLength=22; - }; - class rhs_weap_sr25: rhs_weap_m14ebrri - { + }; + class rhs_weap_sr25: rhs_weap_m14ebrri + { ACE_barrelTwist=11.25; ACE_barrelLength=24; - }; - class rhs_weap_sr25_ec: rhs_weap_sr25 - { + }; + class rhs_weap_sr25_ec: rhs_weap_sr25 + { ACE_barrelTwist=11.25; ACE_barrelLength=20; - }; - class rhs_weap_M590_5RD: Rifle_Base_F - { + }; + class rhs_weap_M590_5RD: Rifle_Base_F + { ACE_barrelTwist=0; ACE_twistDirection=0; ACE_barrelLength=18.5; - }; - class rhs_weap_M590_8RD: rhs_weap_M590_5RD - { + }; + class rhs_weap_M590_8RD: rhs_weap_M590_5RD + { ACE_barrelTwist=0; ACE_twistDirection=0; ACE_barrelLength=20; - }; - class hgun_ACPC2_F; - class rhsusf_weap_m1911a1: hgun_ACPC2_F - { + }; + class hgun_ACPC2_F; + class rhsusf_weap_m1911a1: hgun_ACPC2_F + { ACE_barrelTwist=16; ACE_barrelLength=5; - }; + }; }; \ No newline at end of file