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: residential backyard chunks #4282

Merged
merged 2 commits into from
Mar 2, 2024

Conversation

LilShiningMan
Copy link
Contributor

Purpose of change

Add residential backyard chunks to add dynamic lawn features to domestic backyards

Describe the solution

Added Nest Container for residential backyards, which is what should be called by each individual house spawn. In the future additional chunk variants can be added to this nest container easily, which should be reflected in each house that calls this nested chunk without having to update each house individually.

Describe alternatives you've considered


Testing

linted and spawned each chunk variant in game.

Additional context

There are only 2 variants at the moment, more to be added later.
backyard - laundry
backyard - picnic

NOTE: my previous PR for adding front lawn chunks has already been merged, but that isn't reflected in this PR as it has not been published in a public build as of yet. That's why it looks like the residential lawn chunks file has both the front lawn and the backyard chunks. Hopefully that doesn't create any confusion.

Checklist

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Mar 2, 2024
@chaosvolt
Copy link
Member

chaosvolt commented Mar 2, 2024

my previous PR for adding front lawn chunks has already been merged

Uh, no!? You closed and deleted #4281 before it was merged.

EDIT: And now we got it, easy fix just gave me a scare, hecc

@chaosvolt
Copy link
Member

Okay, and I think that resolves the merge conflict, will approve and merge after tests are done this time :>

@LilShiningMan
Copy link
Contributor Author

perfect, thanks!

@chaosvolt chaosvolt merged commit 60385e8 into cataclysmbnteam:main Mar 2, 2024
10 checks passed
@LilShiningMan LilShiningMan deleted the residential_backyard branch March 6, 2024 05:17
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