storehouse 1 expansion blueprint cleanup (CleverRaven#54168)

mythosmod · Jan 8, 2022 · a2d1557 · a2d1557
1 parent 7f525f0
commit a2d1557
Show file tree

Hide file tree

Showing 13 changed files with 120 additions and 852 deletions.
diff --git a/.../json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_log.json b/.../json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_log.json
@@ -2,16 +2,17 @@
   {
     "type": "palette",
     "id": "fbms_log_palette",
-    "terrain": {
-      ".": "t_floor",
-      "b": "t_grass",
-      "p": "t_floor",
-      "d": "t_door_c",
-      "o": "t_window_no_curtains",
-      "w": "t_wall_log",
-      ";": "t_floor_primitive"
-    },
-    "furniture": { "b": "f_bench", "t": "f_table", "x": "f_brazier", "U": "f_birdbath", "l": "f_locker", "B": "f_bookcase" }
+    "terrain": { ".": "t_floor", "b": "t_grass", "d": "t_door_c", "o": "t_window_no_curtains", "w": "t_wall_log" },
+    "furniture": {
+      ".": "f_clear",
+      "b": "f_bench",
+      "t": "f_table",
+      "l": "f_locker",
+      "B": "f_bookcase",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
+    }
   },
   {
     "type": "mapgen",

diff --git a/...son/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_metal.json b/...son/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_metal.json
@@ -2,18 +2,8 @@
   {
     "type": "palette",
     "id": "fbms_metal_palette",
-    "terrain": {
-      ".": "t_scrap_floor",
-      "b": "t_grass",
-      "t": "t_scrap_floor",
-      "l": "t_scrap_floor",
-      "B": "t_scrap_floor",
-      "d": "t_door_metal_c",
-      "o": "t_window_no_curtains",
-      "w": "t_scrap_wall",
-      ";": "t_floor_primitive"
-    },
-    "furniture": { "b": "f_bench", "t": "f_table", "x": "f_brazier", "U": "f_birdbath", "l": "f_locker", "B": "f_bookcase" }
+    "terrain": { ".": "t_scrap_floor", "b": "t_grass", "d": "t_door_metal_c", "o": "t_window_no_curtains", "w": "t_scrap_wall" },
+    "furniture": { "b": "f_bench", "t": "f_table", "l": "f_locker", "B": "f_bookcase", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
   },
   {
     "type": "mapgen",

diff --git a/...apgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_migo_resin.json b/...apgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_migo_resin.json
@@ -2,18 +2,17 @@
   {
     "type": "palette",
     "id": "fbms_migo_resin_palette",
-    "terrain": {
-      ".": "t_floor_resin",
-      "b": "t_grass",
-      "t": "t_floor_resin",
-      "l": "t_floor_resin",
-      "B": "t_floor_resin",
-      "d": "t_resin_hole_c",
-      "o": "t_wall_resin_cage",
-      "w": "t_wall_resin",
-      ";": "t_floor_resin"
-    },
-    "furniture": { "b": "f_bench", "t": "f_table", "x": "f_brazier", "U": "f_birdbath", "l": "f_locker", "B": "f_bookcase" }
+    "terrain": { ".": "t_floor_resin", "b": "t_grass", "d": "t_resin_hole_c", "o": "t_wall_resin_cage", "w": "t_wall_resin" },
+    "furniture": {
+      ".": "f_clear",
+      "b": "f_bench",
+      "t": "f_table",
+      "l": "f_locker",
+      "B": "f_bookcase",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
+    }
   },
   {
     "type": "mapgen",

diff --git a/...gen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rammed_earth.json b/...gen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rammed_earth.json
@@ -5,15 +5,11 @@
     "terrain": {
       ".": "t_floor_primitive",
       "b": "t_grass",
-      "t": "t_floor_primitive",
-      "l": "t_floor_primitive",
-      "B": "t_floor_primitive",
       "d": "t_door_makeshift_c",
       "o": "t_window_empty",
-      "w": "t_wall_rammed_earth",
-      ";": "t_floor_primitive"
+      "w": "t_wall_rammed_earth"
     },
-    "furniture": { "b": "f_bench", "t": "f_table", "x": "f_brazier", "U": "f_birdbath", "l": "f_locker", "B": "f_bookcase" }
+    "furniture": { "b": "f_bench", "t": "f_table", "l": "f_locker", "B": "f_bookcase", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
   },
   {
     "type": "mapgen",

diff --git a/...json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rock.json b/...json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rock.json
@@ -2,16 +2,17 @@
   {
     "type": "palette",
     "id": "fbms_rock_palette",
-    "terrain": {
-      ".": "t_floor",
-      "b": "t_grass",
-      "p": "t_floor",
-      "d": "t_door_c",
-      "o": "t_window_no_curtains",
-      "w": "t_rock_wall",
-      ";": "t_floor_primitive"
-    },
-    "furniture": { "b": "f_bench", "t": "f_table", "x": "f_brazier", "U": "f_birdbath", "l": "f_locker", "B": "f_bookcase" }
+    "terrain": { ".": "t_floor", "b": "t_grass", "d": "t_door_c", "o": "t_window_no_curtains", "w": "t_rock_wall" },
+    "furniture": {
+      ".": "f_clear",
+      "b": "f_bench",
+      "t": "f_table",
+      "l": "f_locker",
+      "B": "f_bookcase",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
+    }
   },
   {
     "type": "mapgen",

diff --git a/.../json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wad.json b/.../json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wad.json
@@ -2,18 +2,17 @@
   {
     "type": "palette",
     "id": "fbms_wad_palette",
-    "terrain": {
-      ".": "t_floor_primitive",
-      "b": "t_grass",
-      "t": "t_floor_primitive",
-      "l": "t_floor_primitive",
-      "B": "t_floor_primitive",
-      "d": "t_door_makeshift_c",
-      "o": "t_wall_wattle_half",
-      "w": "t_wall_wattle",
-      ";": "t_floor_primitive"
-    },
-    "furniture": { "b": "f_bench", "t": "f_table", "x": "f_brazier", "U": "f_birdbath", "l": "f_locker", "B": "f_bookcase" }
+    "terrain": { ".": "t_floor_primitive", "b": "t_grass", "d": "t_door_makeshift_c", "o": "t_wall_wattle_half", "w": "t_wall_wattle" },
+    "furniture": {
+      ".": "f_clear",
+      "b": "f_bench",
+      "t": "f_table",
+      "l": "f_locker",
+      "B": "f_bookcase",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
+    }
   },
   {
     "type": "mapgen",

diff --git a/...json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wood.json b/...json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wood.json
@@ -2,16 +2,17 @@
   {
     "type": "palette",
     "id": "fbms_wood_palette",
-    "terrain": {
-      ".": "t_floor",
-      "b": "t_grass",
-      "p": "t_floor",
-      "d": "t_door_c",
-      "o": "t_window_no_curtains",
-      "w": "t_wall_wood",
-      ";": "t_floor_primitive"
-    },
-    "furniture": { "b": "f_bench", "t": "f_table", "x": "f_brazier", "U": "f_birdbath", "l": "f_locker", "B": "f_bookcase" }
+    "terrain": { ".": "t_floor", "b": "t_grass", "d": "t_door_c", "o": "t_window_no_curtains", "w": "t_wall_wood" },
+    "furniture": {
+      ".": "f_clear",
+      "b": "f_bench",
+      "t": "f_table",
+      "l": "f_locker",
+      "B": "f_bookcase",
+      "d": "f_clear",
+      "o": "f_clear",
+      "w": "f_clear"
+    }
   },
   {
     "type": "mapgen",

diff --git a/...asecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_log.json b/...asecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_log.json
@@ -12,16 +12,7 @@
     "blueprint_name": "east storage wing",
     "blueprint_requires": [ { "id": "fbms_0" } ],
     "blueprint_provides": [ { "id": "fbms_east" } ],
-    "blueprint_excludes": [ { "id": "fbms_east" } ],
-    "blueprint_needs": {
-      "time": "2 d",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [ [ [ "2x4", 216 ] ], [ [ "log", 48 ] ], [ [ "nail", 480 ] ], [ [ "wood_panel", 24 ], [ "wood_sheet", 12 ] ] ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbms_east" } ]
   },
   {
     "type": "recipe",
@@ -36,16 +27,7 @@
     "blueprint_name": "west storage wing",
     "blueprint_requires": [ { "id": "fbms_0" } ],
     "blueprint_provides": [ { "id": "fbms_west" } ],
-    "blueprint_excludes": [ { "id": "fbms_west" } ],
-    "blueprint_needs": {
-      "time": "2 d",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [ [ [ "2x4", 216 ] ], [ [ "log", 48 ] ], [ [ "nail", 480 ] ], [ [ "wood_panel", 24 ], [ "wood_sheet", 12 ] ] ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbms_west" } ]
   },
   {
     "type": "recipe",
@@ -60,22 +42,7 @@
     "blueprint_name": "northwest storeroom corner",
     "blueprint_requires": [ { "id": "fbms_west" } ],
     "blueprint_provides": [ { "id": "fbms_northwest" } ],
-    "blueprint_excludes": [ { "id": "fbms_northwest" } ],
-    "blueprint_needs": {
-      "time": "17 h 45 m",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [
-          [ [ "2x4", 87 ] ],
-          [ [ "glass_sheet", 1 ] ],
-          [ [ "log", 16 ] ],
-          [ [ "nail", 190 ] ],
-          [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ]
-        ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbms_northwest" } ]
   },
   {
     "type": "recipe",
@@ -90,22 +57,7 @@
     "blueprint_name": "southwest storeroom corner",
     "blueprint_requires": [ { "id": "fbms_west" } ],
     "blueprint_provides": [ { "id": "fbms_southwest" } ],
-    "blueprint_excludes": [ { "id": "fbms_southwest" } ],
-    "blueprint_needs": {
-      "time": "17 h 45 m",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [
-          [ [ "2x4", 87 ] ],
-          [ [ "glass_sheet", 1 ] ],
-          [ [ "log", 16 ] ],
-          [ [ "nail", 190 ] ],
-          [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ]
-        ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbms_southwest" } ]
   },
   {
     "type": "recipe",
@@ -120,22 +72,7 @@
     "blueprint_name": "northeast storeroom corner",
     "blueprint_requires": [ { "id": "fbms_east" } ],
     "blueprint_provides": [ { "id": "fbms_northeast" } ],
-    "blueprint_excludes": [ { "id": "fbms_northeast" } ],
-    "blueprint_needs": {
-      "time": "17 h 45 m",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [
-          [ [ "2x4", 87 ] ],
-          [ [ "glass_sheet", 1 ] ],
-          [ [ "log", 16 ] ],
-          [ [ "nail", 190 ] ],
-          [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ]
-        ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbms_northeast" } ]
   },
   {
     "type": "recipe",
@@ -150,22 +87,7 @@
     "blueprint_name": "southeast storeroom corner",
     "blueprint_requires": [ { "id": "fbms_east" } ],
     "blueprint_provides": [ { "id": "fbms_southeast" } ],
-    "blueprint_excludes": [ { "id": "fbms_southeast" } ],
-    "blueprint_needs": {
-      "time": "17 h 45 m",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [
-          [ [ "2x4", 87 ] ],
-          [ [ "glass_sheet", 1 ] ],
-          [ [ "log", 16 ] ],
-          [ [ "nail", 190 ] ],
-          [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ]
-        ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbms_southeast" } ]
   },
   {
     "type": "recipe",
@@ -180,23 +102,7 @@
     "blueprint_name": "south storeroom entrance",
     "blueprint_requires": [ { "id": "fbms_southeast" }, { "id": "fbms_southwest" } ],
     "blueprint_provides": [ { "id": "fbms_south" } ],
-    "blueprint_excludes": [ { "id": "fbms_south" } ],
-    "blueprint_needs": {
-      "time": "2 d 14 h 30 m",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [
-          [ [ "2x4", 250 ] ],
-          [ [ "nail", 1092 ] ],
-          [ [ "wood_panel", 50 ] ],
-          [ [ "hinge", 4 ] ],
-          [ [ "glass_sheet", 2 ] ],
-          [ [ "log", 16 ] ]
-        ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbms_south" } ]
   },
   {
     "type": "recipe",
@@ -211,23 +117,7 @@
     "blueprint_name": "north storeroom entrance",
     "blueprint_requires": [ { "id": "fbms_northeast" }, { "id": "fbms_northwest" } ],
     "blueprint_provides": [ { "id": "fbms_north" } ],
-    "blueprint_excludes": [ { "id": "fbms_north" } ],
-    "blueprint_needs": {
-      "time": "2 d 14 h 30 m",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [
-          [ [ "2x4", 250 ] ],
-          [ [ "nail", 1092 ] ],
-          [ [ "wood_panel", 50 ] ],
-          [ [ "hinge", 4 ] ],
-          [ [ "glass_sheet", 2 ] ],
-          [ [ "log", 16 ] ]
-        ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbms_north" } ]
   },
   {
     "type": "recipe",
@@ -242,15 +132,6 @@
     "blueprint_name": "north storeroom entrance",
     "blueprint_requires": [ { "id": "fbms_north" }, { "id": "fbms_south" } ],
     "blueprint_provides": [ { "id": "fbms_center" } ],
-    "blueprint_excludes": [ { "id": "fbms_center" } ],
-    "blueprint_needs": {
-      "time": "5 d",
-      "skills": [ [ "fabrication", 3 ] ],
-      "inline": {
-        "tools": [  ],
-        "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-        "components": [ [ [ "wood_sheet", 60 ], [ "wood_panel", 120 ] ], [ [ "2x4", 360 ] ], [ [ "nail", 2400 ] ] ]
-      }
-    }
+    "blueprint_excludes": [ { "id": "fbms_center" } ]
   }
 ]