diff --git a/addons/misc/XEH_postInit.sqf b/addons/misc/XEH_postInit.sqf index 9440bac59..a5e4b932f 100644 --- a/addons/misc/XEH_postInit.sqf +++ b/addons/misc/XEH_postInit.sqf @@ -58,7 +58,9 @@ call FUNC(FAK_updateContents); ["baseline", { private _activeTourniquets = GET_TOURNIQUETS(ACE_player); - ((_activeTourniquets select 2) + (_activeTourniquets select 3) min 1); + if (GVAR(tourniquetEffects_Enable)) then { + ((_activeTourniquets select 2) + (_activeTourniquets select 3) min 1) + } else {0}; }, QUOTE(ADDON)] call ACEFUNC(common,addSwayFactor); ["multiplier", { diff --git a/addons/misc/XEH_preInit.sqf b/addons/misc/XEH_preInit.sqf index 4e0737774..737aa832c 100644 --- a/addons/misc/XEH_preInit.sqf +++ b/addons/misc/XEH_preInit.sqf @@ -32,7 +32,7 @@ PREP_RECOMPILE_END; QGVAR(treatmentTimeDetachTourniquet), "SLIDER", [LLSTRING(SETTING_treatmentTimeDetachTourniquet)], - [CBA_SETTINGS_CAT, ELSTRING(GUI,SubCategory_Basic)], + [CBA_SETTINGS_CAT, LSTRING(SubCategory_Tourniquet)], [1, 60, 7, 1], true ] call CBA_Settings_fnc_init; @@ -41,11 +41,38 @@ PREP_RECOMPILE_END; QGVAR(neckTourniquet), "CHECKBOX", [LLSTRING(neckTourniquetDescription)], - [CBA_SETTINGS_CAT, ELSTRING(GUI,SubCategory_Basic)], + [CBA_SETTINGS_CAT, LSTRING(SubCategory_Tourniquet)], [false], true ] call CBA_Settings_fnc_init; +[ + QGVAR(tourniquetEffects_Enable), + "CHECKBOX", + [LLSTRING(SETTING_tourniquetEffects_Enable)], + [CBA_SETTINGS_CAT, LSTRING(SubCategory_Tourniquet)], + [true], + true +] call CBA_Settings_fnc_init; + +[ + QGVAR(tourniquetEffects_PositiveMultiplier), + "SLIDER", + [LLSTRING(SETTING_tourniquetEffects_PositiveMultiplier)], + [CBA_SETTINGS_CAT, LSTRING(SubCategory_Tourniquet)], + [0.1, 10, 1, 1], + true +] call CBA_Settings_fnc_init; + +[ + QGVAR(tourniquetEffects_NegativeMultiplier), + "SLIDER", + [LLSTRING(SETTING_tourniquetEffects_NegativeMultiplier)], + [CBA_SETTINGS_CAT, LSTRING(SubCategory_Tourniquet)], + [0.1, 10, 1, 1], + true +] call CBA_Settings_fnc_init; + //Incompatibility Warning with other addons [ diff --git a/addons/misc/functions/fnc_handleTourniquetEffects.sqf b/addons/misc/functions/fnc_handleTourniquetEffects.sqf index 40bd7b55c..01f9f3316 100644 --- a/addons/misc/functions/fnc_handleTourniquetEffects.sqf +++ b/addons/misc/functions/fnc_handleTourniquetEffects.sqf @@ -17,7 +17,7 @@ params ["_unit"]; -if (_unit getVariable [QGVAR(Tourniquet_PFH), -1] != -1) exitWith {}; +if (_unit getVariable [QGVAR(Tourniquet_PFH), -1] != -1 || !(GVAR(tourniquetEffects_Enable))) exitWith {}; _unit setVariable [QGVAR(Tourniquet_LegNecrosis_Threshold), 0, true]; private _handleLegEffects = { @@ -41,13 +41,12 @@ private _tourniquetPFH = [{ private _legTourniquets = (_activeTourniquets select 4) + (_activeTourniquets select 5); if (_armTourniquets > 1) then { - _tourniquet_ArmNecrosis = _tourniquet_ArmNecrosis + 1.6; //0.15 - + _tourniquet_ArmNecrosis = _tourniquet_ArmNecrosis + (0.16 * GVAR(tourniquetEffects_PositiveMultiplier)); if (_tourniquet_ArmNecrosis >= 100) then { _tourniquet_ArmNecrosis = 100; }; } else { - _tourniquet_ArmNecrosis = _tourniquet_ArmNecrosis - 3.2; //0.30 + _tourniquet_ArmNecrosis = _tourniquet_ArmNecrosis - (0.32 * GVAR(tourniquetEffects_NegativeMultiplier)); if (_tourniquet_ArmNecrosis <= 0) then { _tourniquet_ArmNecrosis = 0; @@ -55,13 +54,13 @@ private _tourniquetPFH = [{ }; if (_legTourniquets > 1) then { - _tourniquet_LegNecrosis = _tourniquet_LegNecrosis + 1.6; + _tourniquet_LegNecrosis = _tourniquet_LegNecrosis + (0.16 * GVAR(tourniquetEffects_PositiveMultiplier)); if (_tourniquet_LegNecrosis >= 100) then { _tourniquet_LegNecrosis = 100; }; } else { - _tourniquet_LegNecrosis = _tourniquet_LegNecrosis - 3.2; + _tourniquet_LegNecrosis = _tourniquet_LegNecrosis - (0.32 * GVAR(tourniquetEffects_NegativeMultiplier)); if (_tourniquet_LegNecrosis <= 0) then { _tourniquet_LegNecrosis = 0; diff --git a/addons/misc/stringtable.xml b/addons/misc/stringtable.xml index d3d026be2..fa4c1ebb3 100644 --- a/addons/misc/stringtable.xml +++ b/addons/misc/stringtable.xml @@ -357,6 +357,18 @@ [ADVERTENCIA DE KAM] Addon(s) incompatibles que podrían afectar negativamente el funcionamiento del mod fueron detectados. El equipo de desarollo de KAT - Advanced Medical REWRITE recomienda fuertemente remover estos addons. %1 [AVISO DO KAM] Detectados addons incompatíveis que podem afetar negativamente a funcionalidade correta. KAT - A equipe de desenvolvimento do Advanced Medical REWRITE recomenda fortemente a remoção destes complementos: %1 + + Tourniquet Settings + + + Enable tourniquet effects + + + Tourniquet effects positive multiplier + + + Tourniquet effects negative multiplier + Time to take off tourniquet Tiempo para retirar un torniquete