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

Made campus levels consistent #74076

Merged
merged 3 commits into from
May 26, 2024
Merged

Conversation

PatrikLundell
Copy link
Contributor

@PatrikLundell PatrikLundell commented May 25, 2024

Summary

None

Purpose of change

  • Prepare for removal of roof adding magic.
  • Fixing errors seen while doing so.

Describe the solution

Find missing roofs and misaligned walls and move them.

Describe alternatives you've considered

Just issue a bug report for the walls.

Testing

  • Hack add_roofs to disable it (to allow me to see where roofs are missing, rather than have the roof adding magic disguise the omissions).
  • Debug spawned a campus.
  • Debug mutated to get the two clairvoyance mutations (Very useful!).
  • Teleported to the campus.
  • Teleported around to look at the consistency between the levels, covering all of the buildings.

Additional context

The campus special spawns essentially empty, i.e. no furniture, items, or monsters, but with a couple of guards. This made it easy to move around. However, I don't know where those things are supposed to come from, so my adjustments may clash with their placements.
Walls were one tile off, so it's not huge areas being shifted, but still. A tree was replaced by a moved wall, for instance.

Wall adjustments were done to the ground floor, as there are more upper floors, so the majority layout won.

Crap! I made this PR from the saltworks branch rather than master. I'll mark it as draft until that PR has been merged (and hope this won't cause a "conflict").

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Crafting / Construction / Recipes Includes: Uncrafting / Disassembling astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels May 25, 2024
@PatrikLundell PatrikLundell marked this pull request as draft May 25, 2024 10:42
@harakka
Copy link
Member

harakka commented May 25, 2024

I don't know where those things are supposed to come from

Nowhere, AFAIK it's a long unfinished location that doesn't appear in the game yet.

@PatrikLundell
Copy link
Contributor Author

Ah, thanks. I guess we can just fix it up then (or remove it, but I guess it could eventually be used).

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 25, 2024
@PatrikLundell PatrikLundell marked this pull request as ready for review May 25, 2024 21:31
@Maleclypse Maleclypse merged commit d5816c0 into CleverRaven:master May 26, 2024
37 of 42 checks passed
@PatrikLundell PatrikLundell deleted the campus branch May 26, 2024 06:10
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 Crafting / Construction / Recipes Includes: Uncrafting / Disassembling [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.

3 participants