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

Migrate/obsolete incongruent Leadworks, EBR, and Rivtech guns #37979

Merged
merged 8 commits into from
Mar 8, 2020

Conversation

tenmillimaster
Copy link
Member

Summary

SUMMARY: Content "migrates+obsoletes firearms incongruent with lore"

Purpose of change

Leadworks largely takes a leaf from the XM8 program, which sought to integrate modularity into a service rifle, but not at a user level. The rifles, and other similar built-in-mod guns have not seen success in real life as they are purported to have done so in-game.
The RM360 describes an entirely fictional .22 LR gatling gun, which would be available to SOT's only. Seeing as it is mostly a range toy, I doubt a serious company would build such a thing and market it.
The Mosin EBR kits have been obsoleted by the mounting furniture gunmods.

Describe the solution

Obsoletes or migrates items in question. Redefines LW-Feed, obsoleted, to work with Stanags instead of migrated items. Backup revolver is obsoleted, to either be later migrated to an AR pistol or a single-shot 223 PAR-1.
460 guns migrated to a .460 1911, magazines altered to accept them.

Describe alternatives you've considered

Obsoleting .460 guns and adding 1911 later.
That whole leadworks western gun company I was suggesting, but that's still a lot of mental gymnastics.
Pretending that the XM8 was actually successful.

Testing

Loaded mainline. Loaded generic guns. Checked to make sure everything still migrated correctly. Figuring out how to handle migration/blacklisting in GG was a bit of a bear, but I managed.
premigration
postmigration

Additional context

Generic guns has a potential load error- I have accidently re-used the abstract item ID pistol_revolver for the generic guns police revolver. Fix to come.

@I-am-Erk
Copy link
Member

I do really want to bring Rivtech back with some other items. We should look into having them on item description snippets and things

@tenmillimaster
Copy link
Member Author

I do really want to bring Rivtech back with some other items. We should look into having them on item description snippets and things

I haven't removed any Rivtech guns in their caseless families.

@I-am-Erk
Copy link
Member

Ah good

@ifreund ifreund added <Bugfix> This is a fix for a bug (or closes open issue) <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Ranged Ranged (firearms, bows, crossbows, throwing), balance, tactics labels Feb 13, 2020
@anothersimulacrum
Copy link
Member

The items that no longer exist are still on blacklists in mods, and need to be removed, because it's causing the tests to fail.

@kevingranade
Copy link
Member

I have those fixes locally, I think I'll push this and then push my fixes afterwards.

@kevingranade kevingranade merged commit 7947513 into CleverRaven:master Mar 8, 2020
@tenmillimaster tenmillimaster deleted the rm360isnuts branch March 8, 2020 08:30
@tenmillimaster tenmillimaster restored the rm360isnuts branch March 8, 2020 19:43
Soup-de-Loop added a commit to Soup-de-Loop/Cataclysm-DDA that referenced this pull request Mar 13, 2020
Removes the guns that were removed as per CleverRaven#37979 - to note, tavor_12 was migrated in item but not ID to avoid save compatibility, but is now rectified.
Soup-de-Loop added a commit to Soup-de-Loop/Cataclysm-DDA that referenced this pull request Apr 17, 2020
Removes the guns that were removed as per CleverRaven#37979 - to note, tavor_12 was migrated in item but not ID to avoid save compatibility, but is now rectified.
Soup-de-Loop added a commit to Soup-de-Loop/Cataclysm-DDA that referenced this pull request May 12, 2020
Removes the guns that were removed as per CleverRaven#37979 - to note, tavor_12 was migrated in item but not ID to avoid save compatibility, but is now rectified.
@tenmillimaster tenmillimaster deleted the rm360isnuts branch February 27, 2024 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Ranged Ranged (firearms, bows, crossbows, throwing), balance, tactics
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants