npctrade: json-ize shop consumption rates #57852
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
github-actions
bot
added
[C++]
andrei8l
force-pushed
the
npctrade-json-consume
branch
from
39d9252 to
39d4dce
Compare
github-actions
bot
added
Code: Tests
andrei8l
force-pushed
the
npctrade-json-consume
branch
from
39d4dce to
d1469e8
Compare
github-actions
bot
added
<Documentation>
andrei8l
force-pushed
the
npctrade-json-consume
branch
2 times, most recently
from
4476fd7 to
2af30f5
Compare
dseguin
reviewed
May 23, 2022
Co-authored-by: David Seguin <[email protected]>
andrei8l
force-pushed
the
npctrade-json-consume
branch
from
2af30f5 to
d8c2952
Compare
github-actions
bot
removed
the
BasicBuildPassed
andrei8l
force-pushed
the
npctrade-json-consume
branch
from
d8c2952 to
cbc8087
Compare
github-actions
bot
added
the
BasicBuildPassed
dseguin
approved these changes
May 24, 2022
|
Thanks for merging! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
None
Purpose of change
Shop consumption rate is hardcoded at 5 units/day
Follow-up from #56720
Fixes: #57688
Describe the solution
JSON-ize consumption rate
TODO (finished)
shop_consumption_rateto a newtype_idso that definitions can be shared across merchants (this embiggened the patch quite a bit)Describe alternatives you've considered
Hardcoding some special cases like in #57689: not flexible and not a good idea in the long term. This patch turned out to be pretty simple so there's no reason to delay until after 0.G
Testing
Test unit
Additional manual testing
Go to an evac center and open the trade UI in intervals of 6 days + 1 second. The utility shelf should not fill up with glass shards and the cabinet should not fill up with Merch.
Additional context
item_group::group_containts_itemdid not check recursively unlikeitem_group::every_possible_item_fromand that looks like an oversight.