From ef8ad21446ddcf674f630dbc5df0ed8133518c55 Mon Sep 17 00:00:00 2001 From: commy2 Date: Thu, 29 Sep 2016 19:43:50 +0200 Subject: [PATCH] fix inconsistencies in treatment time between basic and adv, fix item usage --- addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp | 4 ++-- addons/medical_treatment/functions/fnc_treatment.sqf | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp index 5448bb9c77..a42eb42a10 100644 --- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp +++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp @@ -87,7 +87,7 @@ class GVAR(Actions) { category = "advanced"; treatmentLocations[] = {"All"}; requiredMedic = 0; - treatmentTime = 20; + treatmentTime = 15; items[] = {"ACE_bodyBag"}; condition = "!alive _target"; callbackSuccess = QUOTE(DFUNC(actionPlaceInBodyBag)); @@ -244,7 +244,7 @@ class GVAR(Actions) { category = "advanced"; items[] = {"ACE_bloodIV"}; requiredMedic = 1; - treatmentTime = 7; + treatmentTime = 12; callbackSuccess = QUOTE(DFUNC(treatmentIV)); animationCaller = "AinvPknlMstpSnonWnonDnon_medic1"; litter[] = {}; diff --git a/addons/medical_treatment/functions/fnc_treatment.sqf b/addons/medical_treatment/functions/fnc_treatment.sqf index f45be61227..1879db4e9c 100644 --- a/addons/medical_treatment/functions/fnc_treatment.sqf +++ b/addons/medical_treatment/functions/fnc_treatment.sqf @@ -27,6 +27,9 @@ if !([_caller, _target, _selectionName, _className] call FUNC(canTreat)) exitWit private _config = configFile >> QGVAR(Actions) >> CUR_LEVEL >> _className; +// handle items +private _items = getArray (_config >> "items"); + private _consumeItems = 0; if (isNumber (_config >> "itemConsumed")) then {