smarter allowed ammo types #3429
Merged
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
Map Change
|
need to fix this for internal mags |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…to smarter-allowed-ammo
FalloutFalcon
added
Test Merged
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…to smarter-allowed-ammo
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…to smarter-allowed-ammo
Sun-Soaked
approved these changes
Oct 22, 2024
shiptest-server
pushed a commit
that referenced
this pull request
Oct 22, 2024
zimon9
pushed a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request deal with cell sizes, snowflaked gun inits for diffrent mags and evil subtypes a basic unit test to make sure it works you can now pass a arg to empty a guns, ammo boxes, and cells in new so we don't need 8 billion sub types for that. using that, gun cases now are easier to make and have a sub type which grabs guns from the tile its on for mappers. cool regex if stuff conflict merges cell_type = (\/[\w\/]+) or mag_type = (\/[\w\/]+) default_ammo_type = $1\n\tallowed_ammo_types = list(\n\t\t$1,\n\t) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: ammo refactor: refactored ammo types to not be snowflaked when handling spawning subtyped guns /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
zimon9
pushed a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 2024
MrCat15352
pushed a commit
to MrCat15352/MrCat
that referenced
this pull request
Dec 27, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> deal with cell sizes, snowflaked gun inits for diffrent mags and evil subtypes a basic unit test to make sure it works you can now pass a arg to empty a guns, ammo boxes, and cells in new so we don't need 8 billion sub types for that. using that, gun cases now are easier to make and have a sub type which grabs guns from the tile its on for mappers. cool regex if stuff conflict merges cell_type = (\/[\w\/]+) or mag_type = (\/[\w\/]+) default_ammo_type = $1\n\tallowed_ammo_types = list(\n\t\t$1,\n\t) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> :cl: fix: ammo refactor: refactored ammo types to not be snowflaked when handling spawning subtyped guns /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
About The Pull Request
deal with cell sizes, snowflaked gun inits for diffrent mags and evil subtypes
a basic unit test to make sure it works
you can now pass a arg to empty a guns, ammo boxes, and cells in new so we don't need 8 billion sub types for that.
using that, gun cases now are easier to make and have a sub type which grabs guns from the tile its on for mappers.
cool regex if stuff conflict merges
cell_type = (/[\w/]+) or mag_type = (/[\w/]+)
default_ammo_type = $1\n\tallowed_ammo_types = list(\n\t\t$1,\n\t)
Why It's Good For The Game
Changelog
🆑
fix: ammo
refactor: refactored ammo types to not be snowflaked when handling spawning subtyped guns
/:cl: