workshop 1 expansion blueprint cleanup (CleverRaven#54206)

Xaritscin · Jan 10, 2022 · 939ec93 · 939ec93
1 parent 017e369
commit 939ec93
Show file tree

Hide file tree

Showing 15 changed files with 134 additions and 602 deletions.
diff --git a/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_log.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_log.json
@@ -24,6 +24,7 @@
       "b": "f_bench",
       "t": "f_table",
       "z": "f_55gal_firebarrel",
+      ".": "f_clear",
       "L": "f_locker",
       "x": "f_kiln_empty",
       "k": "f_clay_kiln",
@@ -34,7 +35,10 @@
       "r": "f_rack_wood",
       "M": "f_armchair",
       "B": "f_bookcase",
-      "Q": "f_bellows"
+      "Q": "f_bellows",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
     }
   },
   {

diff --git a/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_metal.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_metal.json
@@ -24,6 +24,7 @@
       "b": "f_bench",
       "t": "f_table",
       "z": "f_55gal_firebarrel",
+      ".": "f_clear",
       "L": "f_locker",
       "x": "f_kiln_empty",
       "k": "f_clay_kiln",
@@ -34,7 +35,10 @@
       "r": "f_rack",
       "M": "f_armchair",
       "B": "f_bookcase",
-      "Q": "f_bellows"
+      "Q": "f_bellows",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
     }
   },
   {

diff --git a/...on/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_migo_resin.json b/...on/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_migo_resin.json
@@ -24,6 +24,7 @@
       "b": "f_bench",
       "t": "f_table",
       "z": "f_55gal_firebarrel",
+      ".": "f_clear",
       "L": "f_locker",
       "x": "f_kiln_empty",
       "k": "f_clay_kiln",
@@ -34,7 +35,10 @@
       "r": "f_rack_wood",
       "M": "f_armchair",
       "B": "f_bookcase",
-      "Q": "f_bellows"
+      "Q": "f_bellows",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
     }
   },
   {

diff --git a/.../mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rammed_earth.json b/.../mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rammed_earth.json
@@ -24,6 +24,7 @@
       "b": "f_bench",
       "t": "f_table",
       "z": "f_55gal_firebarrel",
+      ".": "f_clear",
       "L": "f_locker",
       "x": "f_kiln_empty",
       "k": "f_clay_kiln",
@@ -34,7 +35,10 @@
       "r": "f_rack_wood",
       "M": "f_armchair",
       "B": "f_bookcase",
-      "Q": "f_bellows"
+      "Q": "f_bellows",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
     }
   },
   {

diff --git a/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rock.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rock.json
@@ -24,6 +24,7 @@
       "b": "f_bench",
       "t": "f_table",
       "z": "f_55gal_firebarrel",
+      ".": "f_clear",
       "L": "f_locker",
       "x": "f_kiln_empty",
       "k": "f_clay_kiln",
@@ -34,7 +35,10 @@
       "r": "f_rack_wood",
       "M": "f_armchair",
       "B": "f_bookcase",
-      "Q": "f_bellows"
+      "Q": "f_bellows",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
     }
   },
   {

diff --git a/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wad.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wad.json
@@ -24,6 +24,7 @@
       "b": "f_bench",
       "t": "f_table",
       "z": "f_55gal_firebarrel",
+      ".": "f_clear",
       "L": "f_locker",
       "x": "f_kiln_empty",
       "k": "f_clay_kiln",
@@ -34,7 +35,10 @@
       "r": "f_rack_wood",
       "M": "f_armchair",
       "B": "f_bookcase",
-      "Q": "f_bellows"
+      "Q": "f_bellows",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
     }
   },
   {

diff --git a/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wood.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wood.json
@@ -24,6 +24,7 @@
       "b": "f_bench",
       "t": "f_table",
       "z": "f_55gal_firebarrel",
+      ".": "f_clear",
       "L": "f_locker",
       "x": "f_kiln_empty",
       "k": "f_clay_kiln",
@@ -34,7 +35,10 @@
       "r": "f_rack_wood",
       "M": "f_armchair",
       "B": "f_bookcase",
-      "Q": "f_bellows"
+      "Q": "f_bellows",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
     }
   },
   {

diff --git a/...basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_common.json b/...basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_common.json
@@ -30,24 +30,7 @@
     "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith" }, { "id": "blacksmith_recipes_1" } ],
     "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ],
     "blueprint_resources": [ "fake_forge", "fake_char_kiln", "crucible", "makeshift_hammer" ],
