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: pizza parlor #4035

Merged
merged 3 commits into from
Dec 31, 2023
Merged

fix: pizza parlor #4035

merged 3 commits into from
Dec 31, 2023

Conversation

0Monet
Copy link
Contributor

@0Monet 0Monet commented Dec 31, 2023

Purpose of change

Use "roof_palette" for "s_pizza_parlor_roof".
Remove "weight" from "s_pizza_parlor_roof", "s_pizza_parlor_roof_1".
Create two nested mapgen to make the floor under the kitchen furniture in "s_pizza_parlor" look good.

Describe the solution

JSON changes.

Describe alternatives you've considered

Do nothing.

Testing

  1. Go to the pizza parlor.
  2. Mapgen nested are placed and no visible problems.

Additional context

Before:
image1
After:
image2
After without nested mapgen:
image3

@github-actions github-actions bot added the data PRs related to datas. Won't crash game (probably) label Dec 31, 2023
Copy link
Contributor

autofix-ci bot commented Dec 31, 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.

@scarf005 scarf005 self-requested a review December 31, 2023 15:24
@scarf005 scarf005 self-assigned this Dec 31, 2023
@scarf005
Copy link
Member

image
image
LGTM

@scarf005 scarf005 merged commit 22d0717 into cataclysmbnteam:main Dec 31, 2023
9 checks passed
@0Monet 0Monet deleted the fix_pizza_parlor branch December 31, 2023 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data PRs related to datas. Won't crash game (probably)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants