Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start adding non available items and missing mods for loadouts

Browse Source
This commit is contained in:
Josuan Albin
2017-10-25 18:23:17 +02:00
parent d82fceb511
commit 0cbe9aefe7
4 changed files with 186 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
addons/arsenal/defines.hpp
View File

@ -264,3 +264,19 @@
[binocular GVAR(center)]\
]
#define CHECK_WEAPON_OR_ACC\
_item in (_weaponsArray select 0) ||\
{_item in (_weaponsArray select 1)} ||\
{_item in (_weaponsArray select 2)} ||\
{_item in (_accsArray select 0)} ||\
{_item in (_accsArray select 1)} ||\
{_item in (_accsArray select 2)} ||\
{_item in (_accsArray select 3)}
#define CHECK_ASSIGNED_ITEMS\
_item in (GVAR(virtualItems) select 10) ||\
{_item in (GVAR(virtualItems) select 11)} ||\
{_item in (GVAR(virtualItems) select 12)} ||\
{_item in (GVAR(virtualItems) select 13)} ||\
{_item in (GVAR(virtualItems) select 14)} ||\
{_item in (GVAR(virtualItems) select 8)}

5
addons/arsenal/functions/fnc_buttonLoadoutsLoad.sqf
View File

@ -7,14 +7,15 @@ if !(ctrlEnabled _control) exitWith {};
private _data = profileNamespace getVariable [QGVAR(saved_loadouts), []];
private _contentPanelCtrl = _display displayCtrl IDC_contentPanel;
private _loadoutName = _contentPanelCtrl lnbText [(lnbCurSelRow _contentPanelCtrl), 1];
private _curSel = lnbCurSelRow _contentPanelCtrl;
private _loadoutName = _contentPanelCtrl lnbText [_curSel, 1];
switch (GVAR(currentLoadoutsTab)) do {
case IDC_buttonMyLoadouts: {
private _loadout = (_data select {_x select 0 == _loadoutName}) select 0;
GVAR(center) setUnitLoadout [(_loadout select 1), true];
GVAR(center) setUnitLoadout [GVAR(loadoutsList) select (_contentPanelCtrl lnbValue [_curSel, 1]), true];
for "_index" from 0 to 15 do {
switch (_index) do {

169
addons/arsenal/functions/fnc_fillLoadoutsList.sqf
View File

@ -10,20 +10,168 @@ _textEditBoxCtrl ctrlSetText "";
_contentListCtrl lnbSetCurSelRow -1;
lnbClear _contentListCtrl;
private _data = profileNamespace getvariable [QGVAR(saved_loadouts),[]];
private _data = +(profileNamespace getvariable [QGVAR(saved_loadouts),[]]);
if (ctrlIDC _control == IDC_buttonMyLoadouts) then {
private _weaponCfg = configFile >> "CfgWeapons";
private _magCfg = configFile >> "CfgMagazines";
private _vehcCfg = configFile >> "CfgVehicles";
private _glassesCfg = configFile >> "CfgGlasses";
private _weaponsArray = GVAR(virtualItems) select 0;
private _accsArray = GVAR(virtualItems) select 1;
} else {
GVAR(loadoutsList) = [];
private _weaponCheck = {
params ["_dataPath"];
for "_sub_subIndex" from 0 to 6 do {
switch (_sub_subIndex) do {
case 0;
case 1;
case 2;
case 3;
case 6: {
if ((count _dataPath) != 0) then {
private _item = _dataPath select _sub_subIndex;
if (_item != "") then {
if (isClass (_weaponCfg >> _item)) then {
if !(CHECK_WEAPON_OR_ACC) then {
_dataPath set [_sub_subIndex, ""];
_unavailableItemsAmount = _unavailableItemsAmount + 1;
};
} else {
_dataPath set [_sub_subIndex, ""];
_nullItemsAmount = _nullItemsAmount + 1;
};
};
};
};
case 4;
case 5: {
if (((count _dataPath) != 0)) then {
private _mag = (_dataPath select _sub_subIndex) select 0;
if (isClass (_magCfg >> _mag)) then {
if !(_mag in (GVAR(virtualItems) select 2)) then {
_dataPath set [_sub_subIndex, []];
_unavailableItemsAmount = _unavailableItemsAmount + 1;
};
} else {
_dataPath set [_sub_subIndex, []];
_nullItemsAmount = _nullItemsAmount + 1;
};
};
};
};
};
};
private _fnc_handleLoadoutArray = {
for "_dataIndex" from 0 to 9 do {
switch (_dataIndex) do {
case 0;
case 1;
case 2;
case 8: {
[_loadoutData select _dataIndex] call _weaponCheck;
};
case 3;
case 4;
case 5: {
};
case 6: {
private _item = _loadoutData select _dataIndex;
if (_item != "") then {
if (isClass (_weaponCfg >> _item)) then {
if !(_item in (GVAR(virtualItems) select 3)) then {
_loadoutData set [_dataIndex, ""];
_unavailableItemsAmount = _unavailableItemsAmount + 1;
};
} else {
_loadoutData set [_dataIndex, ""];
_nullItemsAmount = _nullItemsAmount + 1;
};
};
};
case 7: {
private _item = _loadoutData select _dataIndex;
if (_item != "") then {
if (isClass (_glassesCfg >> _item)) then {
if !(_item in (GVAR(virtualItems) select 7)) then {
_loadoutData set [_dataIndex, ""];
_unavailableItemsAmount = _unavailableItemsAmount + 1;
};
} else {
_loadoutData set [_dataIndex, ""];
_nullItemsAmount = _nullItemsAmount + 1;
};
};
};
case 9: {
for "_subIndex" from 0 to 4 do {
private _item = (_loadoutData select _dataIndex) select _subIndex;
if (_item != "") then {
if (isClass (_weaponCfg >> _item)) then {
if !(CHECK_ASSIGNED_ITEMS) then {
(_loadoutData select _dataIndex) set [_subIndex, ""];
_unavailableItemsAmount = _unavailableItemsAmount + 1;
};
} else {
(_loadoutData select _dataIndex) set [_subIndex, ""];
_nullItemsAmount = _nullItemsAmount + 1;
};
};
};
};
};
};
};
private _nullItemsAmount = 0;
private _unavailableItemsAmount = 0;
switch (ctrlIDC _control) do {
case IDC_buttonMyLoadouts: {
{
_x params ["_loadoutName", "_loadoutData"];
private _nullItemsAmount = 0;
private _unavailableItemsAmount = 0;
call _fnc_handleLoadoutArray;
GVAR(loadoutsList) pushBack _loadoutData;
TRACE_3("count", _loadoutName, _nullItemsAmount, _unavailableItemsAmount);
private _newRow = _contentListCtrl lnbAddRow ["",_loadoutName];
_contentListCtrl lnbSetPicture [[_newRow, 2], getText (configFile >> "cfgWeapons" >> ((_loadoutData select 0) select 0) >> "picture")];
@ -35,10 +183,17 @@ switch (ctrlIDC _control) do {
_contentListCtrl lnbSetPicture [[_newRow, 8], getText (configFile >> "cfgWeapons" >> (_loadoutData select 6) >> "picture")];
_contentListCtrl lnbSetPicture [[_newRow, 9], getText (configFile >> "cfgGlasses" >> (_loadoutData select 7) >> "picture")];
if (false) then {
_contentListCtrl lnbSetColor [[_newRow, 1], [1, 1, 1, 0.25]];
_contentListCtrl lbSetValue [_newRow, -1];
if (_nullItemsAmount > 0) then {
_contentListCtrl lnbSetColor [[_newRow, 1], [1, 0, 0, 0.5]];
} else {
if (_unavailableItemsAmount > 0) then {
_contentListCtrl lnbSetColor [[_newRow, 1], [1, 1, 1, 0.25]];
};
};
_contentListCtrl lnbSetValue [[_newRow, 1], _forEachIndex];
} foreach _data;
};

11
addons/arsenal/functions/fnc_onSelChangedLoadouts.sqf
View File

@ -16,12 +16,12 @@ switch (GVAR(currentLoadoutsTab)) do {
case IDC_buttonMyLoadouts: {
_loadButtonCtrl ctrlEnable ([false, true] select ((_control lbValue _curSel) >= 0));
_loadButtonCtrl ctrlCommit 0;
_shareButtonCtrl ctrlEnable ([false, true] select (GVAR(allowSharedLoadouts)));
_shareButtonCtrl ctrlCommit 0;
_loadButtonCtrl ctrlEnable true;
_loadButtonCtrl ctrlCommit 0;
{
_x ctrlEnable (_curSel >= 0);
_x ctrlCommit 0;
@ -32,8 +32,7 @@ switch (GVAR(currentLoadoutsTab)) do {
case IDC_buttonDefaultLoadouts: {
_loadButtonCtrl ctrlEnable ([false, true] select ((_control lbValue _curSel) >= 0));
_loadButtonCtrl ctrlEnable true;
_loadButtonCtrl ctrlCommit 0;
{
@ -46,7 +45,7 @@ switch (GVAR(currentLoadoutsTab)) do {
case IDC_buttonSharedLoadouts: {
_loadButtonCtrl ctrlEnable ([false, true] select ((_control lbValue _curSel) >= 0));
_loadButtonCtrl ctrlEnable true;
_loadButtonCtrl ctrlCommit 0;
{