From a18f4180ac0309c1ad48889abe8676bc2b6e700c Mon Sep 17 00:00:00 2001 From: Cyruz143 Date: Thu, 3 Jan 2019 20:26:22 +0000 Subject: [PATCH] Medical - Adding option to convert vanilla medical gear (#6680) * Adding option to convert vanilla medical gear * Better wording on setting description * Shortern var names * Shorter settings title * 3 options (enabled, just remove, disabled) --- addons/medical/ACE_Settings.hpp | 8 ++++ addons/medical/functions/fnc_itemCheck.sqf | 54 ++++++++++++---------- addons/medical/stringtable.xml | 9 ++++ 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index ee393c37e7..4d480eb910 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -310,4 +310,12 @@ class ACE_Settings { value = 3; sliderSettings[] = {0, 30, 3, 0}; }; + class GVAR(convertItems) { + category = CSTRING(Category_Medical); + displayName = CSTRING(MedicalSettings_convertItems_DisplayName); + description = CSTRING(MedicalSettings_convertItems_Description); + typeName = "SCALAR"; + value = 0; + values[] = {ECSTRING(common,Enabled), CSTRING(MedicalSettings_convertItems_remove), ECSTRING(common,Disabled)}; + }; }; diff --git a/addons/medical/functions/fnc_itemCheck.sqf b/addons/medical/functions/fnc_itemCheck.sqf index 0290deeea8..29a9efef74 100644 --- a/addons/medical/functions/fnc_itemCheck.sqf +++ b/addons/medical/functions/fnc_itemCheck.sqf @@ -15,38 +15,44 @@ * Public: Yes */ +if (GVAR(convertItems) == 2) exitWith {}; + params ["_unit"]; while {({_x == "FirstAidKit"} count items _unit) > 0} do { _unit removeItem "FirstAidKit"; - if (GVAR(level) >= 2) then { - _unit addItem "ACE_fieldDressing"; - _unit addItem "ACE_packingBandage"; - _unit addItem "ACE_morphine"; - _unit addItem "ACE_tourniquet"; - } else { - _unit addItem "ACE_fieldDressing"; - _unit addItem "ACE_fieldDressing"; - _unit addItem "ACE_morphine"; + if (GVAR(convertItems) == 0) then { + if (GVAR(level) >= 2) then { + _unit addItem "ACE_fieldDressing"; + _unit addItem "ACE_packingBandage"; + _unit addItem "ACE_morphine"; + _unit addItem "ACE_tourniquet"; + } else { + _unit addItem "ACE_fieldDressing"; + _unit addItem "ACE_fieldDressing"; + _unit addItem "ACE_morphine"; + }; }; }; while {({_x == "Medikit"} count items _unit) > 0} do { _unit removeItem "Medikit"; - if (GVAR(level) >= 2) then { - _unit addItemToBackpack "ACE_fieldDressing"; - _unit addItemToBackpack "ACE_packingBandage"; - _unit addItemToBackpack "ACE_packingBandage"; - _unit addItemToBackpack "ACE_epinephrine"; - _unit addItemToBackpack "ACE_morphine"; - _unit addItemToBackpack "ACE_salineIV_250"; - _unit addItemToBackpack "ACE_tourniquet"; - } else { - _unit addItemToBackpack "ACE_epinephrine"; - _unit addItemToBackpack "ACE_epinephrine"; - _unit addItemToBackpack "ACE_epinephrine"; - _unit addItemToBackpack "ACE_epinephrine"; - _unit addItemToBackpack "ACE_bloodIV"; - _unit addItemToBackpack "ACE_bloodIV"; + if (GVAR(convertItems) == 0) then { + if (GVAR(level) >= 2) then { + _unit addItemToBackpack "ACE_fieldDressing"; + _unit addItemToBackpack "ACE_packingBandage"; + _unit addItemToBackpack "ACE_packingBandage"; + _unit addItemToBackpack "ACE_epinephrine"; + _unit addItemToBackpack "ACE_morphine"; + _unit addItemToBackpack "ACE_salineIV_250"; + _unit addItemToBackpack "ACE_tourniquet"; + } else { + _unit addItemToBackpack "ACE_epinephrine"; + _unit addItemToBackpack "ACE_epinephrine"; + _unit addItemToBackpack "ACE_epinephrine"; + _unit addItemToBackpack "ACE_epinephrine"; + _unit addItemToBackpack "ACE_bloodIV"; + _unit addItemToBackpack "ACE_bloodIV"; + }; }; }; diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 728c57d87d..c1a41e78c1 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -5689,5 +5689,14 @@ Rende il paziente suscettibile di overdose da morfina, epinefrina o atropina. Sprawia, że pacjent jest podatny na przedawkowanie morfiny/epinefryny. + + Convert vanilla items + + + Enables or disables whether vanilla medical items are converted to ACE medical items or just removed + + + Just remove vanilla medical +