Skip to content

Commit

Permalink
Dragging - Add Keybind for Carry (#7746)
Browse files Browse the repository at this point in the history
* add carry keybind

* Corrected canCarry Check

* Removed 'False' in key up parameter

* removed newline
  • Loading branch information
LachlanSneddon authored Jun 13, 2020
1 parent 3a13dd4 commit c399921
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
24 changes: 22 additions & 2 deletions addons/dragging/XEH_postInit.sqf
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
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

0 comments on commit c399921

Please sign in to comment.