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

fix: glock 22 will spawn with correct loaded magazines #5102

Merged
merged 2 commits into from
Jul 29, 2024

Conversation

Lamandus
Copy link
Contributor

@Lamandus Lamandus commented Jul 29, 2024

Checklist

Required

Optional

Purpose of change

@RoyalFox2140 pointed out that the glock 22 was spawning with the wrong ammo sometimes. The reason was that if the ammo group is not defined at the magazine when zero charges are possible, it may choose the wrong ammo type completely. This happened only for the glock 31 and glock 22 and every gun that uses their magazines.

Describe the solution

Define the ammo at the everyday spawn directly, same as the speedloader do.
Remove sig definitions for magazines that have no gun that uses that kind of ammo.

Describe alternatives you've considered

Testing

before:
grafik

after:
grafik

Additional context

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Jul 29, 2024
Copy link
Contributor

autofix-ci bot commented Jul 29, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@chaosvolt chaosvolt merged commit a131dd1 into cataclysmbnteam:main Jul 29, 2024
8 of 10 checks passed
@Lamandus Lamandus deleted the glock_fix branch September 4, 2024 23:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants