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 - Allow diagnosing death/CA (invalidates old setting) #8162

Merged
merged 3 commits into from
Sep 3, 2021
Merged

Medical Treatment - Allow diagnosing death/CA (invalidates old setting) #8162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8014385
Medical Treatment - Allow diagnosing death/CA
PabstMirror Mar 12, 2021
f1126a8
Update addons/medical_treatment/stringtable.xml
PabstMirror Apr 22, 2021
ebf7592
Update addons/medical_treatment/stringtable.xml
PabstMirror Apr 22, 2021
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
4 changes: 2 additions & 2 deletions addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ class GVAR(actions) {
medicRequired = 0;
treatmentTime = 2.5;
items[] = {};
condition = QUOTE(!GVAR(advancedDiagnose));
condition = QUOTE(GVAR(advancedDiagnose) == 0);
callbackSuccess = QFUNC(diagnose);
callbackFailure = "";
callbackProgress = "";
Expand All @@ -216,7 +216,7 @@ class GVAR(actions) {
displayName = CSTRING(Actions_CheckPulse);
displayNameProgress = CSTRING(Check_Pulse_Content);
allowedSelections[] = {"All"};
condition = QGVAR(advancedDiagnose);
condition = QUOTE(GVAR(advancedDiagnose) != 0);
callbackSuccess = QFUNC(checkPulse);
animationMedicProne = "";
animationMedicSelfProne = "";
Expand Down
2 changes: 1 addition & 1 deletion addons/medical_treatment/functions/fnc_canCPR.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
params ["", "_patient"];

!(_patient call EFUNC(common,isAwake))
&& {GVAR(advancedDiagnose) || {IN_CRDC_ARRST(_patient)}} // if basic diagnose, then only show action if appropriate (they can't tell difference between uncon/ca)
&& {(GVAR(advancedDiagnose) != 0) || {IN_CRDC_ARRST(_patient)}} // if basic diagnose, then only show action if appropriate (they can't tell difference between uncon/ca)
&& {isNull (_patient getVariable [QEGVAR(medical,CPR_provider), objNull])}
10 changes: 9 additions & 1 deletion addons/medical_treatment/functions/fnc_checkResponse.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,15 @@

params ["_medic", "_patient"];

private _output = [LSTRING(Check_Response_Unresponsive), LSTRING(Check_Response_Responsive)] select (_patient call EFUNC(common,isAwake));

private _output = if (_patient call EFUNC(common,isAwake)) then {
LSTRING(Check_Response_Responsive)
} else {
if ((GVAR(advancedDiagnose) == 2) && {IN_CRDC_ARRST(_patient)}) exitWith { LSTRING(Check_Response_CardiacArrest) };
if ((GVAR(advancedDiagnose) == 2) && {!alive _patient}) exitWith { LSTRING(Check_Response_Dead) };
LSTRING(Check_Response_Unresponsive)
};

[[_output, _patient call EFUNC(common,getName)], 2] call EFUNC(common,displayTextStructured);

[_patient, "quick_view", _output, [[_patient, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);
2 changes: 1 addition & 1 deletion addons/medical_treatment/functions/fnc_cprProgress.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ _args params ["_medic", "_patient"];
// Cancel CPR if patient wakes up

!(_patient call EFUNC(common,isAwake))
&& {(GVAR(advancedDiagnose)) || {IN_CRDC_ARRST(_patient)}} // if basic diagnose, then only show action if appropriate (they can't tell difference between uncon/ca)
&& {(GVAR(advancedDiagnose) != 0) || {IN_CRDC_ARRST(_patient)}} // if basic diagnose, then only show action if appropriate (they can't tell difference between uncon/ca)
&& {_medic == (_patient getVariable [QEGVAR(medical,CPR_provider), objNull])}
4 changes: 2 additions & 2 deletions addons/medical_treatment/initSettings.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[
QGVAR(advancedDiagnose),
"CHECKBOX",
"LIST",
[LSTRING(AdvancedDiagnose_DisplayName), LSTRING(AdvancedDiagnose_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
true,
[[0, 1, 2], [ELSTRING(common,Disabled), ELSTRING(common,Enabled), LSTRING(AdvancedDiagnose_DiagnoseCardiacArrest)], 1],
true
] call CBA_fnc_addSetting;

Expand Down
9 changes: 9 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 @@ -57,6 +57,9 @@
<Turkish>Genel Teşhis eylemi yerine Nabzı Kontrol Et, Kan Basıncını Kontrol Et ve Yanıtı Kontrol Et tedavi eylemlerini etkinleştirir. \ Devre dışı bırakıldığında, CPR eylemi yalnızca CPR gerçekleştirilmesi uygun olduğunda gösterilecektir.</Turkish>
<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>
</Key>
<Key ID="STR_ACE_Medical_Treatment_AdvancedDiagnose_DiagnoseCardiacArrest">
<English>Enabled &amp; Can Diagnose Death/Cardiac Arrest</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_AdvancedMedication_DisplayName">
<English>Advanced Medication</English>
<German>Erweiterte Medikation</German>
Expand Down Expand Up @@ -3699,6 +3702,12 @@
<Chinese>%1 沒有反應</Chinese>
<Turkish>%1 tepki vermiyor</Turkish>
</Key>
<Key ID="STR_ACE_Medical_Treatment_Check_Response_CardiacArrest">
<English>%1 is not responsive, taking shallow gasps and convulsing</English>
Copy link
Contributor

@JoramD0 JoramD0 Apr 23, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gasping is fairly common in early cardiac arrest, not sure if convulsing is. I am basing this on civilian first aid training (that I luckily have not had to use yet), not military experience.

(This was not meant as a review...)

</Key>
<Key ID="STR_ACE_Medical_Treatment_Check_Response_Dead">
<English>%1 is not responsive, motionless and cold</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_Check_Response_You_Checked">
<English>You checked %1</English>
<Russian>Вы осмотрели раненого %1</Russian>
Expand Down
4 changes: 2 additions & 2 deletions docs/wiki/feature/medical-system.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ force ace_medical_fractures = 0; // Disabled Fractures
force ace_medical_limping = 0; // Disabled Limping
force ace_medical_statemachine_fatalInjuriesPlayer = 2; // Disabled fatal injuries by damage to head or torso
force ace_medical_treatment_advancedBandages = 0; // Disabled advanced bandages
force ace_medical_treatment_advancedDiagnose = false; // Disabled advanced diagnose
force ace_medical_treatment_advancedDiagnose = 0; // Disabled advanced diagnose
force ace_medical_treatment_advancedMedication = false; // Disabled advanced medication
```

Expand All @@ -224,7 +224,7 @@ force ace_medical_spontaneousWakeUpChance = 0.15; // 15% chance of waking up fro
force ace_medical_spontaneousWakeUpEpinephrineBoost = 1; // Epinephrine boosts wake up chance
force ace_medical_statemachine_fatalInjuriesPlayer = 1; // Fatal injuries only occur in Cardiac Arrest
force ace_medical_treatment_advancedBandages = 2; // Wounds can re-open until stitched.
force ace_medical_treatment_advancedDiagnose = true; // Enabled Advanced Diagnosis
force ace_medical_treatment_advancedDiagnose = 1; // Enabled Advanced Diagnosis
force ace_medical_treatment_advancedMedication = true; // Enabled Advanced Medication
force ace_medical_treatment_allowSelfIV = 1; // Medics can Self-IV
force ace_medical_treatment_allowSelfPAK = 1; // Medics can Self-PAK
Expand Down