Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Medical Treatment - Add Numerical Pulse setting #10452

Merged
merged 9 commits into from
Nov 6, 2024
Merged

Medical Treatment - Add Numerical Pulse setting #10452

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c894806
Update fnc_checkPulseLocal.sqf
SpicyBagpipes Oct 25, 2024
5dbfb96
Update initSettings.inc.sqf
SpicyBagpipes Oct 25, 2024
f3d9d28
Update stringtable.xml
SpicyBagpipes Oct 25, 2024
4c54b9f
Change default value
SpicyBagpipes Oct 25, 2024
259b189
Fix typo in stringtable
SpicyBagpipes Oct 25, 2024
c1bc49d
Implement suggested changes
SpicyBagpipes Nov 3, 2024
bc9481f
Update addons/medical_treatment/functions/fnc_checkPulseLocal.sqf
SpicyBagpipes Nov 3, 2024
aa99830
Update addons/medical_treatment/initSettings.inc.sqf
SpicyBagpipes Nov 5, 2024
47596a7
Update addons/medical_treatment/initSettings.inc.sqf
SpicyBagpipes Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/medical_treatment/functions/fnc_checkPulseLocal.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,GVAR(numericalPulse)] call FUNC(isMedic)) then {
SpicyBagpipes marked this conversation as resolved.
Show resolved Hide resolved
_heartRateOutput = LSTRING(Check_Pulse_Output_1);
_logOutput = str round _heartRate;
} else {
Expand Down
9 changes: 9 additions & 0 deletions addons/medical_treatment/initSettings.inc.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
true
] call CBA_fnc_addSetting;

[
QGVAR(numericalPulse),
"LIST",
[LSTRING(numericalPulse_DisplayName), LSTRING(NumericalPulse_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
SpicyBagpipes marked this conversation as resolved.
Show resolved Hide resolved
[[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 0],
SpicyBagpipes marked this conversation as resolved.
Show resolved Hide resolved
true
] call CBA_fnc_addSetting;

[
QGVAR(advancedMedication),
"CHECKBOX",
Expand Down
6 changes: 6 additions & 0 deletions addons/medical_treatment/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@
<Spanish>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.</Spanish>
<Korean>맥박 확인, 혈압 확인, 반응 확인 등의 일반적인 진료행위를 추가합니다. \n 비활성화시 심폐소생술은 가능 할때만 표시됩니다. \n 해당 옵션은 인원이 기절한건지 아니면 심정지가 왔는지 구분할 때 쓰입니다.</Korean>
</Key>
<Key ID="STR_ACE_Medical_Treatment_NumericalPulse_DisplayName">
<English>Numerical Pulse</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_NumericalPulse_Description">
<English>Makes Check Pulse action give a numerical value based on setting</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_AdvancedDiagnose_DiagnoseCardiacArrest">
<English>Enabled &amp; Can Diagnose Death/Cardiac Arrest</English>
<French>Activé &amp; Diagnostic du décès/de l'arrêt cardiaque</French>
Expand Down