From f16b0b81cdddb7c8e4005a70d18efb0c434a6e2b Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Tue, 8 Sep 2020 10:44:33 -0400 Subject: [PATCH 1/3] Added Addon Settings for several Medical Treatment Times Tourniquets, IV Bags, Syringes, Splints, and Body Bags. --- .../ACE_Medical_Treatment_Actions.hpp | 10 ++-- addons/medical_treatment/initSettings.sqf | 46 +++++++++++++++++ addons/medical_treatment/stringtable.xml | 51 +++++++++++++++++++ 3 files changed, 102 insertions(+), 5 deletions(-) diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp index f080c19079f..d86f1323c72 100644 --- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp +++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp @@ -79,7 +79,7 @@ class GVAR(actions) { icon = QPATHTOEF(medical_gui,ui\tourniquet.paa); allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"}; items[] = {"ACE_tourniquet"}; - treatmentTime = 7; + treatmentTime = QGVAR(treatmentTimeTourniquet); condition = QUOTE(!([ARR_2(_patient,_bodyPart)] call FUNC(hasTourniquetAppliedTo))); callbackSuccess = QFUNC(tourniquet); litter[] = {}; @@ -100,7 +100,7 @@ class GVAR(actions) { icon = QPATHTOEF(medical_gui,ui\splint.paa); allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"}; items[] = {"ACE_splint"}; - treatmentTime = 7; + treatmentTime = QGVAR(treatmentTimeSplint); callbackSuccess = QFUNC(splint); condition = QFUNC(canSplint); litter[] = { @@ -117,7 +117,7 @@ class GVAR(actions) { category = "medication"; items[] = {"ACE_morphine"}; condition = ""; - treatmentTime = 5; + treatmentTime = QGVAR(treatmentTimeSyringe); callbackSuccess = QFUNC(medication); animationMedic = "AinvPknlMstpSnonWnonDnon_medic1"; sounds[] = {{QPATHTO_R(sounds\Inject.ogg),1,1,50}}; @@ -148,7 +148,7 @@ class GVAR(actions) { allowSelfTreatment = QGVAR(allowSelfIV); category = "advanced"; medicRequired = QGVAR(medicIV); - treatmentTime = 12; + treatmentTime = QGVAR(treatmentTimeIV); items[] = {"ACE_bloodIV"}; condition = ""; callbackSuccess = QFUNC(ivBag); @@ -243,7 +243,7 @@ class GVAR(actions) { treatmentLocations = TREATMENT_LOCATIONS_ALL; allowSelfTreatment = 0; medicRequired = 0; - treatmentTime = 15; + treatmentTime = QGVAR(treatmentTimeBodyBag); items[] = {"ACE_bodyBag"}; // 'vehicle _patient' always returns the body // '_patient in _patient' always false for body diff --git a/addons/medical_treatment/initSettings.sqf b/addons/medical_treatment/initSettings.sqf index 3b68a0409f2..a4ed3c55436 100644 --- a/addons/medical_treatment/initSettings.sqf +++ b/addons/medical_treatment/initSettings.sqf @@ -34,6 +34,52 @@ 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", diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index 4c5dc0cb850..0c48e9ab3e7 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -126,6 +126,57 @@ Współczynnik kontroluje szanse na ponowne otworzenie rany. Końcowa szansa na otworzenie jest ustalana przez pomnożenie tej wartości z wartością szansy na otworzenie rany dla typu rany oraz typu bandaża. 傷が再開放する確率の係数を設定できます。再開放は、この数値と傷の種類、そして使用した包帯に応じて左右されます。 + + 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. + Clear Trauma After Bandage 治療後に外傷を削除 From 2381614d3050c4589e8b7f35e07df6bd3ac2df0f Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Tue, 8 Sep 2020 10:55:06 -0400 Subject: [PATCH 2/3] Fixed stringtable indentation --- addons/medical_treatment/stringtable.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index 0c48e9ab3e7..4b2aa39fb44 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -130,14 +130,13 @@ 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 @@ -176,7 +175,7 @@ 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. - + Clear Trauma After Bandage 治療後に外傷を削除 From 39e2d72d76e89fe36c29f3d0dad72f877d40dbdf Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Tue, 8 Sep 2020 10:57:07 -0400 Subject: [PATCH 3/3] And again --- addons/medical_treatment/stringtable.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index 4b2aa39fb44..b609db2f64b 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -136,7 +136,7 @@ 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 @@ -146,7 +146,7 @@ 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 @@ -156,7 +156,7 @@ 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 @@ -166,7 +166,7 @@ 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