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.

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

Zeus - Add zeus module for unloading cargo #9661

Merged
merged 2 commits into from
Nov 21, 2023

Conversation

johnb432
Copy link
Contributor

When merged this pull request will:

  • Title.

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@@ -44,7 +44,11 @@ if (GVAR(interactionParadrop)) then {
!alive _vehicle ||
{locked _vehicle >= 2} ||
{!(_vehicle getVariable [QGVAR(hasCargo), true])} || // if the cargo menu could be opened, the vehicle has QGVAR(hasCargo) in its config or the variable is set using FUNC(setSpace)
{(([ACE_player, _vehicle] call EFUNC(interaction,getInteractionDistance)) >= MAX_LOAD_DISTANCE) && {(vehicle ACE_player) != _vehicle}}
{
isNull findDisplay 312 && // if in Zeus, ignore the following checks
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At this point I'm inclined to add an event to Zeus display creation/destruction and setting a variable there

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before doing the variable thingy, check if curatorCamera suffices.
Having an event upon Zeus display creation/destruction should be added though.

@LinkIsGrim LinkIsGrim added the kind/feature Release Notes: **ADDED:** label Nov 21, 2023
@LinkIsGrim LinkIsGrim merged commit bae6363 into acemod:master Nov 21, 2023
5 checks passed
@johnb432 johnb432 changed the title Zeus - Add zeus modules for unloading cargo Zeus - Add zeus module for unloading cargo Nov 22, 2023
@LinkIsGrim LinkIsGrim added this to the 3.16.2 milestone Nov 23, 2023
@johnb432 johnb432 deleted the unload-cargo-zeus branch January 14, 2024 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants