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

Roof and general improvements for orchard_apple #49596

Merged
merged 4 commits into from
Jul 9, 2021

Conversation

Procyonae
Copy link
Contributor

@Procyonae Procyonae commented Jul 5, 2021

Summary

Content "Adds a roof to orchard_apple"

Purpose of change

Added a roof to the orchard_apple special along with general improvements. Resolves #49575.

Describe the solution

Basic roof added along with item spawns and a new forklift spawn. Moved the terrain/furniture to a palette file for easier future modification. Changed the road layout to make it look slightly more natural. Removed two vehicle spawns to make room for modified road. Added more specific item groups for the orchard rather than the more generic farming_tools.

Describe alternatives you've considered

An OMT could be added between orchard_processing and orchard_still and the road connection moved to this to make it smoother. Variants featuring other tree types and/or a van serving fruit juice/cider/kompot could be added.

Testing

Ran the adjustments on a clean install.

Procyonae added 2 commits July 5, 2021 13:39
…o palettes to encompass the buildings and general orchard. Changed the road layout to make it look slightly more natural.
@Procyonae Procyonae changed the title Roof and Roof and general improvements for orchard_apple Jul 5, 2021
@anothersimulacrum anothersimulacrum added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display labels Jul 5, 2021
"palettes": [ "roof_palette" ],
"nested": {
"6": {
"chunks": [ [ "null", 30 ], [ "roof_4x4_holdout", 40 ], [ "roof_5x5_coop", 40 ] ]
Copy link
Contributor

Choose a reason for hiding this comment

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

For nested chunks with larger items like the coop and holdout, make sure there's logical roof access via a ladder or stairs.

"type": "palette",
"id": "orchard_tree_apple",
"terrain": {
" ": [ "t_dirt", "t_grass_long", "t_grass_long", "t_grass", "t_grass", "t_grass", "t_grass" ],
Copy link
Contributor

@curstwist curstwist Jul 5, 2021

Choose a reason for hiding this comment

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

We have a more compact way to weight tiles now. Format the array like this: " ": [ [ "t_grass", 4 ], [ "t_grass_long", 2 ], "t_dirt" ], Applies for your other arrays too.

@I-am-Erk I-am-Erk merged commit b4d6f89 into CleverRaven:master Jul 9, 2021
@actual-nh actual-nh added 0.F Backport Candidate <Bugfix> This is a fix for a bug (or closes open issue) labels Jul 9, 2021
ZhilkinSerg added a commit to ZhilkinSerg/Cataclysm-DDA that referenced this pull request Aug 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [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.

Apple orchard buildings have no roof
5 participants