RHS Compat ADD Missing (undefined) Weapons (#7702)

* Added Missing Values * M240G Added * Update CfgWeapons.hpp * Update CfgWeapons.hpp * Update CfgWeapons.hpp * Update CfgWeapons.hpp * Update CfgWeapons.hpp * Revert "Merge remote-tracking branch 'upstream/master' into RHS-Compat-CFG-Weapon-fixes" This reverts commit d14bcb6, reversing changes made to dbaea26. * Revert "Revert "Merge remote-tracking branch 'upstream/master' into RHS-Compat-CFG-Weapon-fixes"" This reverts commit 65709b7. * Update CfgWeapons.hpp * Update CfgWeapons.hpp * minor config style change * minor config style Co-authored-by: PabstMirror <pabstmirror@gmail.com>
acemod · Jun 13, 2020 · a5ba5ab · a5ba5ab
1 parent 2eedf7a
commit a5ba5ab
Show file tree

Hide file tree

Showing 2 changed files with 105 additions and 37 deletions.
diff --git a/optionals/compat_rhs_gref3/CfgWeapons.hpp b/optionals/compat_rhs_gref3/CfgWeapons.hpp
@@ -1,84 +1,120 @@
 class CfgWeapons {
     class rhs_weap_kar98k_Base_F;
     class rhs_weap_kar98k: rhs_weap_kar98k_Base_F {
-        ACE_barrelTwist=240;
-        ACE_barrelLength=600;
+        ACE_barrelTwist = 240;
+        ACE_barrelLength = 600;
     };
     class rhs_weap_m38_Base_F;
     class rhs_weap_m38: rhs_weap_m38_Base_F {
-        ACE_barrelTwist=250;
-        ACE_barrelLength=315;
+        ACE_barrelTwist = 250;
+        ACE_barrelLength = 315;
     };
     class rhs_weap_m38_rail;
     class rhs_weap_mosin_sbr: rhs_weap_m38_rail {
-        ACE_barrelTwist=240;
-        ACE_barrelLength=254;
+        ACE_barrelTwist = 240;
+        ACE_barrelLength = 254;
     };
     class rhs_weap_m70_base;
     class rhs_weap_m70ab2: rhs_weap_m70_base {
-        ACE_barrelTwist=240;
-        ACE_barrelLength=415;
+        ACE_barrelTwist = 240;
+        ACE_barrelLength = 415;
     };
     class rhs_weap_m92: rhs_weap_m70_base {
-        ACE_barrelTwist=240;
-        ACE_barrelLength=254;
+        ACE_barrelTwist = 240;
+        ACE_barrelLength = 254;
     };
     class rhs_weap_m76: rhs_weap_m70_base {
-        ACE_barrelTwist=250;
-        ACE_barrelLength=200;
+        ACE_barrelTwist = 250;
+        ACE_barrelLength = 200;
     };
     class rhs_weap_m21_base;
     class rhs_weap_m21: rhs_weap_m21_base {
-        ACE_barrelTwist=177.8;
-        ACE_barrelLength=460;
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 460;
     };
     class rhs_weap_m21a: rhs_weap_m21_base {
-        ACE_barrelTwist=177.8;
-        ACE_barrelLength=290;
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 290;
     };
     class rhs_weap_m21a_pr: rhs_weap_m21_base {
-        ACE_barrelTwist=177.8;
-        ACE_barrelLength=290;
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 290;
     };
     class rhs_weap_m21a_pr_pbg40: rhs_weap_m21_base {
-        ACE_barrelTwist=177.8;
-        ACE_barrelLength=290;
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 290;
     };
     class rhs_weap_m21s: rhs_weap_m21_base {
-        ACE_barrelTwist=177.8;
-        ACE_barrelLength=375;
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 375;
     };
     class rhs_weap_m21s_pr: rhs_weap_m21a_pr {
-        ACE_barrelTwist=177.8;
-        ACE_barrelLength=375;
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 375;
     };
     class Rifle_Base_F;
-    class rhs_weap_savz58_base : Rifle_Base_F {
-        ACE_barrelTwist=240;
-        ACE_barrelLength=390;
+    class rhs_weap_savz58_base: Rifle_Base_F {
+        ACE_barrelTwist = 240;
+        ACE_barrelLength = 390;
     };
     class rhs_weap_stgw57_base;
     class rhs_weap_stgw57: rhs_weap_stgw57_base {
-        ACE_barrelTwist=270;
-        ACE_barrelLength=583;
+        ACE_barrelTwist = 270;
+        ACE_barrelLength = 583;
     };
     class rhs_weap_g36_base;
     class rhs_weap_g36c: rhs_weap_g36_base {
-        ACE_barrelTwist=177.8;
-        ACE_barrelLength=228.6;
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 228.6;
     };
     class rhs_weap_g36kv: rhs_weap_g36_base {
-        ACE_barrelTwist=177.8;
-        ACE_barrelLength=317.5;
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 317.5;
     };
     class Rifle_Long_Base_F;
     class rhs_weap_m84: Rifle_Long_Base_F {
         ACE_Overheating_allowSwapBarrel = 1;
-        ACE_barrelTwist=240;
-        ACE_barrelLength=658;
+        ACE_barrelTwist = 240;
+        ACE_barrelLength = 658;
+    };
+    class rhs_weap_vhs2_base;
+    class rhs_weap_vhsd2: rhs_weap_vhs2_base {
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 500.0;
+    };
+    class rhs_weap_vhsk2: rhs_weap_vhsd2 {
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 410.0;
+    };
+    class rhs_weap_vhsd2_ct15x: rhs_weap_vhsk2 {
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 500.0;
+    };
+    class rhs_weap_vhsd2_bg: rhs_weap_vhsd2_ct15x {
+        ACE_barrelTwist = 177.8;
+        ACE_barrelLength = 500.0;
+    };
+    class rhs_weap_fnfal_base;
+    class rhs_weap_l1a1_base: rhs_weap_fnfal_base {
+        ACE_barrelTwist = 302.26;
+        ACE_barrelLength = 554.4;
     };
     class rhs_weap_mg42_base: Rifle_Base_F {
         ACE_Overheating_allowSwapBarrel = 1;
+        ACE_barrelTwist = 305.0;
+        ACE_barrelLength = 530.0;
+    };
+    class rhs_weap_MP44_base: Rifle_Base_F {
+        ACE_barrelTwist = 240.0;
+        ACE_barrelLength = 420.0;
+    };
+    class rhs_weap_m3a1_base: Rifle_Base_F {
+        ACE_barrelTwist = 406.0;
+        ACE_barrelLength = 203.2;
+    };
+    class rhs_weap_M1garand_Base_F: Rifle_Base_F {
+        ACE_barrelTwist = 254.0;
+        ACE_barrelLength = 610.0;
     };
 
     CREATE_CSW_PROXY(rhs_weap_DSHKM);

diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp
@@ -83,19 +83,38 @@ class CfgWeapons {
         ACE_barrelLength = 464.8;
         ACE_barrelTwist = 177.8;
     };
-    class rhs_weap_m240_base; // Rifle_Long_Base_F
-    class rhs_weap_m240B: rhs_weap_m240_base {
+    class rhs_weap_m249: rhs_weap_lmg_minimi_railed {
+        ACE_barrelLength = 464.8;
+        ACE_barrelTwist = 177.8;
+    };
+    class rhs_weap_m249_pip: rhs_weap_lmg_minimi_railed {
+        ACE_barrelLength = 464.8;
+        ACE_barrelTwist = 177.8;
+    };
+    class rhs_weap_M249_base;
+    class rhs_weap_m240_base: rhs_weap_M249_base {
         ACE_RailHeightAboveBore = 4.3987;
         ACE_barrelTwist = 304.8;
         ACE_barrelLength = 629.92;
         ACE_Overheating_allowSwapBarrel = 1;
     };
+    class rhs_weap_m14_base;
+    class rhs_weap_m14: rhs_weap_m14_base {
+        ACE_barrelTwist = 304.8;
+        ACE_barrelLength = 558.8;
+        ACE_Overheating_dispersion = 0.75;
+    };
     class rhs_weap_m14ebrri: rhs_weap_m14ebrri_base {
         ACE_barrelTwist = 304.8;
         ACE_barrelLength = 558.8;
         ACE_Overheating_dispersion = 0.75;
         ACE_RailHeightAboveBore = 3.08341;
     };
+    class rhs_weap_m14_socom_base: rhs_weap_m14 {
+        ACE_barrelTwist = 304.8;
+        ACE_barrelLength = 413; //16.25 in (413 mm)
+        ACE_Overheating_dispersion = 0.75;
+    };
     class rhs_weap_sr25: rhs_weap_m14ebrri {
         ACE_barrelTwist = 285.75;
         ACE_barrelLength = 609.6;
@@ -106,6 +125,19 @@ class CfgWeapons {
         ACE_barrelLength = 508.0;
         ACE_RailHeightAboveBore = 3.13689;
     };
+    class rhs_weap_SCAR_H_Base;
+    class rhs_weap_SCAR_H_CQC_Base: rhs_weap_SCAR_H_Base {
+        ACE_barrelTwist = 304.8; // 1:12"
+        ACE_barrelLength = 330.0;
+    };
+    class rhs_weap_SCAR_H_LB_Base: rhs_weap_SCAR_H_CQC_Base {
+        ACE_barrelTwist = 304.8; // 1:12"
+        ACE_barrelLength = 508.0;
+    };
+    class rhs_weap_SCAR_H_STD_Base: rhs_weap_SCAR_H_LB_Base {
+        ACE_barrelTwist = 304.8; // 1:12"
+        ACE_barrelLength = 406.0;
+    };
     class rhs_weap_M590_5RD: Rifle_Base_F {
         ACE_barrelTwist = 0.0;
         ACE_twistDirection = 0;