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 ammotypes of guns, magazines, and mods #37746

Merged
merged 3 commits into from
Feb 19, 2020

Conversation

ifreund
Copy link
Contributor

@ifreund ifreund commented Feb 6, 2020

Summary

SUMMARY: Bugfixes "Migrate ammotypes of guns, magazines, and mods."

Purpose of change

Right now ammotype compatibility is not migrated properly. This can be demonstrated by creating a world with generic guns and wishing for a mark 19 grenade launcher, which crashes the game.

Describe the solution

Essentially migrate ammotype compatibility and default ammo.

Testing

Wishing for a mark 19 grenade launcher now works. The gunblade from magiclysm is now compatible with generic guns as well.

Additional context

This isn't 100% finished yet, it still triggers a handful of "magazine does not take compatible ammo" errors on load which I haven't been able to track down yet.

@ifreund ifreund added Items: Magazines Ammo holding items and objects. [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mods: Generic Guns Anything to do with Generic Guns labels Feb 6, 2020
@ifreund ifreund marked this pull request as ready for review February 6, 2020 12:32
@ifreund ifreund force-pushed the ammo-migration-fix branch from b6ed82d to d1d1881 Compare February 6, 2020 12:37
@ifreund
Copy link
Contributor Author

ifreund commented Feb 6, 2020

Realized that I forgot to leave a comment earlier today when I finished this. It now migrates magazine type compatibility as well as ammo type compatibility. The game loads without error with and without generic guns enabled. I failed to find anything amiss in game, the crash from the wish menu and dysfunctional magiclysm gunblade are both fixed. This ended up requiring a few json bugfixes as well which this new code brought to light.

I-am-Erk pushed a commit that referenced this pull request Feb 9, 2020
* Fix Magiclysm guns showing with Generic Guns active

* Revert gunblade migration in favor of #37746
@ZhilkinSerg ZhilkinSerg merged commit f98c67d into CleverRaven:master Feb 19, 2020
@ifreund ifreund deleted the ammo-migration-fix branch February 19, 2020 20: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) [C++] Changes (can be) made in C++. Previously named `Code` Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Magazines Ammo holding items and objects. Mods: Generic Guns Anything to do with Generic Guns
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants