basecamps: add support for automatic calculation of blueprint ingredients #31209
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
mlangsdorf
added
[C++]
|
jenkins rebuild |
ifreund
reviewed
Jun 7, 2019
There was a problem hiding this comment.
This is pretty cool.
I may have missed something in get_changed_ids_from_update() as I'm not too familiar with the map/mapgen code, but the rest of it looks good to me. No awesome ways to make things way faster/cleaner came to mind while reading this, though I'll continue to cogitate on it.
Mostly minor suggestions, sorry that the review is a little disorganized/out of order.
mlangsdorf
force-pushed
the
modular_basecamps_autocalc
branch
2 times, most recently
from
9ea675f to
cc9c484
Compare
|
thanks for the review, changes made. |
ifreund
reviewed
Jun 7, 2019
mlangsdorf
force-pushed
the
modular_basecamps_autocalc
branch
from
cc9c484 to
cd2b7aa
Compare
basecamps should be able to autocalculate their upgrade build time and requirements. For that to happen, all common terrain constructions need to have a construction definition, but some constructions, like deep and shallow pits, are not meant to be selectable by the user. add the concept of a hidden construction, and add definitions for the shallow pit and deep pit construction.
add a new "blueprint_autocalculate" field to blueprint recipes. When it is present, recipe::finalize calls a function that: 1. calls a mapgen_update function that creates a tinymap of dirt, applies the blueprint mapgen_update to that tinymap, and then returns maps of all the non-dirt ter_ids and furn_ids to their respective counts. 2. then passes those maps to function in construction that takes all those ter_ids/furn_ids, finds the construction(s) that result in those ids, and then returns a map of requirement_ids to counts of those requirements. 3. those requirements are then added to the reqs_internal and resolved normally. 4. one more function then eliminates any duplicated tools or qualities and consolidates similar components.
mlangsdorf
force-pushed
the
modular_basecamps_autocalc
branch
from
cd2b7aa to
277c63e
Compare
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
SUMMARY: Infrastructure "basecamps: add support for automatic calculation of blueprint ingredients"Purpose of change
Part of #31115
Add a way to have construction blueprints calculate their resource requirements from the underlying construction tasks. Doing this makes it easier to add new basecamp upgrades, since you don't have to figure out how long it takes to build things, and guarantees that basecamp construction requirements will stay in sync with any changes to construction.json.
Describe the solution
Create construction definitions for the shallow pit and deep pit, but add a new "on_display" keyword to constructions and set it to false for those pits. Constructions with
"on_display": falseare never displayed to the player and cannot be constructed.add a new "blueprint_autocalculate" field to blueprint recipes. When it is present, recipe::finalize calls a function that:
Describe alternatives you've considered
This was extremely complicated to write. I tried to optimize it with some std:: functions, but got confused and wrote it as simple and stupid as I could. Better optimization suggestions would be appreciated.
Additional context
Part of #31115