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
Fixing reload_furniture to allow reloading with ammo other than the default #72703
Fixing reload_furniture to allow reloading with ammo other than the default #72703
Conversation
Still looking for this to restrict loading to a single ammotype at a time, don't know if you can easily merge Nornagon's commits from #72743 |
… being loaded at once.
working on it, there's a lot of moving parts with nornagon's PR and I'm trying to figure out what parts of mine can be kept |
5c9ed5f
to
4c93ca2
Compare
also i rebased with nornagon's change. since the code changes seemed very different i just took the JSON change. hope that's ok @nornagon |
sorry, triple-post... furniture should only take single ammo type now |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good now, thanks for the hard work!
Summary
Bugfixes "Fixes issue where loading a forge with coal does not work"
Purpose of change
Fixes: #68371
Describe the solution
reload_furniture in iexamine.cpp was modified to look at multiple ammo types for a single object. this involves taking into account situations where, in the case of the forge, it could be 40% full of charcoal, and the user wants to put coal in, we need to calculate how much coal they can load it with.
Describe alternatives you've considered
Testing
loaded save linked in issue, deposited coal into forge, see that the game prompts me on subsequent calls to reload_furniture to unload said coal
Additional context