Hearing - Tweak EHP effects, add 🦆ing setting (#10686)

Tweak EHP effects, add setting
acemod · Jan 28, 2025 · 9010fe5 · 9010fe5
1 parent c702a18
commit 9010fe5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/addons/hearing/functions/fnc_earRinging.sqf b/addons/hearing/functions/fnc_earRinging.sqf
@@ -26,6 +26,7 @@ TRACE_2("adding",_strength * GVAR(damageCoefficent),GVAR(deafnessDV));
 // Handle volume reduction by electronic hearing protection
 if (
     _strength >= EHP_MIN_STRENGTH
+    && GVAR(enableNoiseDucking)
     && {ACE_player getVariable ["ACE_hasEHP", false] || {ACE_player getVariable ["ACE_hasBuiltInEHP", false]}}
 ) then {
     if (GVAR(ehpTimeout) == -1) then {

diff --git a/addons/hearing/functions/fnc_removeEHP.sqf b/addons/hearing/functions/fnc_removeEHP.sqf
@@ -25,7 +25,7 @@ if !([_unit, "ACE_EHP"] call CBA_fnc_canAddItem) exitWith {
     [LELSTRING(common,Inventory_Full)] call EFUNC(common,displayTextStructured);
 };
 
-// Plugs already in and removing them.
+// EHP already in and removing them.
 _unit addItem "ACE_EHP";
 
 _unit setVariable ["ACE_hasEHP", false, true];

diff --git a/addons/hearing/initSettings.inc.sqf b/addons/hearing/initSettings.inc.sqf
@@ -63,3 +63,11 @@ private _category = format ["ACE %1", LLSTRING(Module_DisplayName)];
     [[0, 1, 2], [ELSTRING(common,Disabled), LSTRING(heavyWeaponUnits), ELSTRING(common,Enabled)], 1],
     1
 ] call CBA_fnc_addSetting;
+
+[
+    QGVAR(enableNoiseDucking),
+    "CHECKBOX",
+    [LSTRING(EnableNoiseDucking_DisplayName), LSTRING(EnableNoiseDucking_Description)],
+    _category,
+    true
+] call CBA_fnc_addSetting;
diff --git a/addons/hearing/script_component.hpp b/addons/hearing/script_component.hpp
@@ -20,10 +20,10 @@
 #define UPDATE_HEARING -1
 
 // Electronic hearing protection FX
-#define EHP_REDUCTION 0.125
+#define EHP_REDUCTION 0.3
 #define EHP_MIN_STRENGTH 0.07
-#define EHP_TIMEOUT 0.7
-#define EHP_FADE_IN 0.1
+#define EHP_TIMEOUT 0.6
+#define EHP_FADE_IN 0.25
 
 // Vehicle explosion hearing damage
 #define VEHICLE_EXPLOSION_STRENGTH 200

diff --git a/addons/hearing/stringtable.xml b/addons/hearing/stringtable.xml
@@ -487,5 +487,13 @@
             <Chinese>昏迷時音量</Chinese>
             <Chinesesimp>无意识时音量</Chinesesimp>
         </Key>
+        <Key ID="STR_ACE_Hearing_EnableNoiseDucking_Description">
+            <English>Reduces volume of impulse noises like shots and explosions when wearing electronic hearing protection</English>
+            <German>Blendet Impulsgeräusche wie Schüsse oder Explosionen beim Tragen von elektronischem Gehörschutz aus</German>
+        </Key>
+        <Key ID="STR_ACE_Hearing_EnableNoiseDucking_DisplayName">
+            <English>Enable Noise Ducking Effect</English>
+            <German>Aktiviere Geräuschunterdrückungseffekt</German>
+        </Key>
     </Package>
 </Project>