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

house palette tweak #38119

Merged
merged 2 commits into from
Feb 21, 2020
Merged

Conversation

LilShiningMan
Copy link
Contributor

Summary

SUMMARY: Infrastructure "minor changes to make palette more versatile"

Purpose of change

To make the standard house palette more versatile and less cluttered. Issues I've noticed: 1) standard palette overrides " " in map files with "t_floor", which is only useful if your fill_ter is t_floor -- otherwise you need to override the override in each file; 2) woodstove is duplicated, the second time without associated items; 3) a shredder sometimes spawns in lieu of a filing cabinet -- while intentional, it doesn't make sense for items like dice or liquor flasks to spawn in a shredder (office_paper item group), and with the spawn rate of 80 filing cabinet to 20 shredder, it's such a rare occurrence for the shredder to appear that you might as well intentionally definite it in each map on an as-needed basis.

Describe the solution

  1. changed " " from t_floor to t_null. That's the easiest way I know to make the tile default to the fill_ter defined in each map. If there's a better way, please let me know!
  2. deleted "0": "f_woodstove" and listed the "0" in unclaimed symbols in file comment line.
  3. removed the shredder from the "P" definition.

Describe alternatives you've considered

creating my own palette override for houses I design, but this makes more sense to me.

Testing

spawned some houses in-game.

Additional context

I may be missing something, and so I'd like some of the regular house designers to weigh in here.

minor changes to make palette more versatile
@I-am-Erk
Copy link
Member

You shouldn't need to define " " at all if you want it to generate fill_ter. I'm not certain but I think specifying it as null could confuse nested mapgen.

Copy link
Contributor

@curstwist curstwist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm ok with the removal of the shredder and the duplicate entry. I'm not sure if making " " t_null will have unintended consequences for nested mapgen. Erk says it doesn't matter if removed entirely so I'd trust that opinion.

@LilShiningMan
Copy link
Contributor Author

I could be wrong, but my understanding was that house_w_palette was for the nested house mapgens, but I take your point. I'll remove the " " definition entirely.

@curstwist
Copy link
Contributor

there's nothing stopping someone from using any palette for nested mapgen, so better safe then sorry. I can't remember if I've used it there off-hand.

@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display labels Feb 18, 2020
@I-am-Erk I-am-Erk merged commit fef327b into CleverRaven:master Feb 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants