Additional changes to windows terrain (#39527)

CleverRaven · Apr 16, 2020 · 8786b2b · 8786b2b
1 parent b48eb09
commit 8786b2b
Show file tree

Hide file tree

Showing 3 changed files with 222 additions and 169 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -3601,11 +3601,39 @@
     "pre_terrain": "t_window_reinforced",
     "post_terrain": "t_metal_grate_window"
   },
+  {
+    "type": "construction",
+    "id": "constr_metal_grate_window_no_glass",
+    "description": "Build Metal Grate Over a Window Without Glass",
+    "//": "Step 2: Build metal grate over a window",
+    "category": "REINFORCE",
+    "required_skills": [ [ "fabrication", 5 ] ],
+    "time": "90 m",
+    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ],
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ],
+    "components": [ [ [ "pipe", 12 ] ], [ [ "sheet_metal", 4 ] ] ],
+    "pre_terrain": "t_window_reinforced_noglass",
+    "post_terrain": "t_metal_grate_window"
+  },
   {
     "type": "construction",
     "id": "constr_metal_grate_window_curtain",
     "description": "Build Metal Grate Over a Window",
-    "//": "Step 2: Build curtain over metal grate with curtain",
+    "//": "Step 3: Build curtain over metal grate",
+    "category": "REINFORCE",
+    "required_skills": [ [ "fabrication", 2 ] ],
+    "time": "30 m",
+    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ],
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ],
+    "components": [ [ [ "nail", 4 ] ], [ [ "sheet", 2 ] ], [ [ "stick", 1 ] ], [ [ "string_36", 1 ] ] ],
+    "pre_terrain": "t_metal_grate_window",
+    "post_terrain": "t_metal_grate_window_with_curtain"
+  },
+  {
+    "type": "construction",
+    "id": "constr_metal_grate_window_curtain_no_glass",
+    "description": "Build Metal Grate Over a Window Without Glass",
+    "//": "Step 4: Build curtain over metal grate",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
@@ -3618,8 +3646,8 @@
   {
     "type": "construction",
     "id": "constr_single_pane_glass",
-    "description": "Build Single-Pane Glass Window",
-    "//": "Step 1: Build single-pane glass window",
+    "description": "Build Single Glazed Glass Window",
+    "//": "Step 1: Build single glazed glass window",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "120 m",
@@ -3631,8 +3659,8 @@
   {
     "type": "construction",
     "id": "constr_single_pane_glass_curtain",
-    "description": "Build Single-Pane Glass Window",
-    "//": "Step 2: Build curtain for single-pane glass window",
+    "description": "Build Single Glazed Glass Window",
+    "//": "Step 2: Build curtain for single glazed glass window",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
@@ -3644,8 +3672,8 @@
   {
     "type": "construction",
     "id": "constr_reinforced_single_pane_glass",
-    "description": "Build Reinforced Single-Pane Glass Window",
-    "//": "Step 1: Build reinforced single-pane glass window",
+    "description": "Build Reinforced Single Glazed Glass Window",
+    "//": "Step 1: Build reinforced single glazed glass window",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "120 m",
@@ -3657,8 +3685,8 @@
   {
     "type": "construction",
     "id": "constr_reinforced_single_pane_glass_curtain",
-    "description": "Build Reinforced Single-Pane Glass Window",
-    "//": "Step 2: Build curtain for reinforced single-pane glass window",
+    "description": "Build Reinforced Single Glazed Glass Window",
+    "//": "Step 2: Build curtain for reinforced single glazed glass window",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
@@ -3670,8 +3698,8 @@
   {
     "type": "construction",
     "id": "constr_double_pane_glass",
-    "description": "Build Double-Pane Glass Window",
-    "//": "Step 1: Build double-pane glass window",
+    "description": "Build Double Glazed Glass Window",
+    "//": "Step 1: Build double glazed glass window",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "120 m",
@@ -3683,8 +3711,8 @@
   {
     "type": "construction",
     "id": "constr_double_pane_glass_curtain",
-    "description": "Build Double-Pane Glass Window",
-    "//": "Step 2: Build curtain for double-pane glass window",
+    "description": "Build Double Glazed Glass Window",
+    "//": "Step 2: Build curtain for double glazed glass window",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
@@ -3696,8 +3724,8 @@
   {
     "type": "construction",
     "id": "constr_reinforced_double_pane_glass",
-    "description": "Build Reinforced Double-Pane Glass Window",
-    "//": "Step 1: Build reinforced double-pane glass window",
+    "description": "Build Reinforced Double Glazed Glass Window",
+    "//": "Step 1: Build reinforced double glazed glass window",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "120 m",
@@ -3709,8 +3737,8 @@
   {
     "type": "construction",
     "id": "constr_reinforced_double_pane_glass_curtain",
-    "description": "Build Reinforced Double-Pane Glass Window",
-    "//": "Step 2: Build curtain for reinforced double-pane glass window",
+    "description": "Build Reinforced Double Glazed Glass Window",
+    "//": "Step 2: Build curtain for reinforced double glazed glass window",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
@@ -3722,8 +3750,8 @@
   {
     "type": "construction",
     "id": "constr_triple_pane_glass",
-    "description": "Build Triple-Pane Glass Window",
-    "//": "Step 1: Build triple-pane glass window",
+    "description": "Build Triple Glazed Glass Window",
+    "//": "Step 1: Build triple glazed glass window",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "150 m",
@@ -3735,8 +3763,8 @@
   {
     "type": "construction",
     "id": "constr_triple_pane_glass_curtain",
-    "description": "Build Triple-Pane Glass Window",
-    "//": "Step 2: Build curtain for triple-pane glass window",
+    "description": "Build Triple Glazed Glass Window",
+    "//": "Step 2: Build curtain for triple glazed glass window",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
@@ -3748,8 +3776,8 @@
   {
     "type": "construction",
     "id": "constr_reinforced_triple_pane_glass",
-    "description": "Build Reinforced Triple-Pane Glass Window",
-    "//": "Step 1: Build reinforced triple-pane glass window",
+    "description": "Build Reinforced Triple Glazed Glass Window",
+    "//": "Step 1: Build reinforced triple glazed glass window",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "150 m",
@@ -3761,8 +3789,8 @@
   {
     "type": "construction",
     "id": "constr_reinforced_triple_pane_glass_curtain",
-    "description": "Build Reinforced Triple-Pane Glass Window",
-    "//": "Step 2: Build curtain for reinforced triple-pane glass window",
+    "description": "Build Reinforced Triple Glazed Glass Window",
+    "//": "Step 2: Build curtain for reinforced triple glazed glass window",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
@@ -3774,8 +3802,8 @@
   {
     "type": "construction",
     "id": "constr_quadruple_pane_glass",
-    "description": "Build Quadruple-Pane Glass Window",
-    "//": "Step 1: Build quadruple-pane glass window",
+    "description": "Build Quadruple Glazed Glass Window",
+    "//": "Step 1: Build quadruple glazed glass window",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "180 m",
@@ -3787,8 +3815,8 @@
   {
     "type": "construction",
     "id": "constr_quadruple_pane_glass_curtain",
-    "description": "Build Quadruple-Pane Glass Window",
-    "//": "Step 2: Build curtain for quadruple-pane glass window",
+    "description": "Build Quadruple Glazed Glass Window",
+    "//": "Step 2: Build curtain for quadruple glazed glass window",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
@@ -3800,8 +3828,8 @@
   {
     "type": "construction",
     "id": "constr_reinforced_quadruple_pane_glass",
-    "description": "Build Reinforced Quadruple-Pane Glass Window",
-    "//": "Step 1: Build reinforced quadruple-pane glass window",
+    "description": "Build Reinforced Quadruple Glazed Glass Window",
+    "//": "Step 1: Build reinforced quadruple glazed glass window",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "180 m",
@@ -3813,8 +3841,8 @@
   {
     "type": "construction",
     "id": "constr_reinforced_quadruple_pane_glass_curtain",
-    "description": "Build Reinforced Quadruple-Pane Glass Window",
-    "//": "Step 2: Build curtain for reinforced quadruple-pane glass window",
+    "description": "Build Reinforced Quadruple Glazed Glass Window",
+    "//": "Step 2: Build curtain for reinforced quadruple glazed glass window",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
@@ -3904,8 +3932,8 @@
   {
     "type": "construction",
     "id": "constr_skylight_frame",
-    "description": "Build Skylight Frame Flat Roof",
-    "//": "Step 1: Build skylight frame on a flat roof",
+    "description": "Build Sky Light Frame",
+    "//": "Step 1: Build skylight frame flat roof",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "90 m",
@@ -3917,8 +3945,8 @@
   {
     "type": "construction",
     "id": "constr_skylight_frame_tar_roof",
-    "description": "Build Sky Light Frame Tar Roof",
-    "//": "Step 2: Build skylight frame on a tar roof",
+    "description": "Build Sky Light Frame",
+    "//": "Step 2: Build skylight frame tar roof",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "90 m",
@@ -3930,8 +3958,8 @@
   {
     "type": "construction",
     "id": "constr_skylight_frame_shingle_roof",
-    "description": "Build Sky Light Frame Shingle Roof",
-    "//": "Step 3: Build skylight frame on a shingled roof",
+    "description": "Build Sky Light Frame",
+    "//": "Step 3: Build skylight frame shingle roof",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "90 m",
@@ -3943,8 +3971,8 @@
   {
     "type": "construction",
     "id": "constr_skylight_frame_thatched_roof",
-    "description": "Build Sky Light Frame Thatched Roof",
-    "//": "Step 1: Build skylight frame on a thatched roof",
+    "description": "Build Sky Light Frame",
+    "//": "Step 4: Build skylight frame thatched roof",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "90 m",
@@ -3956,8 +3984,8 @@
   {
     "type": "construction",
     "id": "constr_skylight_frame_metal_roof",
-    "description": "Build Sky Light Frame Metal Roof",
-    "//": "Step 1: Build skylight frame on a metal roof",
+    "description": "Build Sky Light Frame",
+    "//": "Step 5: Build skylight frame metal roof",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "90 m",
@@ -3969,8 +3997,8 @@
   {
     "type": "construction",
     "id": "constr_skylight_frame_tiled_roof",
-    "description": "Build Sky Light Frame tiled Roof",
-    "//": "Step 1: Build skylight frame on a tiled roof",
+    "description": "Build Sky Light Frame",
+    "//": "Step 6: Build skylight frame  tiled roof",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "90 m",
@@ -3982,10 +4010,10 @@
   {
     "type": "construction",
     "id": "constr_skylight_frame_open_air",
-    "description": "Build Sky Light Frame Open Air",
-    "//": "Step 1: Build skylight frame over open air",
+    "description": "Build Sky Light Frame",
+    "//": "Step 7: Build skylight frame open air",
     "category": "WINDOWS",
-    "required_skills": [ [ "fabrication", 4787 ] ],
+    "required_skills": [ [ "fabrication", 4 ] ],
     "time": "90 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ],
     "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 16 ] ] ],
@@ -3995,8 +4023,8 @@
   {
     "type": "construction",
     "id": "constr_skylight_frame_Rock_Roof",
-    "description": "Build Sky Light Frame Rock Roof",
-    "//": "Step 1: Build skylight frame into rock roof",
+    "description": "Build Sky Light Frame",
+    "//": "Step 8: Build skylight frame rock roof",
     "category": "WINDOWS",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "120 m",

diff --git a/data/json/construction_category.json b/data/json/construction_category.json
@@ -42,13 +42,13 @@
   },
   {
     "type": "construction_category",
-    "id": "OTHER",
-    "name": "Others"
+    "id": "WINDOWS",
+    "name": "Windows"
   },
   {
     "type": "construction_category",
-    "id": "WINDOWS",
-    "name": "Windows"
+    "id": "OTHER",
+    "name": "Others"
   },
   {
     "//": "Should be last in the list",