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

Cleanup office tower, room dividers #63054

Merged

Conversation

LovamKicsiGazsii
Copy link
Contributor

@LovamKicsiGazsii LovamKicsiGazsii commented Jan 9, 2023

Summary

Content "Office tower cleanup, updates office nesteds, adds room dividers"

Purpose of change

I came to cleanup office_tower.json and office_nested.json, and stayed to overhaul the short office tower.

Describe the solution

office nested chunks:

  • gave them more descriptive names — even I forgot what the old names were supposed to mean
  • moved things around so that nested chunks with a similar purpose are now next to each other
  • removed redundant rotation values
  • removed floors and brick walls for added compatibility
  • shrank some nested chunks to remove unused space
  • added a microwave and a coffee maker to the breakroom chunk
  • replaced walls with new furniture: room dividers — this should increase the 'officey' feel of the two versions
  • minor reworks for a few nested chunks
  • replaced random counters with desks
  • fixed swivel chair placements

Large office tower:

  • removed useless solid earth, as mentioned in 2x2 apartment tower has useless solid rock inside it #58162
  • moved nested lists (about 280 lines) to the palette
  • replaced hardwood flooring with linoleum to further differentiate the two versions
  • added SUS item groups
  • replaced place_monsters with monster, place_vehicles with vehicles
  • replaced uncomfortable lobby benches with sofas
  • added proper elevator controls
  • repalettized roof to use the dedicated roof palette, also fixed roof nested chunks

Office tower:

Describe alternatives you've considered

Adding room dividers to a couple more locations.

Testing

Debug-spawned multiple times to check if nested chunks spawn alright.

Additional context

Screenshots:

Nested chunks are highlighted.

Office building:
kép

Office tower:
kép

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. 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 labels Jan 9, 2023
@Night-Pryanik
Copy link
Contributor

Should this close #58152?

@LovamKicsiGazsii
Copy link
Contributor Author

Should this close #58152?

Do you mean #58162? AFAIK the apartments still have those soil walls, so the issue is not yet resolved.

@Night-Pryanik
Copy link
Contributor

Ok, got it.

@github-actions github-actions bot added Mods Issues related to mods or modding Mods: Xedra Evolved Anything to do with Xedra Evolved labels Jan 10, 2023
Copy link
Member

@Maleclypse Maleclypse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I appreciate it. Any cleanup you want to do to the Xedra Office is great. I'm not great at mapgen.

@LovamKicsiGazsii
Copy link
Contributor Author

I appreciate it. Any cleanup you want to do to the Xedra Office is great. I'm not great at mapgen.

For another PR, sure.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 11, 2023
@ZhilkinSerg ZhilkinSerg merged commit db6ab81 into CleverRaven:master Mar 2, 2023
@LovamKicsiGazsii LovamKicsiGazsii deleted the office-tower-overhaul branch March 2, 2023 10:40
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 Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [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 Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants