Dragging - Improve carrying by allowing carried object to be loaded into vehicle by key or mouse #9138
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PabstMirror
reviewed
Jan 29, 2023
| if (_target isKindOf "CAManBase") then { | ||
| private _vehicles = [cursorObject, 0, true] call EFUNC(common,nearestVehiclesFreeSeat); | ||
| if ([cursorObject] isEqualTo _vehicles) then { | ||
| [ACE_player, _target, cursorObject] call EFUNC(medical_treatment,loadUnit); |
There was a problem hiding this comment.
I think we need to check isModLoaded for medical
There was a problem hiding this comment.
How's this? 438d06b
rautamiekka
reviewed
Jan 29, 2023
BrettMayson
approved these changes
Feb 5, 2023
mharis001
reviewed
Feb 5, 2023
Comment on lines
34
to
51
| // Update mouse hint | ||
| private _ctrlTextLMB = (uiNamespace getVariable [QEGVAR(interaction,mouseHint), displayNull]) displayCtrl 2420; | ||
| if ( | ||
| !isNull cursorObject | ||
| && {([ACE_player, cursorObject, ["isNotCarrying"]] call EFUNC(common,canInteractWith))} | ||
| && { | ||
| if (_target isKindOf "CAManBase") then { | ||
| ([] isNotEqualTo ([cursorObject, 0, true] call EFUNC(common,nearestVehiclesFreeSeat))) | ||
| && {([_target, cursorObject] call EFUNC(interaction,getInteractionDistance)) < MAX_LOAD_DISTANCE} | ||
| } else { | ||
| [_target, cursorObject] call EFUNC(cargo,canLoadItemIn) | ||
| } | ||
| } | ||
| ) then { | ||
| _ctrlTextLMB ctrlSetText localize ELSTRING(Cargo,loadObject); | ||
| } else { | ||
| _ctrlTextLMB ctrlSetText localize LSTRING(Drop); | ||
| }; |
There was a problem hiding this comment.
Could maybe do what refuel does instead of directly manipulating the mouse hint UI.
ACE3/addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf
Lines 93 to 113 in f67957c
There was a problem hiding this comment.
That's an elegant approach! I'll give it a shot.
I based what I did on
ACE3/addons/explosives/functions/fnc_setupExplosive.sqf
Lines 121 to 131 in f67957c
LinkIsGrim
approved these changes
Jun 19, 2023
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When merged this pull request will:
IMPORTANT
Component - Add|Fix|Improve|Change|Make|Remove {changes}.