From 78f0262e10ad78923d7d899a6e5e34b00bd85747 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Mon, 29 Aug 2022 02:27:10 +0200 Subject: [PATCH] Fire - Increase effectiveness of rolling for putting out fire (#9016) * Increase effectiveness of rolling for putting out fire * Use same value for rolling and pat down --- addons/fire/functions/fnc_burn.sqf | 4 ++-- addons/fire/functions/fnc_medical_success.sqf | 2 +- addons/fire/script_component.hpp | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/fire/functions/fnc_burn.sqf b/addons/fire/functions/fnc_burn.sqf index 5174125df8..15f38435ab 100644 --- a/addons/fire/functions/fnc_burn.sqf +++ b/addons/fire/functions/fnc_burn.sqf @@ -223,8 +223,8 @@ if (_isBurning) exitWith {}; }; } else { if ((animationState _unit) in PRONE_ROLLING_ANIMS) then { - // decrease intensity of burn, but if its too high this wont do anything substantial - _intensity = _intensity - (1 / _intensity); + // decrease intensity of burn + _intensity = _intensity * INTENSITY_DECREASE_MULT_ROLLING; }; }; diff --git a/addons/fire/functions/fnc_medical_success.sqf b/addons/fire/functions/fnc_medical_success.sqf index 07337b2833..a47d4eb4f0 100644 --- a/addons/fire/functions/fnc_medical_success.sqf +++ b/addons/fire/functions/fnc_medical_success.sqf @@ -19,5 +19,5 @@ params ["_medic", "_patient"]; private _intensity = _patient getVariable [QGVAR(intensity), 0]; -_intensity = _intensity * (4/5); +_intensity = _intensity * INTENSITY_DECREASE_MULT_PAT_DOWN; _patient setVariable [QGVAR(intensity), _intensity, true]; diff --git a/addons/fire/script_component.hpp b/addons/fire/script_component.hpp index 289e3d13f1..1bf14ca083 100644 --- a/addons/fire/script_component.hpp +++ b/addons/fire/script_component.hpp @@ -30,3 +30,6 @@ "amovppnemstpsoptwbindnon_amovppnemevasoptwbindl",\ "amovppnemstpsoptwbindnon_amovppnemevasoptwbindr"\ ] + +#define INTENSITY_DECREASE_MULT_PAT_DOWN 0.8 +#define INTENSITY_DECREASE_MULT_ROLLING INTENSITY_DECREASE_MULT_PAT_DOWN