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

Rural road refactor #72431

Merged
merged 1 commit into from
Mar 22, 2024
Merged

Conversation

Procyonae
Copy link
Contributor

@Procyonae Procyonae commented Mar 16, 2024

Summary

None

Purpose of change

Rural/dirt road should use linear ids (which will also allow them to be used for custom connections if I ever get around to making #67736 work)
Rural road and dirt road are very similar other than one using gravel
Rural road forest and dirt road forest are identical to their counterparts other than predecessor but currently redefine the same maps
Less JSON to maintain good

Describe the solution

Uses a special scoped parameter to choose between gravel and soil road
Rural road maps have been removed in favour of the more widely used dirt_road ones
dirt_road and dirt_road_forest ids have been migrated to rural_road and rural_road_forest respectively
rural_road ids have been migrated to linear ids
The maps are all in their own new file because they make up a large amount of farm_lots.json and aren't specific to farms

Describe alternatives you've considered

Some drives and other connections probably want to use nests with the palette to fit nicely with the new parameter but this is already pretty big

Testing

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Scenarios New Scenarios, balancing, bugs with scenarios <Bugfix> This is a fix for a bug (or closes open issue) <Enhancement / Feature> New features, or enhancements on existing Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Info / User Interface Game - player communication, menus, etc. astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Mar 16, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 16, 2024
@Procyonae Procyonae marked this pull request as draft March 21, 2024 10:39
@Procyonae Procyonae marked this pull request as ready for review March 21, 2024 12:03
@Maleclypse Maleclypse merged commit eb08ea0 into CleverRaven:master Mar 22, 2024
36 of 42 checks passed
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) Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Crafting / Construction / Recipes Includes: Uncrafting / Disassembling <Enhancement / Feature> New features, or enhancements on existing Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Info / User Interface Game - player communication, menus, etc. [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 Scenarios New Scenarios, balancing, bugs with scenarios
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants