Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Medical Treatment - Settings cleanup (#7973)

Browse Source
This commit is contained in:
mharis001 2020-10-31 00:40:10 -04:00 committed by GitHub
parent 2ca13fc022
commit 171fbf1e9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 115 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
View File

@ -117,7 +117,7 @@ class GVAR(actions) {
category = "medication";
items[] = {"ACE_morphine"};
condition = "";
treatmentTime = QGVAR(treatmentTimeSyringe);
treatmentTime = QGVAR(treatmentTimeAutoinjector);
callbackSuccess = QFUNC(medication);
animationMedic = "AinvPknlMstpSnonWnonDnon_medic1";
sounds[] = {{QPATHTO_R(sounds\Inject.ogg),1,1,50}};

2
addons/medical_treatment/functions/fnc_getStitchTime.sqf
View File

@ -18,4 +18,4 @@
params ["", "_patient"];
count (_patient call FUNC(getStitchableWounds)) * GVAR(treatmentTimeStich)
count (_patient call FUNC(getStitchableWounds)) * GVAR(woundStitchTime)

2
addons/medical_treatment/functions/fnc_surgicalKitProgress.sqf
View File

@ -28,7 +28,7 @@ private _stitchableWounds = _patient call FUNC(getStitchableWounds);
if (_stitchableWounds isEqualTo []) exitWith {false};
// Not enough time has elapsed to stitch a wound
if (_totalTime - _elapsedTime > (count _stitchableWounds - 1) * GVAR(treatmentTimeStich)) exitWith {true};
if (_totalTime - _elapsedTime > (count _stitchableWounds - 1) * GVAR(woundStitchTime)) exitWith {true};
private _bandagedWounds = GET_BANDAGED_WOUNDS(_patient);
private _stitchedWounds = GET_STITCHED_WOUNDS(_patient);

109
addons/medical_treatment/initSettings.sqf
View File

@ -34,52 +34,6 @@
true
] call CBA_settings_fnc_init;
[
QGVAR(treatmentTimeTourniquet),
"SLIDER",
[LSTRING(TreatmentTimeTourniquet_DisplayName), LSTRING(TreatmentTimeTourniquet_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0.1, 30, 7, 2],
true
] call CBA_settings_fnc_init;
[
QGVAR(treatmentTimeSplint),
"SLIDER",
[LSTRING(TreatmentTimeSplint_DisplayName), LSTRING(TreatmentTimeSplint_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0.1, 30, 7, 2],
true
] call CBA_settings_fnc_init;
[
QGVAR(treatmentTimeIV),
"SLIDER",
[LSTRING(TreatmentTimeIV_DisplayName), LSTRING(TreatmentTimeIV_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0.1, 36, 12, 2],
true
] call CBA_settings_fnc_init;
[
QGVAR(treatmentTimeSyringe),
"SLIDER",
[LSTRING(TreatmentTimeSyringe_DisplayName), LSTRING(TreatmentTimeSyringe_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0.1, 30, 5, 2],
true
] call CBA_settings_fnc_init;
[
QGVAR(treatmentTimeBodyBag),
"SLIDER",
[LSTRING(TreatmentTimeBodyBag_DisplayName), LSTRING(TreatmentTimeBodyBag_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0.1, 60, 15, 2],
true
] call CBA_settings_fnc_init;
[
QGVAR(clearTraumaAfterBandage),
"CHECKBOX",
@ -117,6 +71,42 @@
true
] call CBA_settings_fnc_init;
[
QGVAR(treatmentTimeAutoinjector),
"SLIDER",
[LSTRING(TreatmentTimeAutoinjector_DisplayName), LSTRING(TreatmentTimeAutoinjector_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0.1, 60, 5, 1],
true
] call CBA_settings_fnc_init;
[
QGVAR(treatmentTimeTourniquet),
"SLIDER",
[LSTRING(TreatmentTimeTourniquet_DisplayName), LSTRING(TreatmentTimeTourniquet_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0.1, 60, 7, 1],
true
] call CBA_settings_fnc_init;
[
QGVAR(treatmentTimeSplint),
"SLIDER",
[LSTRING(TreatmentTimeSplint_DisplayName), LSTRING(TreatmentTimeSplint_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0.1, 60, 7, 1],
true
] call CBA_settings_fnc_init;
[
QGVAR(treatmentTimeBodyBag),
"SLIDER",
[LSTRING(TreatmentTimeBodyBag_DisplayName), LSTRING(TreatmentTimeBodyBag_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0.1, 60, 15, 1],
true
] call CBA_settings_fnc_init;
[
QGVAR(medicEpinephrine),
"LIST",
@ -217,11 +207,11 @@
] call CBA_settings_fnc_init;
[
QGVAR(treatmentTimeStich),
QGVAR(woundStitchTime),
"SLIDER",
[LSTRING(treatmentTimeStich_DisplayName), LSTRING(treatmentTimeStich_Description)],
[LSTRING(WoundStitchTime_DisplayName), LSTRING(WoundStitchTime_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0.01, 10, 5, 2],
[0.1, 60, 5, 1],
true
] call CBA_settings_fnc_init;
@ -244,11 +234,11 @@
] call CBA_settings_fnc_init;
[
QGVAR(allowBodyBagUnconscious),
"CHECKBOX",
[LSTRING(AllowBodyBagUnconscious_DisplayName), LSTRING(AllowBodyBagUnconscious_Description)],
QGVAR(treatmentTimeIV),
"SLIDER",
[LSTRING(TreatmentTimeIV_DisplayName), LSTRING(TreatmentTimeIV_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
false,
[0.1, 60, 12, 1],
true
] call CBA_settings_fnc_init;
@ -264,9 +254,18 @@
[
QGVAR(treatmentTimeCPR),
"SLIDER",
[LSTRING(treatmentTimeCPR_DisplayName), LSTRING(treatmentTimeCPR_Description)],
[LSTRING(TreatmentTimeCPR_DisplayName), LSTRING(TreatmentTimeCPR_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0.1, 30, 15, 1],
[0.1, 60, 15, 1],
true
] call CBA_settings_fnc_init;
[
QGVAR(allowBodyBagUnconscious),
"CHECKBOX",
[LSTRING(AllowBodyBagUnconscious_DisplayName), LSTRING(AllowBodyBagUnconscious_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
false,
true
] call CBA_settings_fnc_init;

120
addons/medical_treatment/stringtable.xml
View File

@ -133,68 +133,6 @@
<Japanese>傷が再開放する確率の係数を設定できます。再開放は、この数値と傷の種類、そして使用した包帯に応じて左右されます。</Japanese>
<Turkish>Yaranın yeniden açılma şansını kontrol etme katsayısı. Son yeniden açılma şansı, bu değerin kullanılan yara tipi ve bandaj için spesifik yeniden açılma şansı ile çarpılmasıyla belirlenir.</Turkish>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTourniquet_DisplayName">
<English>Tourniquet Treatment Time</English>
<French>Temps de traitement du tourniquet</French>
<German>Tourniquet-Behandlungszeit</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTourniquet_Description">
<English>Time in seconds it takes to apply a tourniquet.</English>
<French>Temps en secondes nécessaire pour appliquer un garrot.</French>
<German>Zeit in Sekunden, die benötigt wird, um ein Tourniquet anzuwenden.</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeSyringe_DisplayName">
<English>Syringe Treatment Time</English>
<French>Temps de traitement de la seringue</French>
<German>Spritzenbehandlungszeit</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeSyringe_Description">
<English>Time in seconds it takes to apply a syringe.</English>
<French>Temps en secondes nécessaire pour appliquer une seringue.</French>
<German>Zeit in Sekunden, die zum Auftragen einer Spritze benötigt wird.</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeIV_DisplayName">
<English>IV Bag Treatment Time</English>
<French>Temps de traitement du sac IV</French>
<German>IV Beutelbehandlungszeit</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeIV_Description">
<English>Time in seconds it takes to apply an IV bag.</English>
<French>Temps en secondes nécessaire pour appliquer un sac IV.</French>
<German>Zeit in Sekunden, die benötigt wird, um einen Infusionsbeutel aufzutragen.</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeSplint_DisplayName">
<English>Splint Treatment Time</English>
<French>Temps de traitement de l'attelle</French>
<German>Schienenbehandlungszeit</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeSplint_Description">
<English>Time in seconds it takes to apply a splint.</English>
<French>Temps en secondes nécessaire pour appliquer une attelle.</French>
<German>Zeit in Sekunden, die zum Anbringen einer Schiene benötigt wird.</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeBodyBag_DisplayName">
<English>Body Bag Use Time</English>
<French>Temps d'utilisation du sac mortuaire</French>
<German>Anwendungszeit für Leichensack</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeBodyBag_Description">
<English>Time in seconds it takes to apply a body bag.</English>
<French>Temps en secondes qu'il faut pour appliquer un sac mortuaire.</French>
<German>Zeit in Sekunden, die benötigt wird, um einen Leichensack aufzutragen.</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_treatmentTimeStich_DisplayName">
<English>Stitching time per wound</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_treatmentTimeStich_Description">
<English>Time that is needed to stitch one wound</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_treatmentTimeCPR_DisplayName">
<English>Time to give CPR</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_treatmentTimeCPR_Description">
<English>Time in seconds how long the CPR action takes to complete</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_ClearTraumaAfterBandage_DisplayName">
<English>Clear Trauma After Bandage</English>
<Japanese>治療後に外傷を削除</Japanese>
@ -300,6 +238,52 @@
<German>Ausrüstung des Sanitäters zuerst</German>
<Turkish>İlk Sıhhiyenin Ekipmanı</Turkish>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeAutoinjector_DisplayName">
<English>Autoinjector Treatment Time</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeAutoinjector_Description">
<English>Time, in seconds, required to administer medication using an autoinjector.</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTourniquet_DisplayName">
<English>Tourniquet Treatment Time</English>
<French>Temps de traitement du tourniquet</French>
<German>Tourniquet-Behandlungszeit</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTourniquet_Description">
<English>Time, in seconds, required to apply/remove a tourniquet.</English>
<French>Temps en secondes nécessaire pour appliquer un garrot.</French>
<German>Zeit in Sekunden, die benötigt wird, um ein Tourniquet anzuwenden.</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeIV_DisplayName">
<English>IV Bag Treatment Time</English>
<French>Temps de traitement du sac IV</French>
<German>IV Beutelbehandlungszeit</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeIV_Description">
<English>Time, in seconds, required to administer an IV bag.</English>
<French>Temps en secondes nécessaire pour appliquer un sac IV.</French>
<German>Zeit in Sekunden, die benötigt wird, um einen Infusionsbeutel aufzutragen.</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeSplint_DisplayName">
<English>Splint Treatment Time</English>
<French>Temps de traitement de l'attelle</French>
<German>Schienenbehandlungszeit</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeSplint_Description">
<English>Time, in seconds, required to apply a splint.</English>
<French>Temps en secondes nécessaire pour appliquer une attelle.</French>
<German>Zeit in Sekunden, die zum Anbringen einer Schiene benötigt wird.</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeBodyBag_DisplayName">
<English>Body Bag Use Time</English>
<French>Temps d'utilisation du sac mortuaire</French>
<German>Anwendungszeit für Leichensack</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeBodyBag_Description">
<English>Time, in seconds, required to put a patient in a body bag.</English>
<French>Temps en secondes qu'il faut pour appliquer un sac mortuaire.</French>
<German>Zeit in Sekunden, die benötigt wird, um einen Leichensack aufzutragen.</German>
</Key>
<Key ID="STR_ACE_Medical_Treatment_MedicEpinephrine_DisplayName">
<English>Allow Epinephrine</English>
<German>Erlaube Epiniphrin</German>
@ -594,6 +578,12 @@
<German>Ermöglicht die Benutzung des Operations-Sets, um sich selbst zu nähen.</German>
<Russian>Включает использование хирургического набора на себе.</Russian>
</Key>
<Key ID="STR_ACE_Medical_Treatment_WoundStitchTime_DisplayName">
<English>Wound Stitch Time</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_WoundStitchTime_Description">
<English>Time, in seconds, required to stitch a single wound.</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_AllowSelfIV_DisplayName">
<English>Self IV Transfusion</English>
<German>Eigennutzung von Bluttransfusionen</German>
@ -852,6 +842,12 @@
<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>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeCPR_DisplayName">
<English>CPR Treatment Time</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_TreatmentTimeCPR_Description">
<English>Time, in seconds, required to perform CPR on a patient.</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_HolsterRequired_DisplayName">
<English>Holster Required</English>
<Japanese>武器の扱い</Japanese>