From 3ddb5b6a62b790f5653e0821e5f3771cdff1990f Mon Sep 17 00:00:00 2001 From: pool011 Date: Wed, 28 Jun 2023 17:11:32 -0400 Subject: [PATCH 1/3] Remove items in ACE Pharmacy from filter function --- cScripts/functions/logistics/fn_checkItemValidity.sqf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cScripts/functions/logistics/fn_checkItemValidity.sqf b/cScripts/functions/logistics/fn_checkItemValidity.sqf index d0ea115ca..01a94697f 100644 --- a/cScripts/functions/logistics/fn_checkItemValidity.sqf +++ b/cScripts/functions/logistics/fn_checkItemValidity.sqf @@ -38,11 +38,9 @@ if (EGVAR(patches,usesACE)) then { // chemical if (_item in ["kat_gasmaskFilter", "kat_sealant", "KAT_CAS_M43_Bomb", "KAT_CAS_R_80mm_GAS_POD"]) then { _return = false }; // circulation - if (_item in ["kat_AED", "kat_bloodIV_A", "kat_bloodIV_A_250", "kat_bloodIV_A_500", "kat_bloodIV_A_N", "kat_bloodIV_A_N_250", "kat_bloodIV_A_N_500", "kat_bloodIV_AB", "kat_bloodIV_AB_250", "kat_bloodIV_AB_500", "kat_bloodIV_AB_N", "kat_bloodIV_AB_N_250", "kat_bloodIV_AB_N_500", "kat_bloodIV_B", "kat_bloodIV_B_250", "kat_bloodIV_B_500", "kat_bloodIV_B_N", "kat_bloodIV_B_N_250", "kat_bloodIV_B_N_500", "kat_bloodIV_O", "kat_bloodIV_O_250", "kat_bloodIV_O_500", "kat_bloodIV_O_N", "kat_bloodIV_O_N_250", "kat_bloodIV_O_N_500", "kat_crossPanel", "KAT_Empty_bloodIV_250", "KAT_Empty_bloodIV_500", "kat_X_AED"]) then { _return = false }; + if (_item in ["kat_bloodIV_A", "kat_bloodIV_A_250", "kat_bloodIV_A_500", "kat_bloodIV_A_N", "kat_bloodIV_A_N_250", "kat_bloodIV_A_N_500", "kat_bloodIV_AB", "kat_bloodIV_AB_250", "kat_bloodIV_AB_500", "kat_bloodIV_AB_N", "kat_bloodIV_AB_N_250", "kat_bloodIV_AB_N_500", "kat_bloodIV_B", "kat_bloodIV_B_250", "kat_bloodIV_B_500", "kat_bloodIV_B_N", "kat_bloodIV_B_N_250", "kat_bloodIV_B_N_500", "kat_bloodIV_O", "kat_bloodIV_O_250", "kat_bloodIV_O_500", "kat_bloodIV_O_N", "kat_bloodIV_O_N_250", "kat_bloodIV_O_N_500", "kat_crossPanel", "KAT_Empty_bloodIV_250", "KAT_Empty_bloodIV_500"]) then { _return = false }; // circulation - if (_item in ["kat_amiodarone", "kat_atropine", "kat_CaffeineItem", "kat_CarbonateItem", "kat_EACA", "kat_etomidate", "kat_fentanyl", "kat_flumazenil", "kat_IO_FAST", "kat_IV_16", "kat_ketamine", "kat_lidocaine", "kat_nalbuphine", "kat_naloxone", "kat_nitroglycerin", "kat_norepinephrine", "kat_PainkillerItem", "kat_PervitinItem", "kat_phenylephrine", "kat_TXA"]) then { _return = false }; - // surgery - if (_item in ["kat_clamp", "kat_plate", "kat_retractor", "kat_scalpel", "kat_vacuum"]) then { _return = false }; + if (_item in ["kat_amiodarone", "kat_atropine", "kat_CaffeineItem", "kat_fentanyl", "kat_ketamine", "kat_nalbuphine", "kat_PervitinItem"]) then { _return = false }; }; }; From fc3f9ccbc04783222a22f61abad2bbad77bbc717 Mon Sep 17 00:00:00 2001 From: pool011 Date: Thu, 29 Jun 2023 01:23:54 -0400 Subject: [PATCH 2/3] Clarify commented categories --- cScripts/functions/logistics/fn_checkItemValidity.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cScripts/functions/logistics/fn_checkItemValidity.sqf b/cScripts/functions/logistics/fn_checkItemValidity.sqf index 01a94697f..997c2413d 100644 --- a/cScripts/functions/logistics/fn_checkItemValidity.sqf +++ b/cScripts/functions/logistics/fn_checkItemValidity.sqf @@ -37,9 +37,9 @@ if (EGVAR(patches,usesACE)) then { if (_item in ["kat_Pulseoximeter", "kat_chestSeal", "kat_aatKit", "kat_ncdKit", "kat_stethoscope", "kat_BVM", "kat_pocketBVM", "kat_oxygenTank_150_Item", "kat_oxygenTank_300_Item", "kat_oxygenTank_150_Empty", "kat_oxygenTank_300_Empty"]) then { _return = false }; // chemical if (_item in ["kat_gasmaskFilter", "kat_sealant", "KAT_CAS_M43_Bomb", "KAT_CAS_R_80mm_GAS_POD"]) then { _return = false }; - // circulation + // fluids if (_item in ["kat_bloodIV_A", "kat_bloodIV_A_250", "kat_bloodIV_A_500", "kat_bloodIV_A_N", "kat_bloodIV_A_N_250", "kat_bloodIV_A_N_500", "kat_bloodIV_AB", "kat_bloodIV_AB_250", "kat_bloodIV_AB_500", "kat_bloodIV_AB_N", "kat_bloodIV_AB_N_250", "kat_bloodIV_AB_N_500", "kat_bloodIV_B", "kat_bloodIV_B_250", "kat_bloodIV_B_500", "kat_bloodIV_B_N", "kat_bloodIV_B_N_250", "kat_bloodIV_B_N_500", "kat_bloodIV_O", "kat_bloodIV_O_250", "kat_bloodIV_O_500", "kat_bloodIV_O_N", "kat_bloodIV_O_N_250", "kat_bloodIV_O_N_500", "kat_crossPanel", "KAT_Empty_bloodIV_250", "KAT_Empty_bloodIV_500"]) then { _return = false }; - // circulation + // drugs if (_item in ["kat_amiodarone", "kat_atropine", "kat_CaffeineItem", "kat_fentanyl", "kat_ketamine", "kat_nalbuphine", "kat_PervitinItem"]) then { _return = false }; }; }; From 5d62ac26c44b565078fe030ec3f9bb672b4100b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Thu, 29 Jun 2023 11:44:07 +0200 Subject: [PATCH 3/3] Removed kat items check for valitdity due to patches cehck dont work --- .../functions/logistics/fn_checkItemValidity.sqf | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/cScripts/functions/logistics/fn_checkItemValidity.sqf b/cScripts/functions/logistics/fn_checkItemValidity.sqf index 997c2413d..4515e04f1 100644 --- a/cScripts/functions/logistics/fn_checkItemValidity.sqf +++ b/cScripts/functions/logistics/fn_checkItemValidity.sqf @@ -29,19 +29,6 @@ if (EGVAR(patches,usesACE)) then { if (_item isKindOf "ACE_WaterBottle" || _item isKindOf "ACE_Canteen" || _item isKindOf "ACE_Can_Spirit" || _item isKindOf "ACE_MRE_LambCurry") then { _return = if (!isNil {acex_field_rations_enabled}) then {acex_field_rations_enabled} else {false}; }; - - if !(EGVAR(patches,usesKat)) then { - // airway - if (_item in ["kat_larynx", "kat_guedel", "kat_accuvac"]) then { _return = false }; - // breathing - if (_item in ["kat_Pulseoximeter", "kat_chestSeal", "kat_aatKit", "kat_ncdKit", "kat_stethoscope", "kat_BVM", "kat_pocketBVM", "kat_oxygenTank_150_Item", "kat_oxygenTank_300_Item", "kat_oxygenTank_150_Empty", "kat_oxygenTank_300_Empty"]) then { _return = false }; - // chemical - if (_item in ["kat_gasmaskFilter", "kat_sealant", "KAT_CAS_M43_Bomb", "KAT_CAS_R_80mm_GAS_POD"]) then { _return = false }; - // fluids - if (_item in ["kat_bloodIV_A", "kat_bloodIV_A_250", "kat_bloodIV_A_500", "kat_bloodIV_A_N", "kat_bloodIV_A_N_250", "kat_bloodIV_A_N_500", "kat_bloodIV_AB", "kat_bloodIV_AB_250", "kat_bloodIV_AB_500", "kat_bloodIV_AB_N", "kat_bloodIV_AB_N_250", "kat_bloodIV_AB_N_500", "kat_bloodIV_B", "kat_bloodIV_B_250", "kat_bloodIV_B_500", "kat_bloodIV_B_N", "kat_bloodIV_B_N_250", "kat_bloodIV_B_N_500", "kat_bloodIV_O", "kat_bloodIV_O_250", "kat_bloodIV_O_500", "kat_bloodIV_O_N", "kat_bloodIV_O_N_250", "kat_bloodIV_O_N_500", "kat_crossPanel", "KAT_Empty_bloodIV_250", "KAT_Empty_bloodIV_500"]) then { _return = false }; - // drugs - if (_item in ["kat_amiodarone", "kat_atropine", "kat_CaffeineItem", "kat_fentanyl", "kat_ketamine", "kat_nalbuphine", "kat_PervitinItem"]) then { _return = false }; - }; }; -_return \ No newline at end of file +_return