From bff7670764baf9897b5fa3ce8fbc4a0b23e04491 Mon Sep 17 00:00:00 2001
From: AGM-114K <39133904+AGM-114K@users.noreply.github.com>
Date: Thu, 10 May 2018 02:58:11 +0900
Subject: [PATCH 1/2] ACE item category detection optimization

As ACE Advanced Medical is part of ACE, activeACEMedical == true AND activeACE == false is not a valid scenario.
Checking for aceAdvMedItems branched under checking for aceItems. Should evaluate slightly faster.
---
 .../JeroenArsenal/JNA/fn_arsenal_itemType.sqf          | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/AntistasiOfficial.Altis/JeroenArsenal/JNA/fn_arsenal_itemType.sqf b/AntistasiOfficial.Altis/JeroenArsenal/JNA/fn_arsenal_itemType.sqf
index 1b06abe7..0fc98cbd 100644
--- a/AntistasiOfficial.Altis/JeroenArsenal/JNA/fn_arsenal_itemType.sqf
+++ b/AntistasiOfficial.Altis/JeroenArsenal/JNA/fn_arsenal_itemType.sqf
@@ -58,14 +58,12 @@ _weaponTypeCategory = _weaponType select 0;
 private ["_weaponTypeSpecific"];
 _weaponTypeSpecific = _weaponType select 1;
 //workaround for ACE bugs related to bis_fnc_itemType by Barbolani from WotP
-if (activeACEMedical) then {
-	if (_weaponTypeSpecific == "AccessoryBipod") then {
-		if (_item in aceAdvMedItems) then {_weaponTypeSpecific = "FirstAidKit"};
-	};
-};
 if (activeACE) then {
 	if (_weaponTypeSpecific == "AccessoryBipod") then {
 		if (_item in aceItems) then {_weaponTypeSpecific = "FirstAidKit"};
+        if (activeACEMedical) then {
+            if (_item in aceAdvMedItems) then {_weaponTypeSpecific = "FirstAidKit"};
+        };
 	};
 };
 INITTYPES
@@ -99,4 +97,4 @@ if(_return == -1)then{
 //if (_return == -1) then {diag_log format ["Index%1. Item:%2.Amount:%3",_item,1,1]};
 };
 
-_return;
\ No newline at end of file
+_return;

From 739e28c94f76b3be033c237515e351cec55ca735 Mon Sep 17 00:00:00 2001
From: AGM-114K <39133904+AGM-114K@users.noreply.github.com>
Date: Thu, 10 May 2018 03:28:51 +0900
Subject: [PATCH 2/2] gearList: Add common ACE items to aceItems

Added additional commonly used ACE items to the aceItems array.
This prevents the bug of ACE items getting stuck in the bipod tab of the arsenal.
---
 AntistasiOfficial.Altis/Lists/gearList.sqf | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/AntistasiOfficial.Altis/Lists/gearList.sqf b/AntistasiOfficial.Altis/Lists/gearList.sqf
index 8485c9df..c3fe706d 100644
--- a/AntistasiOfficial.Altis/Lists/gearList.sqf
+++ b/AntistasiOfficial.Altis/Lists/gearList.sqf
@@ -1032,6 +1032,14 @@ if (activeACE) then {
 		"ACE_DefusalKit",
 		"ACE_MapTools",
 		"ACE_Flashlight_MX991",
+		"ACE_Flashlight_MX991",
+		"ACE_Flashlight_KSF1",
+		"ACE_DAGR",
+		"ACE_microDAGR",
+        "ACE_ATragMX",
+        "ACE_Kestrel4500",
+        "ACE_UAVBattery",
+        "ACE_HuntIR_monitor",
 		"ACE_Sandbag_empty",
 		"ACE_wirecutter",
 		"ACE_RangeTable_82mm",
@@ -1181,4 +1189,4 @@ if (activeJNA) then {
 
 	// JNA category names
 	jna_categories = ["primary","secondary","handgun","uniform","vest","backpack","helmet","goggle","nvg","binos","map","gps","radio","compass","watch","","","","optic","muzzle","accessory","bipod","grenade","mine","misc","","ammo"];
-};
\ No newline at end of file
+};