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

Jsonify trail's maps #67470

Merged
merged 28 commits into from
Dec 9, 2023
Merged

Jsonify trail's maps #67470

merged 28 commits into from
Dec 9, 2023

Conversation

Procyonae
Copy link
Contributor

@Procyonae Procyonae commented Aug 5, 2023

Summary

Content "More trail variety"

Purpose of change

Hardcode bad
Fixes trailheads not rotating

Describe the solution

Unhardcodes trail maps, doesn't unhardcode placement (May implement in a future PR using #67736)
Adds more trail variety (Though not enough, please suggest more variants for a followup PR)
Adds trail connections to additional appropriate maps
Adds small and large animal dens for groundhogs/hares/foxes/bears

Some of the region settings have been replaced with palettes/overridable nests, look at the included desert mod changes for a basic example of changing the trail terrain and size in accordance to it's old region settings, happily DM/ping me here or on discord if you're confused about that or can't figure out how to override the nests.

Due to the change to fallback predecessor (from what was essentially predecessor forest_thick) the horse farms trail is kinda borked now bc it often spawns on field. The simple solution of making it spawn forest first doesn't work bc it errors at placing two maps at the same coords. Can't think of a good alternative other than making a JSON forest map and using a nest version, replicating forest in JSON isn't ideal though bc it's heavily dependant on region settings iirc.

Describe alternatives you've considered

Adding more nests to forest_trail_intersection

Replacing path dirt with mud rarely in swamps to make them more different but I want to make changing the path terrain piss easy for modders so I'd rather not

Testing

Tele'd around lots

Additional context

Screenshots

image

image

image

image

image

image

image

image

image

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Code: Tests Measurement, self-control, statistics, balancing. [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [Markdown] Markdown issues and PRs Mods: Desert Region Anything relating to the Desert Region mod labels Aug 5, 2023
src/mapgen.cpp Outdated Show resolved Hide resolved
src/mapgen.cpp Outdated Show resolved Hide resolved
src/mapgendata.cpp Outdated Show resolved Hide resolved
src/mapgendata.cpp Outdated Show resolved Hide resolved
src/mapgendata.cpp Outdated Show resolved Hide resolved
src/mapgendata.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions Mods: Aftershock Anything to do with the Aftershock mod Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: No Hope Relating to the mod No Hope Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. labels Aug 5, 2023
@github-actions github-actions bot requested a review from Night-Pryanik August 5, 2023 23:10
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-requesting reviews from non-collaborators: @I-am-Erk

@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Aug 5, 2023
@Procyonae Procyonae changed the title Json trail's maps Jsonify trail's maps Aug 5, 2023
@Procyonae Procyonae marked this pull request as draft August 6, 2023 01:39
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 6, 2023
data/json/mapgen/nested/aux_nested.json Outdated Show resolved Hide resolved
data/json/mapgen/trail/forest_trail_end.json Outdated Show resolved Hide resolved
@github-actions
Copy link
Contributor

github-actions bot commented Aug 6, 2023

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • A small den that burrowing animals such as groundhogs or hares call home.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Aug 6, 2023
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 4, 2023
@Procyonae Procyonae marked this pull request as ready for review October 4, 2023 16:36
@Procyonae
Copy link
Contributor Author

I have a minor commit to do before this gets merged I just want to let the tests finish first

@Maleclypse
Copy link
Member

I have a minor commit to do before this gets merged I just want to let the tests finish first

Just let me know when it's ready. In discord if possible. if not @ me here.

@Maleclypse
Copy link
Member

I hope you come back to this. It's pretty cool!

@Maleclypse
Copy link
Member

You asked for bugs, here is a tiny one :)

@Procyonae
Copy link
Contributor Author

This wants more variation but it's better than what we have now at least

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` Code: Tests Measurement, self-control, statistics, balancing. <Documentation> Design documents, internal info, guides and help. 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 [Markdown] Markdown issues and PRs Mods: Aftershock Anything to do with the Aftershock mod 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants