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

Civilian Magazine Spawn Adjustments #75925

Merged
merged 26 commits into from
Aug 26, 2024

Conversation

Holli-Git
Copy link
Contributor

@Holli-Git Holli-Git commented Aug 24, 2024

Summary

Content "Overhauls magazine spawning"

Purpose of change

This PR is waiting on approval from reviewers

Currently, magazines were spawned in a very messy, inaccurate way. It was just a big list magazines with no guidelines, and was separated into pistol/rifle instead of by caliber. This causes issues as instead of having magazines spawn in a close-enough ratio to guns, it is completely random. It's also a lot harder to contribute guns with magazines, as trying to figure out how common a magazine should be relative to something else is a lot more difficult.

Describe the solution

A) Makes magazine spawns weighted by caliber, and then magazines by caliber weighted by the guns that use them, using gunbroker for this information. Not perfect, but it's the best we got.
B) Culls the magazine lists, a lot of them were unused, or so niche that it could be replaced without any consequences on logic or gameplay.
C) Removes rare magazine itemgroups. This is because what is rare is very hard to determine, and since it was spawned at roughly 2:1 for common to rare magazines, rare magazines weren't all that rare. By combining the rare magazines into the main group, there is no need to separately list what a rare magazine is, instead letting it be actual chance to find a rare mag.

Describe alternatives you've considered

Not doing this

Testing

image
image
image
image

Additional context

This also necessitates a gun spawn revamp and an overlook at guns. For example, browning hi powers are very rare despite them being not too uncommon.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Items: Magazines Ammo holding items and objects. Map / Mapgen Overmap, Mapgen, Map extras, Map display Spawn Creatures, items, vehicles, locations appearing on map labels Aug 24, 2024
@github-actions github-actions bot added Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Aftershock Anything to do with the Aftershock mod Mods: No Hope Relating to the mod No Hope Mods: Mind Over Matter Mods: Backrooms labels Aug 24, 2024
@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 BasicBuildPassed This PR builds correctly, label assigned by github actions labels Aug 24, 2024
The saiga 410 is gonna get deleted in a future PR
@kevingranade kevingranade merged commit 640fcb7 into CleverRaven:master Aug 26, 2024
23 of 24 checks passed
@Holli-Git Holli-Git mentioned this pull request Sep 28, 2024
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 Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Magazines Ammo holding items and objects. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Mods: Aftershock Anything to do with the Aftershock mod Mods: Backrooms Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Mind Over Matter Mods: No Hope Relating to the mod No Hope Mods Issues related to mods or modding Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants