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 private resort #63327

Merged
merged 5 commits into from
Mar 2, 2023
Merged

Conversation

LovamKicsiGazsii
Copy link
Contributor

@LovamKicsiGazsii LovamKicsiGazsii commented Jan 29, 2023

Summary

Content "Private resort cleanup, mapgen changes"

Purpose of change

Continues mapgen cleanup project.
The private resort was a rather egregious case, the size of private_resort.json was reduced from 1622 lines to 526 lines.
Plays a part in #62747.

Describe the solution

Cleanup & optimizations:

  • manually merged maps
  • optimized palettes
  • fixed remaining terrain issues
  • replaced map symbols with more conventional ones
  • repalettized the roof to use the standard roof palette
  • replaced place_vehicles with vehicles, place_monsters with monster, and most of place_items with items

Map updates:

  • reworked lobby to be less claustrophobic, removed employee showers, added a cloakroom
  • reworked ground-level bathrooms
  • reworked diner & kitchen area
  • reworked offices and storage area
  • added a changing room for the pool
  • made the gambling hall accessible without having to enter employee areas
  • reworked guest rooms, sanity checks on the number of dressers per room
  • migrated & expanded the second-floor bar
  • fixed courtyard roofs
  • replaced guardrails with railings
  • landscaping the parking lot and courtyard to make it look fancier

Describe alternatives you've considered

None.

Testing

Debug-spawned in the world.

Additional context

Screenshots:

kép
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 Vehicles Vehicles, parts, mechanics & interactions astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jan 29, 2023
same as vanilla, except that vending machines are always empty, loot is no longer guaranteed, cars have status 1
@github-actions github-actions bot added Mods Issues related to mods or modding Mods: No Hope Relating to the mod No Hope labels Jan 29, 2023
@Night-Pryanik
Copy link
Contributor

It seems you have removed weight: 100000 from No Hope variant? Or I'm looking in the wrong direction?

@LovamKicsiGazsii
Copy link
Contributor Author

It seems you have removed weight: 100000 from No Hope variant? Or I'm looking in the wrong direction?

Oh, right. Completely forgot about that. I also just realized how lootable works, I'll be fixing that as well.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 29, 2023
@Night-Pryanik
Copy link
Contributor

Also, just a note for the future: all cars' status in No Hope mod is handled via external option, so there's no need to manually set their statuses.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 1, 2023

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@github-actions github-actions bot added the stale Closed for lack of activity, but still valid. label Mar 1, 2023
@ZhilkinSerg ZhilkinSerg merged commit 38e84b3 into CleverRaven:master Mar 2, 2023
@LovamKicsiGazsii LovamKicsiGazsii deleted the resort 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: No Hope Relating to the mod No Hope Mods Issues related to mods or modding stale Closed for lack of activity, but still valid. Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants