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

feat(content): Repave the road to Isherwood Farm #4340

Merged
merged 3 commits into from
Mar 12, 2024

Conversation

Zlorthishen
Copy link
Contributor

@Zlorthishen Zlorthishen commented Mar 12, 2024

Purpose of change

to fix the Isherwood Farm not having a valid road connection, as well as making sure that the internal fields and forests aren't overwritten

Describe the solution

adds the map terrain special_forest, special_forest_thick, and special_field, replaces all old instances in 'Isherwood farm`
adds a road connection to the overmap_special

Describe alternatives you've considered

Testing

spawned several dozen instances of isherwood farms on a locally compiled copy. altered a few things to ensure no strange map_extras get spawned within the farm

Additional context

image

Checklist

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Mar 12, 2024
@Zlorthishen Zlorthishen changed the title feat(content): fix road to Isherwood Farm feat(content): Repave the road to Isherwood Farm Mar 12, 2024
Copy link
Contributor

autofix-ci bot commented Mar 12, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@Zlorthishen Zlorthishen marked this pull request as ready for review March 12, 2024 03:32
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

image

@scarf005 scarf005 merged commit 99d76b6 into cataclysmbnteam:main Mar 12, 2024
11 of 15 checks passed
@Zlorthishen Zlorthishen deleted the road_to_isherwoods_farm branch March 13, 2024 00:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants