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

fix: Triple-Pane glass window components added wood material #74100

Merged
merged 1 commit into from
May 26, 2024

Conversation

cosing
Copy link
Contributor

@cosing cosing commented May 26, 2024

Summary

Bugfixes "Make sure that the materials it consumes are consistent with construction of the same type."

Purpose of change

All other kinds of windows require wood and constr_triple_pane_glass doesn't

{
"type": "construction",
"id": "constr_single_pane_glass",
"group": "build_single_glazed_glass_window",
"//": "Step 1: Build single glazed glass window",
"category": "WINDOWS",
"required_skills": [ [ "fabrication", 2 ] ],
"time": "120 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ],
"components": [ [ [ "glass_sheet", 1 ] ], [ [ "nails", 16, "LIST" ] ], [ [ "2x4", 4 ] ] ],
"pre_terrain": "t_window_empty",
"post_terrain": "t_single_pane_glass"
},

{
"type": "construction",
"id": "constr_double_pane_glass",
"group": "build_double_glazed_glass_window",
"//": "Step 1: Build double glazed glass window",
"category": "WINDOWS",
"required_skills": [ [ "fabrication", 3 ] ],
"time": "120 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ],
"components": [ [ [ "glass_sheet", 2 ] ], [ [ "nails", 16, "LIST" ] ], [ [ "2x4", 4 ] ] ],
"pre_terrain": "t_window_empty",
"post_terrain": "t_double_pane_glass"
},

↓↓↓ "components": [ [ [ "glass_sheet", 3 ] ] ], only use glass_sheet

{
"type": "construction",
"id": "constr_triple_pane_glass",
"group": "build_triple_glazed_glass_window",
"//": "Step 1: Build triple glazed glass window",
"category": "WINDOWS",
"required_skills": [ [ "fabrication", 3 ] ],
"time": "150 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ],
"components": [ [ [ "glass_sheet", 3 ] ] ],
"pre_terrain": "t_window_empty",
"post_terrain": "t_triple_pane_glass"
},

{
"type": "construction",
"id": "constr_quadruple_pane_glass",
"group": "build_quadruple_glazed_glass_window",
"//": "Step 1: Build quadruple glazed glass window",
"category": "WINDOWS",
"required_skills": [ [ "fabrication", 3 ] ],
"time": "180 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ],
"components": [ [ [ "glass_sheet", 4 ] ], [ [ "nails", 16, "LIST" ] ], [ [ "2x4", 4 ] ] ],
"pre_terrain": "t_window_empty",
"post_terrain": "t_quadruple_pane_glass"
},

Describe the solution

Just add it.

Describe alternatives you've considered

None

Testing

None

Additional context

None

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels May 26, 2024
@Maleclypse Maleclypse merged commit 3848197 into CleverRaven:master May 26, 2024
26 checks passed
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 <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants