Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JNA: ACE item category detection optimization #338

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

JNA: ACE item category detection optimization #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bff7670
ACE item category detection optimization
AGM-114K May 9, 2018
739e28c
gearList: Add common ACE items to aceItems
AGM-114K May 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions AntistasiOfficial.Altis/JeroenArsenal/JNA/fn_arsenal_itemType.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
_return;
10 changes: 9 additions & 1 deletion AntistasiOfficial.Altis/Lists/gearList.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,14 @@ if (activeACE) then {
"ACE_DefusalKit",
"ACE_MapTools",
"ACE_Flashlight_MX991",
"ACE_Flashlight_MX991",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AGM-114K duplication here

"ACE_Flashlight_KSF1",
"ACE_DAGR",
"ACE_microDAGR",
"ACE_ATragMX",
"ACE_Kestrel4500",
"ACE_UAVBattery",
"ACE_HuntIR_monitor",
"ACE_Sandbag_empty",
"ACE_wirecutter",
"ACE_RangeTable_82mm",
Expand Down Expand Up @@ -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"];
};
};