From ee2d6bd7b9b9b13d0b05269fcf160dc242d67e67 Mon Sep 17 00:00:00 2001 From: Grim <69561145+LinkIsGrim@users.noreply.github.com> Date: Mon, 14 Oct 2024 18:45:44 -0300 Subject: [PATCH 1/2] Hearing - Tone down strength of explosion hearing damage (#10409) * use sqrt of _maxDistance * divide maxDistance by 2 instead --- addons/hearing/functions/fnc_explosion.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hearing/functions/fnc_explosion.sqf b/addons/hearing/functions/fnc_explosion.sqf index 70ebfb47c37..2d3d5929895 100644 --- 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 From 92a997ded1de13b15d6a1ac44d950b091e5fc5dd Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Mon, 14 Oct 2024 23:52:21 +0200 Subject: [PATCH 2/2] Hit reactions - Improve fall down setting description (#10400) Co-authored-by: PabstMirror --- addons/hitreactions/functions/fnc_fallDown.sqf | 2 +- addons/hitreactions/initSettings.inc.sqf | 2 +- addons/hitreactions/stringtable.xml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/hitreactions/functions/fnc_fallDown.sqf b/addons/hitreactions/functions/fnc_fallDown.sqf index 38f3152c7cd..3ab2bdbedda 100644 --- 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 index 820f6647670..457aa83e2aa 100644 --- 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 index 7d335532909..5fc5ac67d51 100644 --- a/addons/hitreactions/stringtable.xml +++ b/addons/hitreactions/stringtable.xml @@ -17,6 +17,9 @@ Düşmeyi tetikleyen min hasar Daño mínimo para provocar la caída + + 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. + Player Weapon Drop Chance (Arm Hit) プレイヤーが武器を落とす確率 (腕部への被弾)