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

CSW - Improve tripod and weapon disassembly #9915

Merged
merged 10 commits into from
Jun 22, 2024
Merged

CSW - Improve tripod and weapon disassembly #9915

merged 10 commits into from
Jun 22, 2024

Conversation

johnb432
Copy link
Contributor

@johnb432 johnb432 commented Apr 3, 2024 •
edited
Loading

When merged this pull request will:

  • Add disassembly for tripods when players have occupied launcher slots.
  • When returning items upon disassembly:
    • The weapon is added back with CBA_fnc_addWeaponWithoutItems, to avoid auto reloading.
    • The ammo count is added back to the magazine, previously mag would have 1 bullet only.
  • Eject dead bodies from weapons and tripods when they are picked up.

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 Apr 3, 2024
@johnb432 johnb432 added this to the 3.18.0 milestone May 9, 2024
@johnb432 johnb432 changed the title CSW - Add disassembly for tripods when players have occupied launcher slots CSW - Improve tripod and weapon disassembly Jun 17, 2024
LinkIsGrim
LinkIsGrim approved these changes Jun 22, 2024
View reviewed changes
Copy link
Contributor

@LinkIsGrim LinkIsGrim left a comment

Choose a reason for hiding this comment

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

Fix merge conflict

@johnb432 johnb432 merged commit cd66f49 into master Jun 22, 2024
5 checks passed
@johnb432 johnb432 deleted the csw-dissassemble-tripod branch June 22, 2024 17:39
blake8090 pushed a commit to blake8090/ACE3 that referenced this pull request Aug 18, 2024
@johnb432 @blake8090
CSW - Improve tripod and weapon disassembly (acemod#9915)
4b0fb3f 
* Add disassembly for tripods when players have occupied launcher slots

* Update fnc_assemble_canDeployWeapon.sqf

* Update fnc_assemble_canPickupWeapon.sqf

* Revert file renaming (see acemod#9777)

* Correct headers

* Update fnc_canPickupTripod.sqf

* Fixed checks and eject dead bodies

* Invert checks
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

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

Successfully merging this pull request may close these issues.
2 participants
@johnb432 @LinkIsGrim