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

Conditional nest predecessor check for subway and trail map unhardcoding #67648

Merged
merged 2 commits into from
Aug 16, 2023

Conversation

Procyonae
Copy link
Contributor

@Procyonae Procyonae commented Aug 13, 2023

Summary

None

Purpose of change

Being able to test for underlying predecessors will allow me to select appropriate nests/foliage for trails in #67470 depending on whether they're in swamp/forest/forest_thick and also help with the way I want to do sub stations with a partial subway unhardcoding I'm doing

Describe the solution

Adds a check in the same vain as the others but that only checks the map itself rather than it's neighbors
Adds documentation

Describe alternatives you've considered

Testing

Checked it worked using some simple nests like this one on road_straight "place_nested": [ { "chunks": [ "24x24_fence1" ], "x": 0, "y": 0, "predecessors": [ "field" ] } ]
image
Also tested match type ( and that nests still spawn elsewhere >-< )

Additional context

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. Map / Mapgen Overmap, Mapgen, Map extras, Map display [C++] Changes (can be) made in C++. Previously named `Code` [Markdown] Markdown issues and PRs labels Aug 13, 2023
src/mapgen.cpp Outdated Show resolved Hide resolved
src/mapgen.cpp Outdated Show resolved Hide resolved
src/mapgen.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Aug 13, 2023
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Aug 14, 2023
@Maleclypse Maleclypse merged commit 65f2ea4 into CleverRaven:master Aug 16, 2023
@Procyonae Procyonae mentioned this pull request Oct 4, 2023
Procyonae added a commit to Procyonae/Cataclysm-DDA that referenced this pull request Oct 4, 2023
Maleclypse pushed a commit that referenced this pull request Dec 9, 2023
* Initial JSON stuff

* Initial C++ stuff

* Making a mess of changing types as per usual

* More sensible way

* Fixes trailhead rotation and removes obsoleted regional settings

* Moves test_regions.json into the test mod

* Add width offset accidently 1 too high

* Removes obsoleted region_settings documentation

* Remembered I'm making the width is purposefully larger for easy mod changes

* Adds probably too many items

* All repo mod support?

* Oblige the clang overlords

* Some variants

* Linted

* Update dictionary.txt

* Changes the variants to nests for modding

* Rework forest_trail_intersection for new trail

* A few more variants

* Flag corrections

* Correct the merge

* Implements #67648 and rejigs the palette to make modding easier (hopefully)

* Weight variants

* File reorganisation

* Minor weight change to bump tests

* Changes weights, adds a temp fix for the horse farm
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 [C++] Changes (can be) made in C++. Previously named `Code` <Documentation> Design documents, internal info, guides and help. json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display [Markdown] Markdown issues and PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants