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

Common - Add CBA extended loadout #8923

Merged
merged 4 commits into from
Aug 25, 2022
Merged

Common - Add CBA extended loadout #8923

merged 4 commits into from
Aug 25, 2022

Conversation

BrettMayson
Copy link
Member

@BrettMayson BrettMayson commented May 25, 2022 •
edited
Loading

Doesn't require this, it is compatible before and after the CBA PR is merged. There is an if statement that can be removed after the linked CBA PR is merged.

When merged this pull request will:

  • Add earplugs to CBA extended loadouts
  • Add gunbag weapon to CBA extended loadouts
  • Add face and speaker to loadouts saved in the ACE arsenal (default off)
  • Add insignia to loadouts saved in the ACE arsenal (default on)
  • Respawn keep gear uses CBA extended loadouts
  • Headless naked fix uses CBA extended loadouts (not sure about this one, may not be needed)
Settings Changes

image

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

BrettMayson and others added 2 commits May 24, 2022 18:05
@BrettMayson @jonpas
restore comment
fe07d0a 
Co-authored-by: jonpas <jonpas33@gmail.com>
@BrettMayson
fix forgotten example
17ab7e8
@PabstMirror
Copy link
Contributor

setUnitLoadout wipes out unique mags (intel items) and container setVars (gunbag)

We might want to remove uniqueMags from the loadout?
Or save them up into the hash?

I'm not sure, probably something we can deal with later.

@PabstMirror PabstMirror added this to the 3.15.1 milestone May 27, 2022
@veteran29 veteran29 self-requested a review August 25, 2022 15:28
@veteran29 veteran29 modified the milestones: 3.15.1, Ongoing Aug 25, 2022
@veteran29 veteran29 requested a review from jonpas August 25, 2022 15:34
@PabstMirror PabstMirror merged commit 438a90b into acemod:master Aug 25, 2022
@BrettMayson BrettMayson deleted the cba_extended_loadouts branch August 25, 2022 20:30
@jetelain jetelain mentioned this pull request Sep 18, 2022
Closed
@OverlordZorn OverlordZorn mentioned this pull request Sep 29, 2022
Closed
@LinkIsGrim LinkIsGrim mentioned this pull request Jul 8, 2023
Closed
RusComBear pushed a commit to RusComBear/ACE3 that referenced this pull request Dec 29, 2023
@BrettMayson @jonpas @RusComBear
Common - Add CBA extended loadout (acemod#8923)
402f50b 
* extended loadouts - earplugs, gunbag, and arsenal identity

* arsenal - maintain default loadout size check

* restore comment

Co-authored-by: jonpas <jonpas33@gmail.com>

* fix forgotten example

Co-authored-by: jonpas <jonpas33@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PabstMirror PabstMirror PabstMirror approved these changes

@veteran29 veteran29 Awaiting requested review from veteran29

@jonpas jonpas Awaiting requested review from jonpas

Assignees

@PabstMirror PabstMirror

Labels
area/compatibility
Projects
None yet
Milestone
3.15.1
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@BrettMayson @PabstMirror @jonpas @veteran29