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

Added roofs to farm expansion 1 #73919

Merged
merged 1 commit into from
May 19, 2024
Merged

Conversation

PatrikLundell
Copy link
Contributor

Summary

None

Purpose of change

Add explicit roofs to farm expansion 1 rather than relying on magic.

Describe the solution

  • Update the acadia palette to contain the roofs specified for all the elements within it that specify roofs.
  • Add the same roof components to the farm 1 constructions that should have roofs as the magic should provide.

Describe alternatives you've considered

  • Change the roof to be consistent rather than retain exactly the same roof collage resulted from the previous auto roof selection.

Testing

  • Hacked CDDA to comment out the roof adding magic from update_map.
  • Commented out the first roof section placement from the JSON.
  • Built the expansion and the first part of the shack.
  • Teleported onto a roof and verified that no roof was generated on the shack.
  • Restored the missing roof section to the JSON and restarted the game.
  • Built the expansion and all three shack sections providing roof components.
  • Teleported up onto the roof and verified it looks like I would expect.
  • Restored the code.
    Screenshot (366)

Additional context

@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 19, 2024
@dseguin dseguin merged commit d8e93ec into CleverRaven:master May 19, 2024
23 of 26 checks passed
@PatrikLundell PatrikLundell deleted the farm1 branch May 19, 2024 18:44
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.

None yet

2 participants