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

JSON sewer mapgen #64793

Merged
merged 4 commits into from
Apr 4, 2023
Merged

Conversation

LovamKicsiGazsii
Copy link
Contributor

Summary

Content "Sewer mapgen overhaul"

Purpose of change

Map extras were a rather restrictive way of adding decor to sewers. For one there was no differentiation between curved, straight or fourway sewer tiles which prevented me from adding walls. Same goes for pipes and walkways; how I attempted to solve it was branch them out in all directions, hoping that they'd connect with a neighboring tile. The technique started show its faults after a while.

Fixes #58404 (I hope)
Partially addresses #62747

Describe the solution

Removed sewer map extras and replaced them with regular JSON mapgen. These maps take sewer shape into account, making connected walls, pipes and walkways possible. As an added bonus, this also frees up slots for new sewer extras.

I also edited locations with sewer accesses to have a seamless connection with the new design.
Dehardcoded manhole ladder placements for the extra flexibility.

Describe alternatives you've considered

Removing hardcoded mapgen. Not sure how to do that.

Testing

Auto-walked through what felt like 500 map tiles of sewers. I also checked individual variants by inflating their weights and guaranteeing nested chunk placements.

Additional context

Screenshots:

kép

kép

kép

@NetSysFire
Copy link
Member

As the author of #58404, yes this fixes it. Very nice work!

@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` [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 astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Apr 2, 2023
@github-actions github-actions bot added Mods Issues related to mods or modding Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: Desert Region Anything relating to the Desert Region mod Mods: No Hope Relating to the mod No Hope Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. BasicBuildPassed This PR builds correctly, label assigned by github actions labels Apr 3, 2023
@Rivet-the-Zombie Rivet-the-Zombie merged commit 0106b1d into CleverRaven:master Apr 4, 2023
@LovamKicsiGazsii LovamKicsiGazsii deleted the json-sewer branch April 4, 2023 10:45
@Procyonae Procyonae mentioned this pull request Jul 27, 2023
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 <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` 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: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: Desert Region Anything relating to the Desert Region mod Mods: No Hope Relating to the mod No Hope Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Proper sewer mapgen
3 participants