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

GM Frag Compat and Convertable Frags #599

Merged
merged 7 commits into from
Nov 17, 2024
Merged

GM Frag Compat and Convertable Frags #599

merged 7 commits into from
Nov 17, 2024

Conversation

lambdatiger
Copy link
Contributor

@lambdatiger lambdatiger commented Nov 12, 2024

This PR:

  • Adds GM ace frag compats
  • Makes GM grenades convertible
  • Adds a Gold Uzi.

Need someone to spot check I didn't ruin inheritance anywhere.

@PabstMirror
Copy link
Contributor

Should the frag stuff just go into ace?

@lambdatiger
Copy link
Contributor Author

lambdatiger commented Nov 13, 2024

Should the frag stuff just go into ace?

Yes, it should at some point, but for frag switching we need part of it (skip flag for concussion and practice grenades), and I had the rest on hand and just copied the rest in. I definitely can split part of this into an ACE PR instead. There are a few things that I need to do some more fine tuning in for parameters before I make the PR for ACE. Specifically, I'd have to either remove all the fragCount references until a later date or dial it in more and hope it works well with the final PR. Made changes to make it easier to review, will put the rest back in the box for now.

@PabstMirror PabstMirror added this to the v1.3.49 milestone Nov 17, 2024
@PabstMirror PabstMirror merged commit e9a69fe into master Nov 17, 2024
1 check passed
@PabstMirror PabstMirror deleted the GM-frag-compat branch November 17, 2024 01:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants