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

[Aftershock] Remove Habitat Block palette and expand Habitat Structure palettes. #74326

Conversation

QuillInkwell
Copy link
Contributor

Summary

Mods "Removes the habitat block palette introduced in my last PR and expands the palettes in habitat structure."

Purpose of change

It was requested that I not create additional palettes and instead focus on using and expanding existing ones when possible.

Describe the solution

This PR removes the palette I added in my last PR and expands the existing ones with the entries I most often used. As a compromise two smaller palettes were added called Habitat Exterior and Habitat Life Support. Habitat Exterior holds mainly floors that don't really fit with habitat structure and are more suited for outside habitats as the name implies. Habitat Life support was added because I was bothered I couldn't easily access the life support furniture when using the residential palette. Since the Life Support furniture was in the mech palette which overlapped and several nasty ways with the residential one. The Life Support palette was made so as not to overlap with any other palettes so it can be used with either mech or residential palettes as needed.

I also briefly flicked back over to my previous constructions to remove any conflicts caused by the new additions to the palettes. As well as rebind any locally defined furniture's/terrains to the slots specifically left open for them to use to avoid future problems.

Describe alternatives you've considered

The Life Support and Habitat External palettes both use special ASCII characters. These would be the only palettes I know of in the Habitat structure file to do so. If this is undesirable it's probably possible to rebind these keys to something else. But it would likely cause overlap between palettes which I would like to avoid.

I considered not separating the external palette from the main structure palette. However I felt since the external palette reserves some special characters. It may be desirable to be able to leave it off in certain circumstances. So I separated them.

It's technically possible to continue using the mech palette for Life support furniture. But since the storage board and water heater overlap you to have locally re bind one or both and be mindful of palette ordering. Which is a pain.

When breaking apart the habitat block palette I strongly considered creating either a "Habitat Commercial" palette or several themed shop palettes "Habitat Library", "Habitat Gun Store", ect... Ultimately I locally defined all the item spawning furniture in their respective mapgen. Since that's currently how it done everywhere else in the mod. (That I can see.) But there is some merit to creating palettes for item spawning furniture as well. Since it might make balancing loot spawns and changing out item groups easier in the future.

Testing

I re-visited all the structures I added to verify they were spawning correctly. I also quickly visited the other structures within the mod to verify they were spawning correctly as well.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Map / Mapgen Overmap, Mapgen, Map extras, Map display Mods: Aftershock Anything to do with the Aftershock mod labels Jun 5, 2024
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jun 5, 2024
@John-Candlebury John-Candlebury merged commit 7d5264d into CleverRaven:master Jun 5, 2024
26 checks passed
@QuillInkwell QuillInkwell deleted the afs_remove_habbit_block_palette branch June 6, 2024 02:22
feinorgh pushed a commit to feinorgh/Cataclysm-DDA that referenced this pull request Jun 8, 2024
…e palettes. (CleverRaven#74326)

* Remove habitat block palette and instead expand base palettes. Audit existing builds for consistency

* Lint JSON
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Mods: Aftershock Anything to do with the Aftershock mod Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants