Merge remote-tracking branch 'origin/master' into pr/DartRuffian/10366

acemod · Oct 14, 2024 · 6fc8a78 · 6fc8a78
2 parents 4f96bf9 + 92a997d
commit 6fc8a78
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/addons/hearing/functions/fnc_explosion.sqf b/addons/hearing/functions/fnc_explosion.sqf
@@ -48,8 +48,8 @@ if (_distance > _maxDistance) exitWith {
     TRACE_2("too far away",_distance,_maxDistance);
 };
 
-private _strength = _vehAttenuation * _explosive * _volume * _maxDistance / _distance^2;
-
+// Tone down _maxDistance to bring strength back to similar levels as a large burst of a loud weapon
+private _strength = _vehAttenuation * _explosive * _volume * (_maxDistance / 2) / _distance^2;
 TRACE_6("strength",_vehAttenuation,_explosive,_volume,_maxDistance,_distance,_strength);
 
 // Call immediately, as it will get picked up later by the update thread anyway

diff --git a/addons/hitreactions/functions/fnc_fallDown.sqf b/addons/hitreactions/functions/fnc_fallDown.sqf
@@ -20,7 +20,7 @@
 params ["_unit", "_firer", "_damage"];
 
 // exit if system is disabled
-if (GVAR(minDamageToTrigger) == -1) exitWith {};
+if (GVAR(minDamageToTrigger) < -0.5) exitWith {};
 
 // exit if damage is disabled on unit
 if !(isDamageAllowed _unit && {_unit getVariable [QEGVAR(medical,allowDamage), true]}) exitWith {};

diff --git a/addons/hitreactions/initSettings.inc.sqf b/addons/hitreactions/initSettings.inc.sqf
@@ -3,7 +3,7 @@ private _category = [LELSTRING(common,categoryUncategorized), QUOTE(COMPONENT_BE
 [
     QGVAR(minDamageToTrigger),
     "SLIDER",
-    LSTRING(minDamageToTrigger_displayName),
+    [LSTRING(minDamageToTrigger_displayName), LSTRING(minDamageToTrigger_Description)],
     _category,
     [-1, 1, 0.1, 1],
     1

diff --git a/addons/hitreactions/stringtable.xml b/addons/hitreactions/stringtable.xml
@@ -17,6 +17,9 @@
             <Turkish>Düşmeyi tetikleyen min hasar</Turkish>
             <Spanish>Daño mínimo para provocar la caída</Spanish>
         </Key>
+        <Key ID="STR_ACE_HitReactions_minDamageToTrigger_Description">
+            <English>If a unit takes more damage than this setting's value whilst moving on foot, they will fall over.\nIf set to -1 the mechanic is turned off.</English>
+        </Key>
         <Key ID="STR_ACE_HitReactions_weaponDropChanceArmHitPlayer_displayName">
             <English>Player Weapon Drop Chance (Arm Hit)</English>
             <Japanese>プレイヤーが武器を落とす確率 (腕部への被弾)</Japanese>