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

fix: bike stores #4026

Merged
merged 3 commits into from
Dec 30, 2023
Merged

fix: bike stores #4026

merged 3 commits into from
Dec 30, 2023

Conversation

0Monet
Copy link
Contributor

@0Monet 0Monet commented Dec 30, 2023

Purpose of change

Use roof_palette for bike stores roof.
Fix an incorrect id in multitile_city_buildings causes one of the bike stores to appear without its roof.
Change the ladder in bike store 1 to a staircase, because a staircase is used on his roof.

Describe the solution

JSON changes.

Describe alternatives you've considered

none

Testing

  1. Go into town.
  2. Both bike stores appear without problem.

Additional context

"s_bike_shop_1":
image1

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Dec 30, 2023
Copy link
Contributor

autofix-ci bot commented Dec 30, 2023

The Autofix app has found code style violation and automatically formatted this Pull Request.

I locally edit my commits (e.g: git, github desktop)

Please choose following options:

I'd like to accept the automated commit
  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.

This PR is complete and I don't want to edit it anymore

It's safe to ignore this message.

I edit this PR through web UI

You can ignore this message and continue working.

I have no idea what this message is talking about

You can ignore this message and continue working. If you find any problem, please ask for help and ping @scarf005.

@chaosvolt chaosvolt merged commit 1f24950 into cataclysmbnteam:main Dec 30, 2023
9 checks passed
@0Monet 0Monet deleted the fix_bike_store branch December 30, 2023 17:51
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