-    "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ],
-    "blueprint_needs": {
-      "time": "5 h 30 m",
-      "skills": [ [ "fabrication", 5 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ], [ { "id": "WRENCH" } ] ],
-        "components": [
-          [ [ "sheet_metal", 2 ] ],
-          [ [ "pipe", 8 ] ],
-          [ [ "lock", 1 ] ],
-          [ [ "2x4", 4 ] ],
-          [ [ "wood_sheet", 1 ], [ "wood_panel", 1 ] ],
-          [ [ "nail", 8 ] ],
-          [ [ "rock", 80 ] ]
-        ]
-      }
-    }
+    "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -81,15 +64,6 @@
     "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_6" } ],
     "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 4 } ],
     "blueprint_resources": [ "hammer_sledge", "copper_knife" ],
-    "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "knife_combat", 1 ], [ "copper_knife", 1 ] ] ],
-    "blueprint_needs": {
-      "time": "1 h",
-      "skills": [ [ "fabrication", 1 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "HAMMER" } ] ],
-        "components": [ [ [ "2x4", 4 ] ], [ [ "tanned_hide", 2 ] ], [ [ "scrap", 20 ] ], [ [ "wire", 8 ] ] ]
-      }
-    }
+    "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "knife_combat", 1 ], [ "copper_knife", 1 ] ] ]
   }
 ]
diff --git a/...es/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_log.json b/...es/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_log.json
@@ -9,19 +9,10 @@
     "autolearn": false,
     "never_learn": true,
     "construction_blueprint": "fbmw_room0_log_northeast",
-    "blueprint_name": "northeast wall",
+    "blueprint_name": "log northeast wall",
     "blueprint_requires": [ { "id": "fbmw_0" } ],
     "blueprint_provides": [ { "id": "fbmw_northeast" } ],
