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 variable CPR chance based on blood volume (invalidates old setting) #7983

Merged
merged 5 commits into from
Jul 23, 2021
Merged

Medical Treatment - Allow variable CPR chance based on blood volume (invalidates old setting) #7983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
efb0960
CPR chance interpolated based on blood volume
pterolatypus Nov 3, 2020
31c34b0
Tweaked interpolation limits
pterolatypus Dec 24, 2020
796beaa
Adjusted interpolation, simplified settings tooltips
pterolatypus Jan 12, 2021
99a8c0e
Removed old strings
pterolatypus Apr 24, 2021
e99dcdc
More detailed settings tooltips
pterolatypus May 6, 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
8 changes: 5 additions & 3 deletions addons/medical_treatment/functions/fnc_cprLocal.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ TRACE_2("cprLocal",_medic,_patient);

[_patient, "activity", LSTRING(Activity_CPR), [[_medic, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);

if ((random 1) < GVAR(cprSuccessChance)) then {
TRACE_1("CPR random success",GVAR(cprSuccessChance));
private _bloodVolume = GET_BLOOD_VOLUME(_patient);
private _successChance = linearConversion [BLOOD_VOLUME_CLASS_4_HEMORRHAGE, BLOOD_VOLUME_CLASS_2_HEMORRHAGE, _bloodVolume, GVAR(cprSuccessChanceMin), GVAR(cprSuccessChanceMax), true];
if ((random 1) < _successChance) then {
TRACE_2("CPR random success",_bloodVolume,_successChance);
[QEGVAR(medical,CPRSucceeded), _patient] call CBA_fnc_localEvent;
} else {
TRACE_1("CPR random fail",GVAR(cprSuccessChance));
TRACE_2("CPR random fail",_bloodVolume,_successChance);
};

13 changes: 11 additions & 2 deletions addons/medical_treatment/initSettings.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,18 @@
] call CBA_fnc_addSetting;

[
QGVAR(cprSuccessChance),
QGVAR(cprSuccessChanceMin),
"SLIDER",
[LSTRING(CPRSuccessChance_DisplayName), LSTRING(CPRSuccessChance_Description)],
[LSTRING(CPRSuccessChanceMin_DisplayName), LSTRING(CPRSuccessChanceMin_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0, 1, 0.4, 2, true],
true
] call CBA_settings_fnc_init;

[
QGVAR(cprSuccessChanceMax),
"SLIDER",
[LSTRING(CPRSuccessChanceMax_DisplayName), LSTRING(CPRSuccessChanceMax_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0, 1, 0.4, 2, true],
true
Expand Down
38 changes: 11 additions & 27 deletions addons/medical_treatment/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,33 +912,17 @@
<Turkish>Araçlar ve Tesisler</Turkish>
<Spanish>Vehículos e instalaciones médicas</Spanish>
</Key>
<Key ID="STR_ACE_Medical_Treatment_CPRSuccessChance_DisplayName">
<English>CPR Success Chance</English>
<Japanese>心肺蘇生の成功率</Japanese>
<French>Chance de réussite de la RCP</French>
<Russian>Шанс успешной реанимации</Russian>
<Portuguese>Chance de ter sucesso com SBV</Portuguese>
<Chinese>心肺復甦術成功率</Chinese>
<Czech>Pravděpodobnost úspěchu CPR</Czech>
<Italian>Possibilità di successo della RCP</Italian>
<Polish>Szansa powodzenia RKO</Polish>
<German>HLW Erfolgsrate</German>
<Turkish>CPR Başarı Şansı</Turkish>
<Spanish>Probabilidad de éxito del RCP</Spanish>
</Key>
<Key ID="STR_ACE_Medical_Treatment_CPRSuccessChance_Description">
<English>Probability that CPR will be successful in restoring heart rhythm.</English>
<Japanese>心肺蘇生によって心拍を戻せる確率を決定できます。</Japanese>
<French>Probabilité de rétablir un rythme cardiaque suite à une RCP.</French>
<Russian>Вероятность успешного проведения сердечно-лёгочной реанимации (СЛР).</Russian>
<Portuguese>Probabilidade que um SBV restaurará o batimento cardíaco.</Portuguese>
<Chinese>心肺復甦術恢復心率的機率。</Chinese>
<Czech>Pravděpodobnost, že CPR obnoví srdeční tep.</Czech>
<Italian>E' probabile che la rianimazione RCP abbia successo nel ripristinare il ritmo cardiaco.</Italian>
<Polish>Prawdopodobieństwo przwyrócenia akcji serca poprzez wykonanie RKO</Polish>
<German>Wahrscheinlichkeit, dass HLW bei der Wiederherstellung des Herzrhythmus erfolgreich sein wird.</German>
<Turkish>Kalp ritmini geri kazanmada CPR'nin başarılı olma olasılığı.</Turkish>
<Spanish>Probabilidad de que el RCP sea exitoso restaurando el ritmo cardíaco.</Spanish>
<Key ID="STR_ACE_Medical_Treatment_CPRSuccessChanceMin_DisplayName">
<English>CPR Success Chance Minimum</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_CPRSuccessChanceMax_DisplayName">
<English>CPR Success Chance Maximum</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_CPRSuccessChanceMin_Description">
<English>Minimum probability that performing CPR will restore heart rhythm.\nThis minimum value is used when the patient has at least "Lost a fatal amount of blood".\nAn interpolated probability is used when the patient's blood volume is between the minimum and maximum thresholds.</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_CPRSuccessChanceMax_Description">
<English>Maximum probability that performing CPR will restore heart rhythm.\nThis maximum value is used when the patient has at most "Lost some blood".\nAn interpolated probability is used when the patient's blood volume is between the minimum and maximum thresholds.</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeCPR_DisplayName">
<English>CPR Treatment Time</English>
Expand Down