From c8948065b8caecef8ad205dc79109c8b518c1fd6 Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:34:38 +0100 Subject: [PATCH 1/9] Update fnc_checkPulseLocal.sqf --- addons/medical_treatment/functions/fnc_checkPulseLocal.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf b/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf index bb3efedc221..14e2658b0d8 100644 --- a/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf +++ b/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf @@ -37,7 +37,7 @@ private _heartRateOutput = LSTRING(Check_Pulse_Output_5); private _logOutput = LSTRING(Check_Pulse_None); if (_heartRate > 1) then { - if (_medic call FUNC(isMedic)) then { + if (_medic call FUNC(isMedic) || GVAR(advancedPulse) == 1) then { _heartRateOutput = LSTRING(Check_Pulse_Output_1); _logOutput = str round _heartRate; } else { From 5dbfb963bb944c7782a7a4ca2efe5dd0802315b7 Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:37:38 +0100 Subject: [PATCH 2/9] Update initSettings.inc.sqf --- addons/medical_treatment/initSettings.inc.sqf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/medical_treatment/initSettings.inc.sqf b/addons/medical_treatment/initSettings.inc.sqf index 7f0fc06764c..1bd4415675e 100644 --- a/addons/medical_treatment/initSettings.inc.sqf +++ b/addons/medical_treatment/initSettings.inc.sqf @@ -7,6 +7,15 @@ true ] call CBA_fnc_addSetting; +[ + QGVAR(advancedPulse), + "LIST", + [LSTRING(AdvancedPulse_DisplayName), LSTRING(AdvancedPulse_Description)], + [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)], + [[0, 1], [ELSTRING(common,Disabled), ELSTRING(common,Enabled)], 1], + true +] call CBA_fnc_addSetting; + [ QGVAR(advancedMedication), "CHECKBOX", From f3d9d28159e6ee1f98b36df880f2fca18f7aa3d1 Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:39:27 +0100 Subject: [PATCH 3/9] Update stringtable.xml --- addons/medical_treatment/stringtable.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index b0d140d8255..6598a279c2f 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -65,6 +65,12 @@ Habilita la comprobación del pulso, presión sanguinea y rsepuesta a las acciones del tratamiento en lugar de la acción de diagnóstico genérico. \n Cuando se deshabilita, la acción RCP solo se mostrará cuando realizar un RCP sea apropiado. \n Las acciones activadas de este ajuste son necesarias para determinar si una persona está inconsciente o en parada cardiaca. 맥박 확인, 혈압 확인, 반응 확인 등의 일반적인 진료행위를 추가합니다. \n 비활성화시 심폐소생술은 가능 할때만 표시됩니다. \n 해당 옵션은 인원이 기절한건지 아니면 심정지가 왔는지 구분할 때 쓰입니다. + + Advanced Pulse + + + Makes Check Pulse action always give a numerical value + Enabled & Can Diagnose Death/Cardiac Arrest Activé & Diagnostic du décès/de l'arrêt cardiaque From 4c54b9f131196788bea7117fa06f21c4831a0d83 Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:42:07 +0100 Subject: [PATCH 4/9] Change default value --- addons/medical_treatment/initSettings.inc.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/initSettings.inc.sqf b/addons/medical_treatment/initSettings.inc.sqf index 1bd4415675e..985ff966176 100644 --- a/addons/medical_treatment/initSettings.inc.sqf +++ b/addons/medical_treatment/initSettings.inc.sqf @@ -12,7 +12,7 @@ "LIST", [LSTRING(AdvancedPulse_DisplayName), LSTRING(AdvancedPulse_Description)], [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)], - [[0, 1], [ELSTRING(common,Disabled), ELSTRING(common,Enabled)], 1], + [[0, 1], [ELSTRING(common,Disabled), ELSTRING(common,Enabled)], 0], true ] call CBA_fnc_addSetting; From 259b1897cd59bcab76ff89403e5220d6df6c7a21 Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:43:22 +0100 Subject: [PATCH 5/9] Fix typo in stringtable --- addons/medical_treatment/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index 6598a279c2f..b5803c988d6 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -68,7 +68,7 @@ Advanced Pulse - + Makes Check Pulse action always give a numerical value From c1bc49d5f7293f3e9abe8de2b75b5d9589874053 Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Sun, 3 Nov 2024 04:00:59 -0600 Subject: [PATCH 6/9] Implement suggested changes --- .../medical_treatment/functions/fnc_checkPulseLocal.sqf | 2 +- addons/medical_treatment/initSettings.inc.sqf | 6 +++--- addons/medical_treatment/stringtable.xml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf b/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf index 14e2658b0d8..93e56ab04d1 100644 --- a/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf +++ b/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf @@ -37,7 +37,7 @@ private _heartRateOutput = LSTRING(Check_Pulse_Output_5); private _logOutput = LSTRING(Check_Pulse_None); if (_heartRate > 1) then { - if (_medic call FUNC(isMedic) || GVAR(advancedPulse) == 1) then { + if ([_medic,GVAR(numericalPulse)] call FUNC(isMedic)) then { _heartRateOutput = LSTRING(Check_Pulse_Output_1); _logOutput = str round _heartRate; } else { diff --git a/addons/medical_treatment/initSettings.inc.sqf b/addons/medical_treatment/initSettings.inc.sqf index 985ff966176..d4eaf672846 100644 --- a/addons/medical_treatment/initSettings.inc.sqf +++ b/addons/medical_treatment/initSettings.inc.sqf @@ -8,11 +8,11 @@ ] call CBA_fnc_addSetting; [ - QGVAR(advancedPulse), + QGVAR(numericalPulse), "LIST", - [LSTRING(AdvancedPulse_DisplayName), LSTRING(AdvancedPulse_Description)], + [LSTRING(numericalPulse_DisplayName), LSTRING(NumericalPulse_Description)], [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)], - [[0, 1], [ELSTRING(common,Disabled), ELSTRING(common,Enabled)], 0], + [[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 0], true ] call CBA_fnc_addSetting; diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index b5803c988d6..91ae721717b 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -65,11 +65,11 @@ Habilita la comprobación del pulso, presión sanguinea y rsepuesta a las acciones del tratamiento en lugar de la acción de diagnóstico genérico. \n Cuando se deshabilita, la acción RCP solo se mostrará cuando realizar un RCP sea apropiado. \n Las acciones activadas de este ajuste son necesarias para determinar si una persona está inconsciente o en parada cardiaca. 맥박 확인, 혈압 확인, 반응 확인 등의 일반적인 진료행위를 추가합니다. \n 비활성화시 심폐소생술은 가능 할때만 표시됩니다. \n 해당 옵션은 인원이 기절한건지 아니면 심정지가 왔는지 구분할 때 쓰입니다. - - Advanced Pulse + + Numerical Pulse - - Makes Check Pulse action always give a numerical value + + Makes Check Pulse action give a numerical value based on setting Enabled & Can Diagnose Death/Cardiac Arrest From bc9481f98e2c4547f379a0f95ca3a51b3966121b Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Sun, 3 Nov 2024 08:13:14 -0600 Subject: [PATCH 7/9] Update addons/medical_treatment/functions/fnc_checkPulseLocal.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> --- addons/medical_treatment/functions/fnc_checkPulseLocal.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf b/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf index 93e56ab04d1..61bda2d8319 100644 --- a/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf +++ b/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf @@ -37,7 +37,7 @@ private _heartRateOutput = LSTRING(Check_Pulse_Output_5); private _logOutput = LSTRING(Check_Pulse_None); if (_heartRate > 1) then { - if ([_medic,GVAR(numericalPulse)] call FUNC(isMedic)) then { + if ([_medic, GVAR(numericalPulse)] call FUNC(isMedic)) then { _heartRateOutput = LSTRING(Check_Pulse_Output_1); _logOutput = str round _heartRate; } else { From aa9983075ed75183223fad5de381d45248236585 Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Mon, 4 Nov 2024 21:31:18 -0600 Subject: [PATCH 8/9] Update addons/medical_treatment/initSettings.inc.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> --- addons/medical_treatment/initSettings.inc.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/initSettings.inc.sqf b/addons/medical_treatment/initSettings.inc.sqf index d4eaf672846..1e9cb2410c6 100644 --- a/addons/medical_treatment/initSettings.inc.sqf +++ b/addons/medical_treatment/initSettings.inc.sqf @@ -12,7 +12,7 @@ "LIST", [LSTRING(numericalPulse_DisplayName), LSTRING(NumericalPulse_Description)], [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)], - [[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 0], + [[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 1], true ] call CBA_fnc_addSetting; From 47596a780c64de697366c463c6d3c51bab9b31c1 Mon Sep 17 00:00:00 2001 From: Will/KJW <100206101+SpicyBagpipes@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:07:07 -0600 Subject: [PATCH 9/9] Update addons/medical_treatment/initSettings.inc.sqf Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> --- addons/medical_treatment/initSettings.inc.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/initSettings.inc.sqf b/addons/medical_treatment/initSettings.inc.sqf index 1e9cb2410c6..01082afc36f 100644 --- a/addons/medical_treatment/initSettings.inc.sqf +++ b/addons/medical_treatment/initSettings.inc.sqf @@ -11,7 +11,7 @@ QGVAR(numericalPulse), "LIST", [LSTRING(numericalPulse_DisplayName), LSTRING(NumericalPulse_Description)], - [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)], + LSTRING(Category), [[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 1], true ] call CBA_fnc_addSetting;