-    "blueprint_excludes": [ { "id": "fbmw_northeast" } ],
-    "blueprint_needs": {
-      "time": "1 d 22 h 30 m",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [ [ [ "2x4", 338 ] ], [ [ "glass_sheet", 2 ] ], [ [ "log", 36 ] ], [ [ "nail", 560 ] ], [ [ "wood_panel", 25 ] ] ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbmw_northeast" } ]
   },
   {
     "type": "recipe",
@@ -33,58 +24,25 @@
     "autolearn": false,
     "never_learn": true,
     "construction_blueprint": "fbmw_room3_log_north",
-    "blueprint_name": "north wall",
+    "blueprint_name": "log north wall",
     "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 3 } ],
     "blueprint_provides": [ { "id": "fbmw_north" } ],
-    "blueprint_excludes": [ { "id": "fbmw_north" } ],
-    "blueprint_needs": {
-      "time": "1 d 5 h 40 m",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [
-          [ [ "2x4", 203 ] ],
-          [ [ "nail", 394 ] ],
-          [ [ "wood_panel", 23 ] ],
-          [ [ "hinge", 2 ] ],
-          [ [ "glass_sheet", 1 ] ],
-          [ [ "log", 24 ] ]
-        ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbmw_north" } ]
   },
   {
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "result": "faction_base_modular_workshop_room4_log_east",
-    "description": "Let's expand our production by adding another charcoal kiln.",
+    "description": "Let's expand our production by adding another charcoal kiln with log walls.",
     "category": "CC_BUILDING",
     "subcategory": "CSC_BUILDING_BASES",
     "autolearn": false,
     "never_learn": true,
     "construction_blueprint": "fbmw_room4_log_east",
-    "blueprint_name": "east forge wall",
+    "blueprint_name": "log east forge wall",
     "blueprint_requires": [ { "id": "fbmw_north" } ],
     "blueprint_provides": [ { "id": "fbmw_east" }, { "id": "blacksmith_recipes_3" } ],
-    "blueprint_excludes": [ { "id": "fbmw_east" } ],
-    "blueprint_needs": {
-      "time": "1 d 21 h 55 m",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [
-          [ [ "2x4", 329 ] ],
-          [ [ "nail", 746 ] ],
-          [ [ "wood_panel", 39 ] ],
-          [ [ "hinge", 2 ] ],
-          [ [ "rock", 40 ] ],
-          [ [ "glass_sheet", 1 ] ],
-          [ [ "log", 16 ] ]
-        ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbmw_east" } ]
   },
   {
     "type": "recipe",
@@ -96,26 +54,10 @@
     "autolearn": false,
     "never_learn": true,
     "construction_blueprint": "fbmw_room5_log_center",
-    "blueprint_name": "west forge wall",
+    "blueprint_name": "log west forge wall",
     "blueprint_requires": [ { "id": "fbmw_east" } ],
     "blueprint_provides": [ { "id": "fbmw_center" } ],
-    "blueprint_excludes": [ { "id": "fbmw_center" } ],
-    "blueprint_needs": {
-      "time": "1 d 3 h 5 m",
-      "skills": [ [ "fabrication", 3 ], [ "tailor", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [
-          [ [ "2x4", 200 ] ],
-          [ [ "blanket", 1 ], [ "down_blanket", 1 ], [ "fur_blanket", 1 ] ],
-          [ [ "glass_sheet", 2 ] ],
-          [ [ "log", 16 ] ],
-          [ [ "nail", 372 ] ],
-          [ [ "wood_panel", 19 ] ]
-        ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbmw_center" } ]
   },
   {
     "type": "recipe",
@@ -127,7 +69,7 @@
     "autolearn": false,
     "never_learn": true,
     "construction_blueprint": "fbmw_room6_log_north",
-    "blueprint_name": "north pottery wall",
+    "blueprint_name": "log north pottery wall",
     "blueprint_requires": [ { "id": "fbmw_center" } ],
     "blueprint_provides": [ { "id": "fbmw_north" }, { "id": "blacksmith_recipes_4" } ],
     "blueprint_excludes": [ { "id": "fbmw_north", "amount": 2 } ],
@@ -144,61 +86,26 @@
     "autolearn": false,
     "never_learn": true,
     "construction_blueprint": "fbmw_room7to9_log_northwest",
-    "blueprint_name": "northwest and south pottery wall",
+    "blueprint_name": "log northwest and south pottery wall",
     "blueprint_requires": [ { "id": "fbmw_north", "amount": 2 } ],
     "blueprint_provides": [ { "id": "fbmw_northwest" }, { "id": "blacksmith_recipes_5" } ],
-    "blueprint_excludes": [ { "id": "fbmw_northwest" } ],
-    "blueprint_needs": {
-      "time": "1 d 21 h 28 m",
-      "skills": [ [ "fabrication", 3 ], [ "survival", 0 ] ],
-      "inline": {
-        "tools": [ [ [ "machete", -1 ], [ "makeshift_machete", -1 ], [ "scythe", -1 ], [ "sickle", -1 ], [ "survivor_machete", -1 ] ] ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [
-          [ [ "2x4", 298 ] ],
-          [ [ "nail", 526 ] ],
-          [ [ "wood_panel", 31 ] ],
-          [ [ "hinge", 2 ] ],
-          [ [ "glass_sheet", 2 ] ],
-          [ [ "log", 44 ] ]
-        ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbmw_northwest" } ]
   },
   {
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "result": "faction_base_modular_workshop_room11to12_log_southeast",
-    "description": "Let's expand the workspace for larger projects and add a drop hammer for productivity.",
+    "description": "Let's expand the workspace for larger projects and add a drop hammer for productivity with log pillars.",
     "category": "CC_BUILDING",
     "subcategory": "CSC_BUILDING_BASES",
     "autolearn": false,
     "never_learn": true,
     "construction_blueprint": "fbmw_room11to12_log_southeast",
-    "blueprint_name": "openair, covered work space",
+    "blueprint_name": "log openair, covered work space",
     "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 4 } ],
     "blueprint_provides": [ { "id": "fbmw_southeast" }, { "id": "fbmw_south" }, { "id": "blacksmith_recipes_7" } ],
     "blueprint_excludes": [ { "id": "fbmw_northsoutheast" }, { "id": "fbmw_south" } ],
     "blueprint_resources": [ "wrench", "pliers", "fake_drop_hammer" ],
-    "components": [ [ [ "wrench", 1 ] ], [ [ "pliers", 1 ] ] ],
-    "blueprint_needs": {
-      "time": "2 d 18 h",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [
-          [ [ "2x4", 472 ] ],
-          [ [ "anvil", 1 ] ],
-          [ [ "chain", 4 ] ],
-          [ [ "log", 40 ] ],
-          [ [ "metal_tank", 2 ] ],
-          [ [ "nail", 880 ] ],
-          [ [ "pipe", 3 ] ],
-          [ [ "water_faucet", 2 ] ],
-          [ [ "wood_panel", 44 ] ]
-        ]
-      }
-    }
+    "components": [ [ [ "wrench", 1 ] ], [ [ "pliers", 1 ] ] ]
   }
 ]