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

Fixing reload_furniture to allow reloading with ammo other than the default #72703

Merged

Conversation

katemonster33
Copy link
Contributor

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

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 29, 2024
@RenechCDDA
Copy link
Contributor

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

@katemonster33
Copy link
Contributor Author

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

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

@katemonster33 katemonster33 force-pushed the reload_furniture_multi_ammo_types branch from 5c9ed5f to 4c93ca2 Compare March 31, 2024 23:12
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Player Faction Base / Camp All about the player faction base/camp/site labels Mar 31, 2024
@katemonster33
Copy link
Contributor Author

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

@katemonster33
Copy link
Contributor Author

sorry, triple-post... furniture should only take single ammo type now

@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 31, 2024
Copy link
Contributor

@RenechCDDA RenechCDDA left a 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!

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 2, 2024
@I-am-Erk I-am-Erk added the 0.H Backport PR to backport to the 0.H stable release canddiate label Apr 4, 2024
@I-am-Erk I-am-Erk merged commit d87104f into CleverRaven:master Apr 4, 2024
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.H Backport PR to backport to the 0.H stable release canddiate astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Player Faction Base / Camp All about the player faction base/camp/site
Projects
None yet
Development

Successfully merging this pull request may close these issues.

clay kiln and rock forge makes coal (not charcoal) disappear
4 participants