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

Fix house_08 mapgen errors #57618

Merged
merged 1 commit into from
May 11, 2022

Conversation

dseguin
Copy link
Member

@dseguin dseguin commented May 10, 2022

Summary

None

Purpose of change

It looks like #57446 introduced some mapgen issues. This is causing CI tests to fail when the No Hope mod is loaded.

Examples of failed GHA runs:

https://github.com/CleverRaven/Cataclysm-DDA/runs/6378274579
https://github.com/CleverRaven/Cataclysm-DDA/runs/6378882185

Describe the solution

Use palette definitions, mainly using the same definitions as the existing house_08 OMT (standard_domestic_palette and standard_domestic_palette_abandoned).

I also moved the new terrain and furniture defs to a separate palette for consistency.

Describe alternatives you've considered

Testing

Ran the offending test:

./tests/cata_test --rng-seed time --mods=dda,no_hope '~*'

Additional context

(How did the original PR pass all tests?)

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display 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 May 10, 2022
@Rivet-the-Zombie Rivet-the-Zombie merged commit c1e2b3c into CleverRaven:master May 11, 2022
@dseguin dseguin deleted the fix_house08_mapgen branch May 11, 2022 05:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants