-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
kevingranade
merged 26 commits into
CleverRaven:master
from
Holli-Git:magazine_adjustments
Aug 26, 2024
Merged
Civilian Magazine Spawn Adjustments #75925
kevingranade
merged 26 commits into
CleverRaven:master
from
Holli-Git:magazine_adjustments
Aug 26, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
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
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
Merged
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
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.