From 11a5a31e2899d06ec3f982f70c2fc6e8a39dbf82 Mon Sep 17 00:00:00 2001 From: Apricot <50947830+Apricot-ale@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:06:19 +0900 Subject: [PATCH 1/4] Update fn_aceModCompat.sqf --- .../functions/Templates/fn_aceModCompat.sqf | 185 +++++++++++------- 1 file changed, 112 insertions(+), 73 deletions(-) diff --git a/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf b/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf index 16a352f517..ace870c860 100644 --- a/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf +++ b/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf @@ -73,79 +73,115 @@ advItems = [ ]; katMedItems = [ - "kat_accuvac", //KAT Airway - "kat_guedel", //KAT Airway - "kat_larynx", //KAT Airway - - "kat_aatKit", //KAT Breathing - "kat_chestSeal", //KAT Breathing - "kat_Pulseoximeter", //KAT Breathing - "kat_stethoscope", //KAT Breathing - "kat_ncdKit", //standalone alternative to AAT Kit - added in V2.10.2 - - "kat_bloodIV_A", //KAT Circulation - "kat_bloodIV_A_250", //KAT Circulation - "kat_bloodIV_A_250_N", //KAT Circulation - "kat_bloodIV_A_500", //KAT Circulation - "kat_bloodIV_A_500_N", //KAT Circulation - "kat_bloodIV_A_N", //KAT Circulation - "kat_bloodIV_AB", //KAT Circulation - "kat_bloodIV_AB_250", //KAT Circulation - "kat_bloodIV_AB_250_N", //KAT Circulation - "kat_bloodIV_AB_500", //KAT Circulation - "kat_bloodIV_AB_500_N", //KAT Circulation - "kat_bloodIV_AB_N", //KAT Circulation - "kat_bloodIV_B", //KAT Circulation - "kat_bloodIV_B_250", //KAT Circulation - "kat_bloodIV_B_250_N", //KAT Circulation - "kat_bloodIV_B_500", //KAT Circulation - "kat_bloodIV_B_500_N", //KAT Circulation - "kat_bloodIV_B_N", //KAT Circulation - "kat_bloodIV_O", //KAT Circulation - "kat_bloodIV_O_250", //KAT Circulation - "kat_bloodIV_O_250_N", //KAT Circulation - "kat_bloodIV_O_500", //KAT Circulation - "kat_bloodIV_O_500_N", //KAT Circulation - "kat_bloodIV_O_N", //KAT Circulation - - "kat_crossPanel", //KAT Circulation - "KAT_Empty_bloodIV_250", //KAT Circulation - "KAT_Empty_bloodIV_500", //KAT Circulation - - "kat_AED", //KAT Circulation - "kat_X_AED", //KAT Circulation - - "kat_IO_FAST", //KAT Pharmacy - "kat_IV_16", //KAT Pharmacy - - "kat_amiodarone", //KAT Pharmacy - "kat_atropine", //KAT Pharmacy - //"kat_Carbonate", //KAT Pharmacy - dublicate in Magazines - "kat_CarbonateItem", //KAT Pharmacy - "kat_EACA", //KAT Pharmacy - "kat_fentanyl", //KAT Pharmacy - "kat_ketamine", //KAT Pharmacy - "kat_lidocaine", //KAT Pharmacy - "kat_nalbuphine", //KAT Pharmacy - "kat_naloxone", //KAT Pharmacy - "kat_nitroglycerin", //KAT Pharmacy - "kat_norepinephrine", //KAT Pharmacy - //"kat_Painkiller", //KAT Pharmacy - dublicate in Magazines - "kat_PainkillerItem", //KAT Pharmacy - "kat_phenylephrine", //KAT Pharmacy - "kat_TXA", //KAT Pharmacy - - "kat_etomidate", //KAT Surgery (Pharmacy) - "kat_flumazenil", //KAT Surgery (Pharmacy) - "kat_lorazepam", //KAT Surgery (Pharmacy) - "kat_clamp", //KAT Surgery - "kat_plate", //KAT Surgery - "kat_retractor", //KAT Surgery - "kat_scalpel", //KAT Surgery - "kat_vacuum", //KAT Surgery - - "Attachable_Helistretcher", //KAT Misc - "kat_stretcherBag" //KAT Misc + "kat_accuvac", //KAT Airway - Item + "kat_guedel", //KAT Airway - Item + "kat_larynx", //KAT Airway - Item + + "kat_Pulseoximeter", //KAT Breathing - Item + "kat_chestSeal", //KAT Breathing - Item + "kat_aatKit", //KAT Breathing - Item + "kat_ncdKit", //KAT Breathing - Item + "kat_stethoscope", //KAT Breathing - Item + "kat_BVM", //KAT Breathing - Item + "kat_pocketBVM", //KAT Breathing - Item + "kat_oxygenTank_150_Empty", //KAT Breathing - Item + "kat_oxygenTank_150_Item", //KAT Breathing - Item + "kat_oxygenTank_300_Empty", //KAT Breathing - Item + "kat_oxygenTank_300_Item", //KAT Breathing - Item + "kat_oxygenTank_150", //KAT Breathing - Magazine + "kat_oxygenTank_300", //KAT Breathing - Magazine + + //"kat_mask_M04", //KAT Chemical - Glasses + //"kat_mask_M50", //KAT Chemical - Glasses + "kat_gasmaskFilter", //KAT Chemical - Item + "kat_sealant", //KAT Chemical - Item + //"KAT_1Rnd_82mm_Mo_Type0", //KAT Chemical - Magazine for Mortar shell + //"KAT_1Rnd_82mm_Mo_TypeCS", //KAT Chemical - Magazine for Mortar shell + //"KAT_M7A3", //KAT Chemical - Magazine for HandGrenade + //"KAT_Gas_TripWireMine_Mag", //KAT Chemical - Magazine for TripWireMine + + "kat_bloodIV_A", //KAT Circulation - Item + "kat_bloodIV_A_250", //KAT Circulation - Item + "kat_bloodIV_A_500", //KAT Circulation - Item + "kat_bloodIV_A_N", //KAT Circulation - Item + "kat_bloodIV_A_N_250", //KAT Circulation - Item + "kat_bloodIV_A_N_500", //KAT Circulation - Item + "kat_bloodIV_AB", //KAT Circulation - Item + "kat_bloodIV_AB_250", //KAT Circulation - Item + "kat_bloodIV_AB_500", //KAT Circulation - Item + "kat_bloodIV_AB_N", //KAT Circulation - Item + "kat_bloodIV_AB_N_250", //KAT Circulation - Item + "kat_bloodIV_AB_N_500", //KAT Circulation - Item + "kat_bloodIV_B", //KAT Circulation - Item + "kat_bloodIV_B_250", //KAT Circulation - Item + "kat_bloodIV_B_500", //KAT Circulation - Item + "kat_bloodIV_B_N", //KAT Circulation - Item + "kat_bloodIV_B_N_250", //KAT Circulation - Item + "kat_bloodIV_B_N_500", //KAT Circulation - Item + "kat_bloodIV_O", //KAT Circulation - Item + "kat_bloodIV_O_250", //KAT Circulation - Item + "kat_bloodIV_O_500", //KAT Circulation - Item + "kat_bloodIV_O_N", //KAT Circulation - Item + "kat_bloodIV_O_N_250", //KAT Circulation - Item + "kat_bloodIV_O_N_500", //KAT Circulation - Item + "KAT_Empty_bloodIV_250", //KAT Circulation - Item + "KAT_Empty_bloodIV_500", //KAT Circulation - Item + "kat_AED", //KAT Circulation - Item + "kat_X_AED", //KAT Circulation - Item + "kat_crossPanel", //KAT Circulation - Item + + "kat_PainkillerItem", //KAT Pharmacy - Item + "kat_Painkiller", //KAT Pharmacy - Magazine + "kat_CarbonateItem", //KAT Pharmacy - Item + "kat_Carbonate", //KAT Pharmacy - Magazine + "kat_PervitinItem", //KAT Pharmacy - Item + "kat_Pervitin", //KAT Pharmacy - Magazine + "kat_CaffeineItem", //KAT Pharmacy - Item + "kat_Caffeine", //KAT Pharmacy - Magazine + "kat_PenthroxItem", //KAT Pharmacy - Item + "kat_Penthrox", //KAT Pharmacy - Magazine + "kat_IV_16", //KAT Pharmacy - Item + "kat_IO_FAST", //KAT Pharmacy - Item + "kat_naloxone", //KAT Pharmacy - Item + "kat_EACA", //KAT Pharmacy - Item + "kat_TXA", //KAT Pharmacy - Item + "kat_norepinephrine", //KAT Pharmacy - Item + "kat_phenylephrine", //KAT Pharmacy - Item + "kat_nitroglycerin", //KAT Pharmacy - Item + "kat_amiodarone", //KAT Pharmacy - Item + "kat_lidocaine", //KAT Pharmacy - Item + "kat_atropine", //KAT Pharmacy - Item + "kat_ketamine", //KAT Pharmacy - Item + "kat_fentanyl", //KAT Pharmacy - Item + "kat_nalbuphine", //KAT Pharmacy - Item + "kat_lorazepam", //KAT Pharmacy (Used in Surgery) - Item + "kat_flumazenil", //KAT Pharmacy (Used in Surgery) - Item + "kat_etomidate", //KAT Pharmacy (Used in Surgery) - Item + + "kat_scalpel", //KAT Surgery - Item + "kat_retractor", //KAT Surgery - Item + "kat_clamp", //KAT Surgery - Item + "kat_plate", //KAT Surgery - Item + "kat_vacuum", //KAT Surgery - Item + + //"kat_armband_doctor", //KAT Misc - Glasses (Cosmetics) + //"kat_Armband_Doctor_Item", //KAT Misc - Item (Cosmetics) + //"kat_armband_kat", //KAT Misc - Glasses (Cosmetics) + //"kat_Armband_Kat_Item", //KAT Misc - Item (Cosmetics) + //"kat_armband_medic", //KAT Misc - Glasses (Cosmetics) + //"kat_Armband_Medic_Item", //KAT Misc - Item (Cosmetics) + //"kat_armband_red_cross", //KAT Misc - Glasses (Cosmetics) + //"kat_Armband_Red_Cross_Item", //KAT Misc - Item (Cosmetics) + "Attachable_Helistretcher", //KAT Misc - Item + "kat_Bubble_Wrap_Item", //KAT Misc - Item + "kat_Bubble_Wrap", //KAT Misc - Magazine + "kat_IFAK", //KAT Misc - Item + "kat_IFAK_Magazine", //KAT Misc - Magazine + "kat_AFAK", //KAT Misc - Item + "kat_AFAK_Magazine", //KAT Misc - Magazine + "kat_MFAK", //KAT Misc - Item + "kat_MFAK_Magazine", //KAT Misc - Magazine + "kat_stretcherBag" //KAT Misc - Vehicle (Backpack) ]; aceCoolingItems = [ @@ -161,6 +197,9 @@ aceCoolingItems = [ ]; aceFoodItems = [ + "ACE_Banana", + "ACE_Sunflower_Seeds", + "ACE_Humanitarian_Ration", "ACE_MRE_BeefStew", "ACE_MRE_ChickenTikkaMasala", "ACE_MRE_ChickenHerbDumplings", From 1c625300f16a03dbc56b94214df30df34a984ac2 Mon Sep 17 00:00:00 2001 From: Apricot <50947830+Apricot-ale@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:16:33 +0900 Subject: [PATCH 2/4] note support version --- A3A/addons/core/functions/Templates/fn_aceModCompat.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf b/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf index ace870c860..0f8d3f24bb 100644 --- a/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf +++ b/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf @@ -72,7 +72,7 @@ advItems = [ "adv_aceCPR_AED" ]; -katMedItems = [ +katMedItems = [ //Support and tested with KAM 2.13.3rc2 "kat_accuvac", //KAT Airway - Item "kat_guedel", //KAT Airway - Item "kat_larynx", //KAT Airway - Item From cf929a0b0f381221e6b6bf8845ec0af67dbc7b05 Mon Sep 17 00:00:00 2001 From: Apricot <50947830+Apricot-ale@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:21:32 +0900 Subject: [PATCH 3/4] revert added aceFoodItems banana, sunflower seed, humanitarian ration is not related this PR... --- A3A/addons/core/functions/Templates/fn_aceModCompat.sqf | 3 --- 1 file changed, 3 deletions(-) diff --git a/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf b/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf index 0f8d3f24bb..fde28f9766 100644 --- a/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf +++ b/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf @@ -197,9 +197,6 @@ aceCoolingItems = [ ]; aceFoodItems = [ - "ACE_Banana", - "ACE_Sunflower_Seeds", - "ACE_Humanitarian_Ration", "ACE_MRE_BeefStew", "ACE_MRE_ChickenTikkaMasala", "ACE_MRE_ChickenHerbDumplings", From 00a406b57b0b66a0ec52bfaceb4d4a6b44fcfd1d Mon Sep 17 00:00:00 2001 From: Apricot <50947830+Apricot-ale@users.noreply.github.com> Date: Fri, 22 Dec 2023 01:02:12 +0900 Subject: [PATCH 4/4] comment version changed --- A3A/addons/core/functions/Templates/fn_aceModCompat.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf b/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf index fde28f9766..58106e2625 100644 --- a/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf +++ b/A3A/addons/core/functions/Templates/fn_aceModCompat.sqf @@ -72,7 +72,7 @@ advItems = [ "adv_aceCPR_AED" ]; -katMedItems = [ //Support and tested with KAM 2.13.3rc2 +katMedItems = [ //Support and tested with KAM 2.13.3 Stable "kat_accuvac", //KAT Airway - Item "kat_guedel", //KAT Airway - Item "kat_larynx", //KAT Airway - Item