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

Arsenal - Add Ability to Transfer a Loadout from Saved to Default #6793

Merged
merged 13 commits into from
Feb 24, 2019
Merged

Arsenal - Add Ability to Transfer a Loadout from Saved to Default #6793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
96983fb
Added weight override parameter to ace_dragging_fnc_setCarryable/setD…
Jan 20, 2019
4420ca5
`count crew _target isEqualto -1` to `count crew _target isEqualto 0`
Jan 20, 2019
4e689db
Tab Replacement
Jan 20, 2019
2c4e3b3
Reverted UAV check, Params formatting, Lazy Eval
Jan 20, 2019
f8787ca
Update addons/dragging/functions/fnc_startCarry.sqf
commy2 Jan 20, 2019
e79ed05
Update fnc_startDrag.sqf
PiZZAD0X Jan 20, 2019
1b1b345
Remove beta suggestion extra line additions
PiZZAD0X Jan 20, 2019
6895300
Update addons/dragging/functions/fnc_startDrag.sqf
commy2 Jan 20, 2019
e442a85
Added ability to export loadout to defaultloadouts
Jan 25, 2019
47bae3f
Update fnc_buttonLoadoutsSave.sqf
Jan 25, 2019
fc8460a
Merge pull request #1 from acemod/master
PiZZAD0X Jan 25, 2019
9789b04
Update addons/arsenal/functions/fnc_buttonLoadoutsSave.sqf
PabstMirror Feb 23, 2019
b772c79
Add usage info to tooltip
PabstMirror Feb 23, 2019
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
12 changes: 11 additions & 1 deletion addons/arsenal/functions/fnc_buttonLoadoutsSave.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,17 @@ switch (GVAR(currentLoadoutsTab)) do {
};
};

if (_loadoutIndex == -1) then {
if (GVAR(shiftState) && {is3DEN} && {!(_loadoutName isEqualTo "")} && {_cursSelRow != -1} && {!(_loadoutIndex isEqualto -1)}) exitwith {
private _defaultLoadoutsSearch = GVAR(defaultLoadoutsList) findIf {(_x select 0) == _loadoutName};
if (_defaultLoadoutsSearch isEqualto -1) then {
GVAR(defaultLoadoutsList) pushBack [_loadoutName, _curSelLoadout];
} else {
GVAR(defaultLoadoutsList) set [_defaultLoadoutsSearch , [ _loadoutName, _curSelLoadout]];
};
set3DENMissionAttributes [[QGVAR(DummyCategory), QGVAR(DefaultLoadoutsListAttribute), GVAR(defaultLoadoutsList)]];
};

if (_loadoutIndex isEqualto -1) then {
_data pushBack [_editBoxContent, _loadout];
} else {
_data set [_loadoutIndex, [[_editBoxContent, _loadoutName] select (_loadoutName isEqualTo _editBoxContent), _loadout]];
Expand Down
3 changes: 3 additions & 0 deletions addons/arsenal/functions/fnc_loadoutsChangeTab.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,23 @@ switch (ctrlIDC _control) do {
case IDC_buttonMyLoadouts: {
_centerBoxTitleCtrl ctrlSetText (localize LSTRING(tabMyLoadoutsText));

if (is3den) then { _saveButtonCtrl ctrlSetTooltip format ["%1\n%2", localize LSTRING(buttonSaveTooltip), localize LSTRING(buttonSaveTooltip_shiftClick)]; };
_saveButtonCtrl ctrlEnable true;
_saveButtonCtrl ctrlCommit 0;
};

case IDC_buttonDefaultLoadouts: {
_centerBoxTitleCtrl ctrlSetText (localize LSTRING(tabDefaultLoadoutsText));

if (is3den) then { _saveButtonCtrl ctrlSetTooltip localize LSTRING(buttonSaveTooltip); };
_saveButtonCtrl ctrlEnable (is3DEN);
_saveButtonCtrl ctrlCommit 0;
};

case IDC_buttonSharedLoadouts: {
_centerBoxTitleCtrl ctrlSetText (localize LSTRING(tabSharedLoadoutsText));

if (is3den) then { _saveButtonCtrl ctrlSetTooltip localize LSTRING(buttonSaveTooltip); };
_saveButtonCtrl ctrlEnable false;
_saveButtonCtrl ctrlCommit 0;
};
Expand Down
3 changes: 3 additions & 0 deletions addons/arsenal/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@
<Chinese>保存當前的裝備</Chinese>
<Chinesesimp>保存当前的装备</Chinesesimp>
</Key>
<Key ID="STR_ACE_Arsenal_buttonSaveTooltip_shiftClick">
<English>[Shift+Click to save to mission defaults]</English>
</Key>
<Key ID="STR_ACE_Arsenal_buttonRenameText">
<English>Rename</English>
<French>Renommer</French>
Expand Down