diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp index 36a4e05cd0..ece6d9c885 100644 --- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp +++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp @@ -231,11 +231,11 @@ class GVAR(actions) { displayName = CSTRING(Actions_CheckPulse); displayNameProgress = CSTRING(Check_Pulse_Content); allowedSelections[] = {"All"}; - treatmentTime = 15; - condition = QUOTE(GVAR(advancedDiagnose) != 0); + treatmentTime = QUOTE([ARR_2(2.5,15)] select GVAR(enableRealisticPulseChecking)); + condition = QUOTE(GVAR(advancedDiagnose) != 0 && {!GVAR(enableRealisticPulseChecking) || {(_medic getSlotItemName TYPE_WATCH) isKindOf [ARR_2('ItemWatch',configFile >> 'CfgWeapons')]}}); callbackSuccess = QFUNC(checkPulse); callbackProgress = QFUNC(checkPulseProgress); - callbackFailure = QUOTE(QQGVAR(checkPulse) cutText [ARR_2('','PLAIN')];); + callbackFailure = QUOTE(QQGVAR(checkPulse) cutText [ARR_2('','PLAIN')]); animationMedicProne = ""; animationMedicSelfProne = ""; }; diff --git a/addons/medical_treatment/functions/fnc_checkPulseProgress.sqf b/addons/medical_treatment/functions/fnc_checkPulseProgress.sqf index e4551c0469..c285d5768f 100644 --- a/addons/medical_treatment/functions/fnc_checkPulseProgress.sqf +++ b/addons/medical_treatment/functions/fnc_checkPulseProgress.sqf @@ -17,6 +17,8 @@ * Public: No */ +if (!GVAR(enableRealisticPulseChecking)) exitWith {true}; + (_this select 0) params ["", "_patient"]; private _display = uiNamespace getVariable [QGVAR(checkPulseDisplay), displayNull]; @@ -33,6 +35,10 @@ if (isNull _display) then { if (CBA_missionTime > _nextPulse) then { _display setVariable [QGVAR(lastPulse), _nextPulse]; }; private _fade = (linearConversion [-0.1, 0, CBA_missionTime - _nextPulse, 0, 0.85, true] max linearConversion [0.35, 0, CBA_missionTime - _lastPulse, 0, 0.75, true]) ^ 2; + if (EGVAR(common,epilepsyFriendlyMode)) then { + _fade = _fade min 0.2; + }; + private _ctrlVignette = _display displayCtrl 5000; _ctrlVignette ctrlSetTextColor [0, 0, 0, _fade]; diff --git a/addons/medical_treatment/initSettings.inc.sqf b/addons/medical_treatment/initSettings.inc.sqf index d080965eb9..4de7b432d8 100644 --- a/addons/medical_treatment/initSettings.inc.sqf +++ b/addons/medical_treatment/initSettings.inc.sqf @@ -16,6 +16,15 @@ true ] call CBA_fnc_addSetting; +[ + QGVAR(enableRealisticPulseChecking), + "CHECKBOX", + [LSTRING(RealisticPulseChecking_DisplayName), LSTRING(RealisticPulseChecking_Description)], + [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)], + true, + true +] call CBA_fnc_addSetting; + [ QGVAR(advancedBandages), "LIST", diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index 383048626a..32aa331335 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -116,6 +116,12 @@ Habilita el manejo de la medicación más avanzada y en profundidad. Tambien permite el uso de Adenosina. 더욱 더 확장된, 깊은 약물 치료를 활성화합니다. 또한 아데노신 기능을 활성화합니다. + + Realistic Pulse Checking + + + Enables realistic pulse checking, which requires a watch. + Advanced Bandages Erweiterte Bandagen