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

Jump to bottom

Fix reordering and unlockedXXX arrays in initial unlocks #3226

Merged
merged 1 commit into from
Apr 28, 2024
Merged

Fix reordering and unlockedXXX arrays in initial unlocks #3226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions A3A/addons/core/functions/init/fn_initServer.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,20 @@ else

// Do initial arsenal filling
private _categoriesToPublish = createHashMap;
private _equipHM = FactionGet(reb,"initialRebelEquipment") createHashMapFromArray []; // dupe proofing
private _addedClasses = createHashMap; // dupe proofing
{
if (_x isEqualType "") then {
private _arsenalTab = _x call jn_fnc_arsenal_itemType;
jna_dataList#_arsenalTab pushBack [_x, -1]; // direct add to avoid O(N^2) issue
private _categories = _x call A3A_fnc_equipmentClassToCategories;
_categoriesToPublish insert [true, _categories, []];
continue;
};
_x params ["_class", "_count"];
_x params ["_class", ["_count", -1]];
if (_class in _addedClasses) then { continue };
_addedClasses set [_class, nil];

private _arsenalTab = _class call jn_fnc_arsenal_itemType;
jna_dataList#_arsenalTab pushBack [_class, _count];
} foreach keys _equipHM;
jna_dataList#_arsenalTab pushBack [_class, _count]; // direct add to avoid O(N^2) issue

private _categories = _class call A3A_fnc_equipmentClassToCategories;
{ (missionNamespace getVariable ("unlocked" + _x)) pushBack _class } forEach _categories;
_categoriesToPublish insert [true, _categories, []];

} foreach FactionGet(reb,"initialRebelEquipment");

// Publish the unlocked categories (once each)
{ publicVariable ("unlocked" + _x) } forEach keys _categoriesToPublish;
Expand Down