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 roof solar nested chunks #4277

Merged
merged 2 commits into from
Mar 2, 2024

Conversation

LilShiningMan
Copy link
Contributor

@LilShiningMan LilShiningMan commented Mar 2, 2024

Purpose of change

Adding nested chunks for residential roof solar panels to spawn.

Describe the solution

Created Nest Container entry that each individual house file should call. The values in nest container itself are what should determine % of houses that spawn with solar panels. This means that if any future changes are made to solar panel spawn rates, there is no need to update each individual house file that calls this nest container -- instead, tweaking the values of nest container in the nested chunks folder will make the necessary changes for all.

Describe alternatives you've considered

Add nested chunks (different sizes and null entries) to each individual house file, but that can make it a pain to update or add new chunk variants. This is much easier.

Testing

files linted and houses spawned in game. 2 diff varieties of residential solar chunks (3x3 and 4x4) successfully spawn.

Additional context

EDIT : Oops, thanks for the title fix. Forgot the "feat" in front

I also changed the name of the file "nest_chunk_roof" to "roof_nested" to fit the rest of the naming conventions in the nested folder.

solar 3 x3
solar 4 x 4

Checklist

adding nested chunks for residential roof solar panels
@github-actions github-actions bot added the JSON related to game datas in JSON format. label Mar 2, 2024
@scarf005 scarf005 changed the title residential roof solar nested chunks feat: residential roof solar nested chunks Mar 2, 2024
@scarf005
Copy link
Member

scarf005 commented Mar 2, 2024

image

hi, your branch is stale (targeting legacy main branch @ b625f1f) and thus was having merge conflict.
this is because your default branch upload (now renamed to main) hasn't been synced.

image

i've fixed the merge conflict by hand, but it'd be appreciated if you could sync the branch up-to-date.

@LilShiningMan
Copy link
Contributor Author

LilShiningMan commented Mar 2, 2024 via email

@scarf005 scarf005 self-requested a review March 2, 2024 01:04
@scarf005 scarf005 self-assigned this Mar 2, 2024
@scarf005 scarf005 merged commit 8f84b48 into cataclysmbnteam:main Mar 2, 2024
10 checks passed
@LilShiningMan LilShiningMan deleted the residential_roof_solar branch March 2, 2024 02:13
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