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

Parametric mapgen part 8: Support mapgen parameters for more mapgen ids #51076

Merged
merged 3 commits into from
Aug 27, 2021

Conversation

jbytheway
Copy link
Contributor

Summary

Infrastructure "Brief description"

Purpose of change

Continuing the work of #50853. After that PR, there were five remaining things to have mapgen_value support added to them.

Describe the solution

This PR completes three of them:

  • jmapgen_gaspump's fuel type
  • jmapgen_monster's monster ids
  • jmapgen_sealed_item's furniture id

Ancillary changes needed for this:

  • Fuel type is now an itype_id rather than simply a string.
  • The monster and sealed item sanity checking code had to change quite a bit.

Describe alternatives you've considered

Doing this as more or fewer PRs.

Testing

I caused the generation of at least one OMT featuring each type changed (military helipad for the gaspump, lab basement for the monster placement, farm field for the sealed_item). They all seemed to work as expected.

Additional context

Two things remain to be ported and are put off again to a future PR:

  • jmapgen_item_group's item group
  • jmapgen_loot's result_group

They will be the most complicated ones to deal with.

This entailed migrating the fuel type from a std::string to an itype_id.
Switch the furniture specified in jmapgen_sealed_item to be a
mapgen_value.
@actual-nh actual-nh added [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Map / Mapgen Overmap, Mapgen, Map extras, Map display <Enhancement / Feature> New features, or enhancements on existing labels Aug 25, 2021
@ZhilkinSerg ZhilkinSerg merged commit 1f102d3 into CleverRaven:master Aug 27, 2021
@jbytheway jbytheway deleted the even_more_mapgen_values branch August 27, 2021 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style <Enhancement / Feature> New features, or enhancements on existing Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants