From b1f0af7e1cc1c305cffa37c85b6a1551c051dfdb Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Thu, 13 Oct 2016 09:10:08 +0200
Subject: [PATCH] merge basic and adv. bandage actions

---
 addons/medical/XEH_preInit.sqf                      |  9 +++++++++
 .../ACE_Medical_Treatment_Actions.hpp               | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/addons/medical/XEH_preInit.sqf b/addons/medical/XEH_preInit.sqf
index c05293cd36..83b23d71b2 100644
--- a/addons/medical/XEH_preInit.sqf
+++ b/addons/medical/XEH_preInit.sqf
@@ -9,4 +9,13 @@ GVAR(SELECTIONS) = ["head", "body", "hand_l", "hand_r", "leg_l", "leg_r"];
 
 GVAR(STATE_MACHINE) = (configFile >> "ACE_Medical_StateMachine") call FUNC(createStateMachine);
 
+[
+    QGVAR(basicBandages),
+    "CHECKBOX",
+    ["Basic Bandages", "All Bandages share the same effectiveness and reopening chances."], //@todo
+    "ACE Medical", // @todo
+    true,
+    true
+] call CBA_Settings_fnc_init;
+
 ADDON = true;
diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
index 7db48f75fa..524f447f58 100644
--- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
+++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
@@ -12,7 +12,7 @@ class GVAR(Actions) {
             treatmentTime = 5;
             treatmentTimeSelfCoef = 1;
             items[] = {{"ACE_fieldDressing", "ACE_packingBandage", "ACE_elasticBandage", "ACE_quikclot"}};
-            condition = "";
+            condition = QEGVAR(medical,basicBandages);
             patientStateCondition = 0;
             itemConsumed = 1;
             callbackSuccess = QFUNC(treatmentBandage);
@@ -34,6 +34,7 @@ class GVAR(Actions) {
         class FieldDressing: BasicBandage {
             displayName = ECSTRING(medical,Actions_FieldDressing);
             items[] = {"ACE_fieldDressing"};
+            condition = QUOTE(!EGVAR(medical,basicBandages));
             litter[] = {
                 {"All", "_bloodLossOnSelection > 0", {{"ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
                 {"All", "_bloodLossOnSelection <= 0", {"ACE_MedicalLitter_clean"}}
@@ -42,6 +43,7 @@ class GVAR(Actions) {
         class PackingBandage: BasicBandage {
             displayName = ECSTRING(medical,Actions_PackingBandage);
             items[] = {"ACE_packingBandage"};
+            condition = QUOTE(!EGVAR(medical,basicBandages));
             litter[] = {
                 {"All", "", {"ACE_MedicalLitter_packingBandage"}},
                 {"All", "_bloodLossOnSelection > 0", {{"ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
@@ -51,10 +53,16 @@ class GVAR(Actions) {
         class ElasticBandage: BasicBandage {
             displayName = ECSTRING(medical,Actions_ElasticBandage);
             items[] = {"ACE_elasticBandage"};
+            condition = QUOTE(!EGVAR(medical,basicBandages));
+            litter[] = {
+                {"All", "_bloodLossOnSelection > 0", {{"ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
+                {"All", "_bloodLossOnSelection <= 0", {"ACE_MedicalLitter_clean"}}
+            };
         };
         class QuikClot: BasicBandage {
             displayName = ECSTRING(medical,Actions_QuikClot);
             items[] = {"ACE_quikclot"};
+            condition = QUOTE(!EGVAR(medical,basicBandages));
             litter[] = {
                 {"All", "", {"ACE_MedicalLitter_QuickClot"}},
                 {"All", "_bloodLossOnSelection > 0", {{"ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
@@ -70,6 +78,7 @@ class GVAR(Actions) {
             category = "medication";
             treatmentTime = 8;
             items[] = {"ACE_morphine"};
+            condition = "";
             callbackSuccess = QFUNC(treatmentMorphine);
             animationCaller = "AinvPknlMstpSnonWnonDnon_medic1";
             litter[] = { {"All", "", {"ACE_MedicalLitter_morphine"}} };
@@ -93,6 +102,7 @@ class GVAR(Actions) {
             requiredMedic = 1;
             treatmentTime = 12;
             items[] = {"ACE_bloodIV"};
+            condition = "";
             callbackSuccess = QFUNC(treatmentIV);
             animationCaller = "AinvPknlMstpSnonWnonDnon_medic1";
             litter[] = {};
@@ -131,6 +141,7 @@ class GVAR(Actions) {
             requiredMedic = 0;
             treatmentTime = 1;
             items[] = {};
+            condition = "";
             callbackSuccess = QFUNC(actionDiagnose);
             callbackFailure = "";
             callbackProgress = "";