From 0243228d4ca14fc5f7f31912c1e87b1547927723 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Wed, 10 May 2017 01:15:39 -0500
Subject: [PATCH 1/3] Update helmet hearing protection for RHS-US

---
 optionals/compat_rhs_usf3/CfgWeapons.hpp | 204 +++++++++++++++++++++--
 1 file changed, 193 insertions(+), 11 deletions(-)

diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp
index 2c1594143c4..444214d7ec5 100644
--- a/optionals/compat_rhs_usf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp
@@ -30,7 +30,7 @@ class CfgWeapons {
         ACE_barrelTwist = 304.8; // 1:12"
         ACE_barrelLength = 635.0; // 25"
         ACE_RailHeightAboveBore = 2.6;
-    };    
+    };
     class arifle_MX_Base_F;
     class rhs_weap_m4_Base: arifle_MX_Base_F {
         ACE_barrelTwist = 177.8;
@@ -195,7 +195,7 @@ class CfgWeapons {
                 class Snip {
                     discreteDistance[] = {100};
                     discreteDistanceInitIndex = 0;
-                };    
+                };
             };
         };
     };
@@ -212,21 +212,203 @@ class CfgWeapons {
         lockedTargetSound[] = {"",0,1};
     };
 
+    // Fast Helmets
+    class rhsusf_opscore_01;
+    class rhsusf_opscore_aor1_pelt: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_aor1_pelt_nsw: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_bk_pelt: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_fg_pelt: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_fg_pelt_nsw: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_fg_pelt_cam: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_paint_pelt: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_paint_pelt_nsw: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_paint_pelt_nsw_cam: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_aor2_pelt: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_aor2_pelt_nsw: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_ut_pelt: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_ut_pelt_cam: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_ut_pelt_nsw_cam: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_mc_pelt: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_mc_pelt_nsw: rhsusf_opscore_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_cover;
+    class rhsusf_opscore_mc_cover_pelt: rhsusf_opscore_cover {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_mc_cover_pelt_cam: rhsusf_opscore_cover {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_rg_cover_pelt: rhsusf_opscore_cover {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_coy_cover_pelt: rhsusf_opscore_cover {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_mar_01;
+    class rhsusf_opscore_mar_ut_pelt: rhsusf_opscore_mar_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_opscore_mar_fg_pelt: rhsusf_opscore_mar_01 {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+
+    // ACH Helmets
     class rhsusf_ach_helmet_ocp;
-    class rhsusf_opscore_01: rhsusf_ach_helmet_ocp {
+    class rhsusf_ach_bare_des_headset: rhsusf_ach_helmet_ocp {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_ach_bare_des_headset_ess: rhsusf_ach_helmet_ocp {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_ach_bare_headset: rhsusf_ach_helmet_ocp {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_ach_bare_headset_ess: rhsusf_ach_helmet_ocp {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_ach_bare_semi_headset: rhsusf_ach_helmet_ocp {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_ach_bare_semi_headset_ess: rhsusf_ach_helmet_ocp {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_ach_bare_tan_headset: rhsusf_ach_helmet_ocp {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_ach_bare_tan_headset_ess: rhsusf_ach_helmet_ocp {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_ach_bare_wood_headset: rhsusf_ach_helmet_ocp {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_ach_bare_wood_headset_ess: rhsusf_ach_helmet_ocp {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_ach_helmet_headset_ocp: rhsusf_ach_helmet_ocp {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_ach_helmet_headset_ess_ocp: rhsusf_ach_helmet_ocp {
         ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.60;
+        ace_hearing_lowerVolume = 0.40;
     };
-    class rhsusf_opscore_01_tan: rhsusf_opscore_01 {};
-    class rhsusf_opscore_03_ocp: rhsusf_opscore_01 {};
 
+    // ACVC Helmets
     class rhsusf_cvc_helmet: rhsusf_opscore_01 {
-        ace_hearing_protection = 1;
-        ace_hearing_lowerVolume = 0.80;
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+
+    // MICH Helmets
+    class rhsusf_mich_bare;
+    class rhsusf_mich_bare_alt: rhsusf_mich_bare {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_mich_bare_norotos;
+    class rhsusf_mich_bare_norotos_alt: rhsusf_mich_bare_norotos {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_mich_bare_norotos_arc;
+    class rhsusf_mich_bare_norotos_arc_alt: rhsusf_mich_bare_norotos_arc {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_mich_bare_semi;
+    class rhsusf_mich_bare_alt_semi: rhsusf_mich_bare_semi {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
     };
-    class rhsusf_cvc_green_helmet: rhsusf_cvc_helmet {};
-    class rhsusf_cvc_ess: rhsusf_cvc_helmet {};
-    class rhsusf_cvc_green_ess: rhsusf_cvc_ess {};
+    class rhsusf_mich_bare_norotos_semi;
+    class rhsusf_mich_bare_norotos_alt_semi: rhsusf_mich_bare_norotos_semi {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_mich_bare_norotos_arc_semi;
+    class rhsusf_mich_bare_norotos_arc_alt_semi: rhsusf_mich_bare_norotos_arc_semi {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_mich_bare_tan;
+    class rhsusf_mich_bare_alt_tan: rhsusf_mich_bare_tan {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_mich_bare_norotos_tan;
+    class rhsusf_mich_bare_norotos_alt_tan: rhsusf_mich_bare_norotos_tan {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+    class rhsusf_mich_bare_norotos_arc_tan;
+    class rhsusf_mich_bare_norotos_arc_alt_tan: rhsusf_mich_bare_norotos_arc_tan {
+        ace_hearing_protection = 0.50;
+        ace_hearing_lowerVolume = 0.40;
+    };
+
 
     class H_PilotHelmetHeli_B;
     class H_CrewHelmetHeli_B;

From 0a708401c1626b20110e29f1c25e6fa721a5998c Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Fri, 12 May 2017 13:58:51 -0500
Subject: [PATCH 2/3] Hearing - Add standardized helmet protection macros

---
 addons/hearing/CfgWeapons.hpp             |  28 ++---
 optionals/compat_rhs_afrf3/CfgWeapons.hpp |  16 +--
 optionals/compat_rhs_usf3/CfgWeapons.hpp  | 146 ++++++++--------------
 3 files changed, 72 insertions(+), 118 deletions(-)

diff --git a/addons/hearing/CfgWeapons.hpp b/addons/hearing/CfgWeapons.hpp
index c063c0e8966..d21e5584210 100644
--- a/addons/hearing/CfgWeapons.hpp
+++ b/addons/hearing/CfgWeapons.hpp
@@ -13,42 +13,42 @@ class CfgWeapons {
         };
     };
 
+    #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6;
+    #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5;
+    #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.2;
+
     class H_HelmetB;
     class H_HelmetCrew_B: H_HelmetB {
-        GVAR(protection) = 1;
-        GVAR(lowerVolume) = 0.80;
+        HEARING_PROTECTION_VICCREW
     };
 
     class H_CrewHelmetHeli_B: H_HelmetB {
-        GVAR(protection) = 0.85;
-        GVAR(lowerVolume) = 0.75;
+        HEARING_PROTECTION_VICCREW
     };
 
     class H_PilotHelmetHeli_B: H_HelmetB {
-        GVAR(protection) = 0.85;
-        GVAR(lowerVolume) = 0.75;
+        HEARING_PROTECTION_VICCREW
     };
 
     class H_PilotHelmetFighter_B: H_HelmetB {
-        GVAR(protection) = 1;
-        GVAR(lowerVolume) = 0.80;
+        HEARING_PROTECTION_VICCREW
     };
 
     class HelmetBase;
     class H_Cap_headphones: HelmetBase {
-        GVAR(protection) = 0.5;
-        GVAR(lowerVolume) = 0.60;
+        HEARING_PROTECTION_EARMUFF
     };
 
     class H_HelmetB_light: H_HelmetB {
-        GVAR(protection) = 0.8;
-        GVAR(lowerVolume) = 0.20;
+        HEARING_PROTECTION_PELTOR
+    };
+    class H_HelmetB_camo: H_HelmetB {
+        HEARING_PROTECTION_PELTOR
     };
 
     class H_HelmetB_plain_mcamo;
     class H_HelmetSpecB: H_HelmetB_plain_mcamo {
-        GVAR(protection) = 0.8;
-        GVAR(lowerVolume) = 0.20;
+        HEARING_PROTECTION_PELTOR
     };
 
 };
diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp
index 09a3af73846..b539a848e32 100644
--- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp
@@ -87,24 +87,20 @@ class CfgWeapons {
         ace_reloadlaunchers_enabled = 1;
     };
 
+    #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6;
+    #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5;
+    #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.2;
     class H_HelmetB;
     class rhs_tsh4: H_HelmetB {
-        ace_hearing_protection = 1;
-        ace_hearing_lowerVolume = 0.80;
+        HEARING_PROTECTION_VICCREW
     };
-    class rhs_tsh4_ess: rhs_tsh4 {};
-    class rhs_tsh4_bala: rhs_tsh4 {};
-    class rhs_tsh4_ess_bala: rhs_tsh4 {};
 
     class rhs_zsh7a: H_HelmetB {
-        ace_hearing_protection = 1;
-        ace_hearing_lowerVolume = 0.80;
+        HEARING_PROTECTION_VICCREW
     };
-    class rhs_zsh7a_mike: rhs_zsh7a {};
 
     class rhs_gssh18: H_HelmetB {
-        ace_hearing_protection = 0.5;
-        ace_hearing_lowerVolume = 0.60;
+        HEARING_PROTECTION_EARMUFF
     };
     
     class rhs_weap_d81;
diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp
index 444214d7ec5..7295b259535 100644
--- a/optionals/compat_rhs_usf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp
@@ -212,218 +212,176 @@ class CfgWeapons {
         lockedTargetSound[] = {"",0,1};
     };
 
+
+
+    #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6;
+    #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5;
+    #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.2;
     // Fast Helmets
     class rhsusf_opscore_01;
     class rhsusf_opscore_aor1_pelt: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_aor1_pelt_nsw: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_bk_pelt: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_fg_pelt: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_fg_pelt_nsw: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_fg_pelt_cam: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_paint_pelt: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_paint_pelt_nsw: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_paint_pelt_nsw_cam: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_aor2_pelt: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_aor2_pelt_nsw: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_ut_pelt: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_ut_pelt_cam: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_ut_pelt_nsw_cam: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_mc_pelt: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_mc_pelt_nsw: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_cover;
     class rhsusf_opscore_mc_cover_pelt: rhsusf_opscore_cover {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_mc_cover_pelt_cam: rhsusf_opscore_cover {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_rg_cover_pelt: rhsusf_opscore_cover {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_coy_cover_pelt: rhsusf_opscore_cover {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_mar_01;
     class rhsusf_opscore_mar_ut_pelt: rhsusf_opscore_mar_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_opscore_mar_fg_pelt: rhsusf_opscore_mar_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
 
     // ACH Helmets
     class rhsusf_ach_helmet_ocp;
     class rhsusf_ach_bare_des_headset: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_ach_bare_des_headset_ess: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_ach_bare_headset: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_ach_bare_headset_ess: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_ach_bare_semi_headset: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_ach_bare_semi_headset_ess: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_ach_bare_tan_headset: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_ach_bare_tan_headset_ess: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_ach_bare_wood_headset: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_ach_bare_wood_headset_ess: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_ach_helmet_headset_ocp: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_ach_helmet_headset_ess_ocp: rhsusf_ach_helmet_ocp {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
 
     // ACVC Helmets
     class rhsusf_cvc_helmet: rhsusf_opscore_01 {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_VICCREW
     };
 
     // MICH Helmets
     class rhsusf_mich_bare;
     class rhsusf_mich_bare_alt: rhsusf_mich_bare {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_mich_bare_norotos;
     class rhsusf_mich_bare_norotos_alt: rhsusf_mich_bare_norotos {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_mich_bare_norotos_arc;
     class rhsusf_mich_bare_norotos_arc_alt: rhsusf_mich_bare_norotos_arc {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_mich_bare_semi;
     class rhsusf_mich_bare_alt_semi: rhsusf_mich_bare_semi {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_mich_bare_norotos_semi;
     class rhsusf_mich_bare_norotos_alt_semi: rhsusf_mich_bare_norotos_semi {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_mich_bare_norotos_arc_semi;
     class rhsusf_mich_bare_norotos_arc_alt_semi: rhsusf_mich_bare_norotos_arc_semi {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_mich_bare_tan;
     class rhsusf_mich_bare_alt_tan: rhsusf_mich_bare_tan {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_mich_bare_norotos_tan;
     class rhsusf_mich_bare_norotos_alt_tan: rhsusf_mich_bare_norotos_tan {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
     class rhsusf_mich_bare_norotos_arc_tan;
     class rhsusf_mich_bare_norotos_arc_alt_tan: rhsusf_mich_bare_norotos_arc_tan {
-        ace_hearing_protection = 0.50;
-        ace_hearing_lowerVolume = 0.40;
+        HEARING_PROTECTION_PELTOR
     };
 
 
     class H_PilotHelmetHeli_B;
     class H_CrewHelmetHeli_B;
     class rhsusf_hgu56p: H_PilotHelmetHeli_B {
-        ace_hearing_protection = 0.85;
-        ace_hearing_lowerVolume = 0.75;
+        HEARING_PROTECTION_VICCREW
     };
     class rhsusf_hgu56p_mask: H_CrewHelmetHeli_B {
-        ace_hearing_protection = 0.85;
-        ace_hearing_lowerVolume = 0.75;
+        HEARING_PROTECTION_VICCREW
     };
 
     class H_HelmetB;
     class RHS_jetpilot_usaf: H_HelmetB {
-        ace_hearing_protection = 1;
-        ace_hearing_lowerVolume = 0.80;
+        HEARING_PROTECTION_VICCREW
     };
 };

From cccc929601d1b021913ce6256bd00d5876ad8163 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Sun, 14 May 2017 22:01:56 -0500
Subject: [PATCH 3/3] Tweak peltor vol

---
 addons/hearing/CfgWeapons.hpp             | 2 +-
 optionals/compat_rhs_afrf3/CfgWeapons.hpp | 2 +-
 optionals/compat_rhs_usf3/CfgWeapons.hpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hearing/CfgWeapons.hpp b/addons/hearing/CfgWeapons.hpp
index d21e5584210..8b138271b32 100644
--- a/addons/hearing/CfgWeapons.hpp
+++ b/addons/hearing/CfgWeapons.hpp
@@ -15,7 +15,7 @@ class CfgWeapons {
 
     #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6;
     #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5;
-    #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.2;
+    #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0;
 
     class H_HelmetB;
     class H_HelmetCrew_B: H_HelmetB {
diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp
index b539a848e32..14431a92ae9 100644
--- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp
@@ -89,7 +89,7 @@ class CfgWeapons {
 
     #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6;
     #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5;
-    #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.2;
+    #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0;
     class H_HelmetB;
     class rhs_tsh4: H_HelmetB {
         HEARING_PROTECTION_VICCREW
diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp
index 7295b259535..d67879916b4 100644
--- a/optionals/compat_rhs_usf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp
@@ -216,7 +216,7 @@ class CfgWeapons {
 
     #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6;
     #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5;
-    #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.2;
+    #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0;
     // Fast Helmets
     class rhsusf_opscore_01;
     class rhsusf_opscore_aor1_pelt: rhsusf_opscore_01 {