diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp index 6c23f23711..1308f4bcea 100644 --- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp +++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp @@ -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}}; diff --git a/addons/medical_treatment/functions/fnc_getStitchTime.sqf b/addons/medical_treatment/functions/fnc_getStitchTime.sqf index 21e0d14105..12c770eb95 100644 --- a/addons/medical_treatment/functions/fnc_getStitchTime.sqf +++ b/addons/medical_treatment/functions/fnc_getStitchTime.sqf @@ -18,4 +18,4 @@ params ["", "_patient"]; -count (_patient call FUNC(getStitchableWounds)) * GVAR(treatmentTimeStich) +count (_patient call FUNC(getStitchableWounds)) * GVAR(woundStitchTime) diff --git a/addons/medical_treatment/functions/fnc_surgicalKitProgress.sqf b/addons/medical_treatment/functions/fnc_surgicalKitProgress.sqf index 7a97c256f6..14e11df259 100644 --- a/addons/medical_treatment/functions/fnc_surgicalKitProgress.sqf +++ b/addons/medical_treatment/functions/fnc_surgicalKitProgress.sqf @@ -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); diff --git a/addons/medical_treatment/initSettings.sqf b/addons/medical_treatment/initSettings.sqf index 8a59853d99..54a83453e4 100644 --- a/addons/medical_treatment/initSettings.sqf +++ b/addons/medical_treatment/initSettings.sqf @@ -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; diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index 7b855a4014..1c59c6ba81 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -133,68 +133,6 @@ 傷が再開放する確率の係数を設定できます。再開放は、この数値と傷の種類、そして使用した包帯に応じて左右されます。 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. - - Tourniquet Treatment Time - Temps de traitement du tourniquet - Tourniquet-Behandlungszeit - - - Time in seconds it takes to apply a tourniquet. - Temps en secondes nécessaire pour appliquer un garrot. - Zeit in Sekunden, die benötigt wird, um ein Tourniquet anzuwenden. - - - Syringe Treatment Time - Temps de traitement de la seringue - Spritzenbehandlungszeit - - - Time in seconds it takes to apply a syringe. - Temps en secondes nécessaire pour appliquer une seringue. - Zeit in Sekunden, die zum Auftragen einer Spritze benötigt wird. - - - IV Bag Treatment Time - Temps de traitement du sac IV - IV Beutelbehandlungszeit - - - Time in seconds it takes to apply an IV bag. - Temps en secondes nécessaire pour appliquer un sac IV. - Zeit in Sekunden, die benötigt wird, um einen Infusionsbeutel aufzutragen. - - - Splint Treatment Time - Temps de traitement de l'attelle - Schienenbehandlungszeit - - - Time in seconds it takes to apply a splint. - Temps en secondes nécessaire pour appliquer une attelle. - Zeit in Sekunden, die zum Anbringen einer Schiene benötigt wird. - - - Body Bag Use Time - Temps d'utilisation du sac mortuaire - Anwendungszeit für Leichensack - - - Time in seconds it takes to apply a body bag. - Temps en secondes qu'il faut pour appliquer un sac mortuaire. - Zeit in Sekunden, die benötigt wird, um einen Leichensack aufzutragen. - - - Stitching time per wound - - - Time that is needed to stitch one wound - - - Time to give CPR - - - Time in seconds how long the CPR action takes to complete - Clear Trauma After Bandage 治療後に外傷を削除 @@ -300,6 +238,52 @@ Ausrüstung des Sanitäters zuerst İlk Sıhhiyenin Ekipmanı + + Autoinjector Treatment Time + + + Time, in seconds, required to administer medication using an autoinjector. + + + Tourniquet Treatment Time + Temps de traitement du tourniquet + Tourniquet-Behandlungszeit + + + Time, in seconds, required to apply/remove a tourniquet. + Temps en secondes nécessaire pour appliquer un garrot. + Zeit in Sekunden, die benötigt wird, um ein Tourniquet anzuwenden. + + + IV Bag Treatment Time + Temps de traitement du sac IV + IV Beutelbehandlungszeit + + + Time, in seconds, required to administer an IV bag. + Temps en secondes nécessaire pour appliquer un sac IV. + Zeit in Sekunden, die benötigt wird, um einen Infusionsbeutel aufzutragen. + + + Splint Treatment Time + Temps de traitement de l'attelle + Schienenbehandlungszeit + + + Time, in seconds, required to apply a splint. + Temps en secondes nécessaire pour appliquer une attelle. + Zeit in Sekunden, die zum Anbringen einer Schiene benötigt wird. + + + Body Bag Use Time + Temps d'utilisation du sac mortuaire + Anwendungszeit für Leichensack + + + Time, in seconds, required to put a patient in a body bag. + Temps en secondes qu'il faut pour appliquer un sac mortuaire. + Zeit in Sekunden, die benötigt wird, um einen Leichensack aufzutragen. + Allow Epinephrine Erlaube Epiniphrin @@ -594,6 +578,12 @@ Ermöglicht die Benutzung des Operations-Sets, um sich selbst zu nähen. Включает использование хирургического набора на себе. + + Wound Stitch Time + + + Time, in seconds, required to stitch a single wound. + Self IV Transfusion Eigennutzung von Bluttransfusionen @@ -852,6 +842,12 @@ Wahrscheinlichkeit, dass HLW bei der Wiederherstellung des Herzrhythmus erfolgreich sein wird. Kalp ritmini geri kazanmada CPR'nin başarılı olma olasılığı. + + CPR Treatment Time + + + Time, in seconds, required to perform CPR on a patient. + Holster Required 武器の扱い