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

Dragging - Add Keybind for Carry #7746

Merged
merged 4 commits into from
Jun 13, 2020
Merged

Dragging - Add Keybind for Carry #7746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
129ca56
add carry keybind
LachlanSneddon Jun 1, 2020
94057ff
Corrected canCarry Check
LachlanSneddon Jun 1, 2020
2b78004
Removed 'False' in key up parameter
LachlanSneddon Jun 1, 2020
59cda71
removed newline
LachlanSneddon Jun 1, 2020
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
24 changes: 22 additions & 2 deletions addons/dragging/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,26 @@ if (isNil "ACE_maxWeightCarry") then {

[ACE_player, _cursor] call FUNC(startDrag);
false
}, {
}, {}, [-1, [false, false, false]]] call CBA_fnc_addKeybind; // UNBOUND

["ACE3 Common", QGVAR(carry), (localize LSTRING(CarryKeybind)), {
if (!alive ACE_player) exitWith {false};
if !([ACE_player, objNull, ["isNotDragging", "isNotCarrying"]] call EFUNC(common,canInteractWith)) exitWith {false};

// If we are drag/carrying something right now then just drop it:
if (ACE_player getVariable [QGVAR(isDragging), false]) exitWith {
[ACE_player, ACE_player getVariable [QGVAR(draggedObject), objNull]] call FUNC(dropObject);
false
};
if (ACE_player getVariable [QGVAR(isCarrying), false]) exitWith {
[ACE_player, ACE_player getVariable [QGVAR(carriedObject), objNull]] call FUNC(dropObject_carry);
false
};

private _cursor = cursorObject;
if ((isNull _cursor) || {(_cursor distance ACE_player) > 2.6}) exitWith {false};
if (!([ACE_player, _cursor] call FUNC(canCarry))) exitWith {false};

[ACE_player, _cursor] call FUNC(startCarry);
false
}, [-1, [false, false, false]]] call CBA_fnc_addKeybind; // UNBOUND
}, {}, [-1, [false, false, false]]] call CBA_fnc_addKeybind; // UNBOUND
3 changes: 3 additions & 0 deletions addons/dragging/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<Chinesesimp>拖拉/放开物品</Chinesesimp>
<Turkish>Objeyi Sürükle/Bırak</Turkish>
</Key>
<Key ID="STR_ACE_Dragging_CarryKeybind">
<English>Carry/Release Object</English>
</Key>
<Key ID="STR_ACE_Dragging_UnableToDrag">
<English>Item too heavy</English>
<German>Gegenstand ist zu schwer</German>
Expand Down