-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Adds system for gunmod conflicts #69373
Merged
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
40068a1
to
5b182af
Compare
Vaskritaya
reviewed
Nov 19, 2023
Co-authored-by: Vaskritaya <metroidfan121@gmail.com>
Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details. Click to expand
This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to |
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
[C++]
Changes (can be) made in C++. Previously named `Code`
<Documentation>
Design documents, internal info, guides and help.
<Enhancement / Feature>
New features, or enhancements on existing
[JSON]
Changes (can be) made in JSON
json-styled
JSON lint passed, label assigned by github actions
[Markdown]
Markdown issues and PRs
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
Features "Gunmod conflicts, with Bayonets Conflicts"
Purpose of change
It would be cool to be able to install a bayonet in addition to, say, a VFG. But it would not be cool to install an M203 with a bayonet, as they physically do not fit together, and in some other cases bayonets might obstruct the path of the barrel of other underslung projectile weapons.
It would also be nice to eliminate the need for the modified bayonets.
see #69221
Describe the solution
Adds a function for conflicts on gunmods to conflict with other installed gunmods.
Ironically The function I didn't find so useful, Gunmod conflicts with pre-existing slots, I found a use for when adding a rail bayonet mount. I didn't want to end up with 2 bayonet lugs on a gun, so I used the renamed blacklist_slot function to prevent this.
Renamed the Json entry for blacklist_mod to blacklist_slot for the gunmod conflicts with slots function, as I found this more descriptive.
Added bayonet lug slots to all appropriate guns and conversion kits.
Added a recipe for making a bayonet lug adapter.
Obsoleted all "modified" bayonet recipes and items. We can control where bayonets go with the bayonet lug location now, instead.
Describe alternatives you've considered
Doing nothing?
Testing
Attempting to install a bayonet on an AR with an m203 attached:
![image](https://private-user-images.githubusercontent.com/7764202/282697304-3a2623b6-fc2c-4815-9a95-ec8d409216e6.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzOTYyNjMsIm5iZiI6MTczOTM5NTk2MywicGF0aCI6Ii83NzY0MjAyLzI4MjY5NzMwNC0zYTI2MjNiNi1mYzJjLTQ4MTUtOWE5NS1lYzhkNDA5MjE2ZTYucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxMiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTJUMjEzMjQzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9ODE4ZGQyZTFlNmEwYWE2NzVmMjUwOTg1YzkzZjk3Yzk3NzVkYjdjYjZhNWRhMTE0N2MzZjlmNzEzYzMzOTMwZiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.sNNXWpUSbVZaX9uhHeYyEXAO52khLRM3FpBjjkBeNQM)
Attempting to install an M203 on an AR with a bayonet attached:
![image](https://private-user-images.githubusercontent.com/7764202/282698328-489ae654-bac0-4555-a76d-7312e1aa7d36.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzOTYyNjMsIm5iZiI6MTczOTM5NTk2MywicGF0aCI6Ii83NzY0MjAyLzI4MjY5ODMyOC00ODlhZTY1NC1iYWMwLTQ1NTUtYTc2ZC03MzEyZTFhYTdkMzYucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxMiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTJUMjEzMjQzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9MDQ3ZWI1Mjg4ZjUxYmEwNzQ4OGM5MTM4NWE3MjM1YmQ0MjQwMzAyY2RiOGRjNjUxMmRlNTRkOTI1Yzk3MjhlMiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.P9kSWxf1YoF4iCph0oltLVYo99qG5sbyYjLzJFDIEhY)
MP5 with a bayonet lug rail adapter, and a bayonet.
![image](https://private-user-images.githubusercontent.com/7764202/282696493-2dcafc06-60cf-490f-9f24-767188a0e9cb.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzOTYyNjMsIm5iZiI6MTczOTM5NTk2MywicGF0aCI6Ii83NzY0MjAyLzI4MjY5NjQ5My0yZGNhZmMwNi02MGNmLTQ5MGYtOWYyNC03NjcxODhhMGU5Y2IucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxMiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTJUMjEzMjQzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NzlhZjU4ZmMzNzU4NWQ4ZmUxYjJiZDJlMWFhMmI2NzliMGM4YWIyZDE5ZWUyYjc2OWEzODI0YzVjM2QzMzIzMCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.D6aTGU6LaSPZZyXTTA3eVAKLcAekdjW96CkJq_X-7fs)
Attempting to install a rail bayonet lug on a gun that already has such a lug:
![image](https://private-user-images.githubusercontent.com/7764202/282698487-6620fade-7ce6-48d2-ae6a-6f07b619b99e.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzOTYyNjMsIm5iZiI6MTczOTM5NTk2MywicGF0aCI6Ii83NzY0MjAyLzI4MjY5ODQ4Ny02NjIwZmFkZS03Y2U2LTQ4ZDItYWU2YS02ZjA3YjYxOWI5OWUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxMiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTJUMjEzMjQzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NTcwZDdkM2IzMmJiN2Y0NzU4OTI0NmRlNjEzZjgzOTdhNTg0OWQxYTBhYmJhNTZhNTFkODFmYzcwNzViYmRhOSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.LgKR0YqWqweIqDTr9gXFCcNvn6BtFL5SfvcnHXdBx6Q)
Attempting to install a suppressor on a gun that has a bayonet installed:
![image](https://private-user-images.githubusercontent.com/7764202/282775677-136af43f-ef9d-4b27-b5de-7ab424fabde0.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzOTYyNjMsIm5iZiI6MTczOTM5NTk2MywicGF0aCI6Ii83NzY0MjAyLzI4Mjc3NTY3Ny0xMzZhZjQzZi1lZjlkLTRiMjctYjVkZS03YWI0MjRmYWJkZTAucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxMiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTJUMjEzMjQzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NmQwNzdjZDUyMGI2NmNhMTc3ODQ3M2FmNzBkMTYxOWYxMTNmNGIxZmQyMzg2YzQyM2IwMDQzYjhmMDlhNzkyNCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.DmgDHVynPfXNd2cQhiY_WMVR_XqLBtJRx2evK9vtQvg)
Attempting to install a bayonet on a gun that has a suppressor attached:
![image](https://private-user-images.githubusercontent.com/7764202/282775892-15cf8822-3315-4bae-a819-add627c2e2f9.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzOTYyNjMsIm5iZiI6MTczOTM5NTk2MywicGF0aCI6Ii83NzY0MjAyLzI4Mjc3NTg5Mi0xNWNmODgyMi0zMzE1LTRiYWUtYTgxOS1hZGQ2MjdjMmUyZjkucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxMiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTJUMjEzMjQzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NDIzNmQwYjMxYmY4Y2NkMjc4N2UzNDE3ODg1MjE3NDIwN2FmNWJjOTgyNmFhYzk1YTMxZmRjZWNjM2JlMzA5ZCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.pZ84djoeDkvlpY2oMc6hPShRh_qHENbt329uGUqKrME)
Checked that the migrations are happening correctly with the modified sword, USMC, NG, and Army bayonets.
Additional context
This is a redo of #69335
I'm aware that these exist and have no intention of adding support for them. https://www.thefirearmblog.com/blog/wp-content/uploads/2017/11/538954_10150992389200628_585168848_n.jpg