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

Sitting - Various improvements #10644

Merged
merged 5 commits into from
Jan 13, 2025
Merged

Sitting - Various improvements #10644

merged 5 commits into from
Jan 13, 2025

Conversation

johnb432
Copy link
Contributor

When merged this pull request will:

  • No longer require seats to inherit from Thing. This allows mods (including other components in ACE) to define classes inheriting from e.g. Static to be seats.
  • Add a safeguard to FUNC(addSitActions), so if it's called by mod and mission makers, it's executed after settings are initialised.
  • Store the people sitting on the seats, so that multiple people can sit at once. Fixes ACE Sitting only allows 1 sitter on multi-seatable objects #10486.
  • Pass new ownership onto other people sitting, if existent, instead of keeping it until everyone has left the bench.

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}.

@johnb432 johnb432 added the kind/enhancement Release Notes: **IMPROVED:** label Jan 12, 2025
@johnb432 johnb432 mentioned this pull request Jan 12, 2025
Merged
@LinkIsGrim LinkIsGrim added this to the 3.18.3 milestone Jan 13, 2025
LinkIsGrim
LinkIsGrim reviewed Jan 13, 2025
View reviewed changes
addons/sitting/functions/fnc_stand.sqf

if (_index == -1) exitWith {};

[_seatsClaimed select _index, _seat] call EFUNC(common,claim);
Copy link
Contributor

@LinkIsGrim LinkIsGrim Jan 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Don't like the idea of claiming something with a local execution on behalf of another machine, would prefer claimSafeServer instead.

Copy link
Contributor Author

@johnb432 johnb432 Jan 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

How can that make a difference here?

Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't

@LinkIsGrim LinkIsGrim modified the milestones: 3.18.3, 3.18.2 Jan 13, 2025
@LinkIsGrim LinkIsGrim merged commit 064e1eb into master Jan 13, 2025
3 checks passed
@LinkIsGrim LinkIsGrim deleted the sitting-improvements branch January 13, 2025 20:28
PlayerBotPro pushed a commit to PlayerBotPro/ACE3 that referenced this pull request Jan 14, 2025
@johnb432 @PabstMirror @PlayerBotPro
Sitting - Various improvements (acemod#10644)
4d4f0ba 
* Misc improvements to sitting

* Unclaim, then claim

* Update addons/sitting/XEH_clientInit.sqf

Co-authored-by: PabstMirror <[email protected]>

* Update addons/sitting/XEH_preStart.sqf

Co-authored-by: PabstMirror <[email protected]>

* Update fnc_canSit.sqf

---------

Co-authored-by: PabstMirror <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LinkIsGrim LinkIsGrim LinkIsGrim approved these changes

@PabstMirror PabstMirror PabstMirror approved these changes

Assignees
No one assigned
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Milestone
3.19.0
Development

Successfully merging this pull request may close these issues.

ACE Sitting only allows 1 sitter on multi-seatable objects
3 participants
@johnb432 @PabstMirror @LinkIsGrim