Cataclysm-DDA
Cataclysm-DDA copied to clipboard
Json subway
Summary
Content "Altered subway maps"
Purpose of change
Hardcode bad Fixes #66220 Fixes #68957 Fixes #69789 Fixes #69821
Describe the solution
- Subway stations can spawn in any direction
- Adds ramps that connect the z-2
subwayto the z-4lab_subway - Removes
sewer_connectorandmicrolab_sub_connectorand replaces them with connections - Allows
city_buildings to use connections
Describe alternatives you've considered
Changing/balancing monster spawns Making lab stations on z-2 more obscured (looking out the window and seeing a reinforced door guarded by turrets and guards would probably raise eyebrows :^) ) Moving all lab stations to z-4 Making lab_subway use small rails Changing subway to be 1 rail w/ passing places etc
Testing
Additional context
~~Requires #67736 for the full scope I want to achieve~~ #67736 will make the subway spawns more sensical but this is still an upgrade on what we have so I'll just do this first. Basically the connections have some hardcoded stuff only designed for roads so you get silliness like subways pathing to dead ends under the centre of cities which causes them to often not be fully interconnected within an OM.
Still to do:
- [ ] Stair alignment on z-2
- [ ] Nests for long diagonal sections (it would help if I remembered what past me meant by this)
- [ ] Make tee cross depend on neighbours (same for ends and straight)
- [ ] Deal with the palette
- [ ] Add screenshots of everything
- [ ] Check new maps are sprite friendly
- [ ] Make vehicle turning code work with altered maps
- [ ] Maintenance entrance to sewers from z-1 subway station
In a followup PR (this was all intended for this PR originally but I want it merged sooner):
- [ ] Improve mall + hub 01 + microlab_sub_station + central_lab_train_depot + underground_lab_cargo_stationA stations
- [ ] Station variation + beautification
- [ ] Vent shaft nest that appears at random
Possibly in a followup PR:
- [ ] A region setting controlled vent nest above each subway at regular intervals when there's nothing in the way, placed after all other mapgen
- [ ] Add non-guarenteed stations for a few maps like the stadium/mines
This is sick. Thanks for working on this!
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.
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.
Conflicts and astyle
Not done I just want to run the tests
This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there:
https://discourse.cataclysmdda.org/t/attempting-to-mod-subway-system/29147/2