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

More Gun Mod Upgrades #54961

Merged
merged 3 commits into from
Jan 31, 2022
Merged

Conversation

bombasticSlacks
Copy link
Contributor

@bombasticSlacks bombasticSlacks commented Jan 31, 2022

Summary

Features "Gun Mods can override cycle recoil and more robustly change ammo type"

Purpose of change

more changes focused for #54723

Gun conversions (since they are barely used) don't have a lot of new gun system stuff.

Specifically I needed to be able to overload the min cycle recoil,
and
I needed to be able to have a default ammo (for UI purposes) that isn't a default ammo available in the default mag of the gun. Without this if you have a gun that takes multiple mag types with different ammo types and then the convert it to fire a different ammo type than the ammo of the first mag it nulls out.

Describe the solution

Revived some commented out code for magazine_default to let it consider conversions. This was already there and commented out in the function def. So I set the default to false (since the rest of the calls don't need it so it would be wasted execution). And in the relevant call set it to true.

Added a new mod entry for overwrite_min_cycle_recoil and a helper for items to take the guns cycle recoil or a mod if there is one.

Describe alternatives you've considered

Testing

Additional context

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jan 31, 2022
@bombasticSlacks bombasticSlacks marked this pull request as draft January 31, 2022 02:22
@Maleclypse Maleclypse added <Bugfix> This is a fix for a bug (or closes open issue) Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons labels Jan 31, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 31, 2022
@bombasticSlacks bombasticSlacks marked this pull request as ready for review January 31, 2022 04:46
@kevingranade kevingranade merged commit 40b6557 into CleverRaven:master Jan 31, 2022
@BrettDong
Copy link
Member

This causes compile error on Clang compiler.

@bombasticSlacks
Copy link
Contributor Author

Oh I see you already made a PR fixing it thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants