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 3: Support mapgen parameters in nests #50681

Merged
merged 8 commits into from Aug 13, 2021

Commits on Aug 12, 2021

  1. weighted_list::to_debug_string

    Allow dumping a weighted list to a string for debug purposes.
    jbytheway committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    6c97a28 View commit details
    Browse the repository at this point in the history
  2. Overwrite mapgen args when placing special

    Previously when placing an overmap special on top of an existing overmap
    special (e.g. via the debug menu) the parameters for the old one would
    persist and the new one would lack its parameters.  Instead, overwrite
    the old with the new.
    jbytheway committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    e8fc580 View commit details
    Browse the repository at this point in the history
  3. Support mapgen parameters in nested mapgen

    We want mapgen parameters to work inside nested mapgen, at all scopes.
    To make this work we lift all parameters from nests to overmap terrains
    before lifting again from overmap terrains to overmap specials.
    
    At mapgen time, the arguments chosen for these parameters cascade down
    in the opposite direction.
    jbytheway committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    1614db3 View commit details
    Browse the repository at this point in the history
  4. Pass nest-scoped arguments to nest mapgen

    A simple bugfix.  Previously we were generating these arguments but not
    passing them.
    jbytheway committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    2ba0d1b View commit details
    Browse the repository at this point in the history
  5. Better debug output for inconsistent distributions

    State the two distributions so that it is easier to figure out where
    each is coming from and why they are conflicting.
    jbytheway committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    d9b495d View commit details
    Browse the repository at this point in the history
  6. Randomize nested carpets in house_w_palette

    Use the new functionality of mapgen parameters in nests to choose a
    random colour of carpet for each carpet used in a nested mapgen using
    house_w_nest_palette.
    
    Previously there was a separate symbol for each carpet colour but only 6
    (red carpet) was ever used.  Remove the unused symbols and repurpose 6
    to mean "random carpet".  Make the parameter of nest scope so each nest
    can choose a carpet colour independently.
    jbytheway committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    f2a5f57 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    87ae6fa View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2021

  1. Configuration menu
    Copy the full SHA
    2a9239c View commit details
    Browse the repository at this point in the history