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

Improve place_nested: Fuzzy neighbor matching and an else option #24431

Merged

ZhilkinSerg merged 1 commit into CleverRaven:master from BrianLefler:nested_neighbors_improvements

Jul 23, 2018

Contributor

BrianLefler commented Jul 23, 2018 •

edited

"chunks" are placed if neighbors match, and "else_chunks" otherwise.
Neighbor now matches a substring ("lab" matches "ice_lab" & "lab_stairs")

This was used to fix-up lab json to better handle non-lab segments.

We used to try to match on empty_rock to decide to place border walls.
Now we match on "lab", and put border walls via else when there's no lab.
As a result, we correctly handle being next to subways, ant hives, etc.
The newly created is_ot_subtype() was also used to improve the lab mapgen.cpp.


      Improve place_nested: Allow more generous neighbor matching and an el…

…se option.

- "chunks" are placed if neighbors match, and "else_chunks" otherwise.
- Neighbor now matches a substring ("lab" matches "ice_lab" & "lab_stairs")

This was used to fix-up lab json to better handle non-lab segments.
- We used to try to match on empty_rock to decide to place border walls.
- Now we match on "lab", and put border walls in the else place.
- As a result, we correctly handle being next to subways, ant hives, etc.
- The newly created is_ot_subtype was also used to improve the lab mapgen.cpp.

d59ed4e

ZhilkinSerg merged commit `56a2166` into CleverRaven:master Jul 23, 2018
4 checks passed

4 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded

Details

continuous-integration/travis-ci/pr The Travis CI build passed

Details

coverage/coveralls Coverage decreased (-0.2%) to 22.75%

Details

gorgon-ghprb Build finished.

Details

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

You can’t perform that action at this time.