From b71035dd61bb1577f82c378e0ee85debe90718ff Mon Sep 17 00:00:00 2001 From: eltank Date: Mon, 25 Nov 2019 02:20:41 -0800 Subject: [PATCH 1/6] Refactor common workshop recipes and mapgen. --- .../modular_workshop_common.json | 119 ++++++++++++++++++ .../modular_workshop_log.json | 82 ------------ .../modular_workshop_metal.json | 73 ----------- .../modular_workshop_rock.json | 82 ------------ .../modular_workshop_wad.json | 82 ------------ .../modular_workshop_wood.json | 99 --------------- .../recipe_modular_workshop.rock.json | 51 -------- .../recipe_modular_workshop_common.json | 53 ++++++++ .../recipe_modular_workshop_log.json | 51 -------- .../recipe_modular_workshop_metal.json | 51 -------- .../recipe_modular_workshop_wad.json | 51 -------- .../recipe_modular_workshop_wood.json | 51 -------- 12 files changed, 172 insertions(+), 673 deletions(-) create mode 100644 data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json create mode 100644 data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json new file mode 100644 index 0000000000000..f6f7cb7f3333c --- /dev/null +++ b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json @@ -0,0 +1,119 @@ +[ + { + "type": "palette", + "id": "fbmw_common_palette", + "terrain": { + ".": "t_dirtfloor" + }, + "furniture": { + "t": "f_table", + "L": "f_locker", + "x": "f_kiln_empty", + "f": "f_forge_rock", + "c": "f_workbench", + "h": "f_stool", + "A": "f_anvil", + "r": "f_rack_wood", + "Q": "f_bellows" + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmw_0", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "fbmw_common_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmw_room1_common", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " ftL ", + " ", + " ", + " ", + " x " + ], + "palettes": [ "fbmw_common_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmw_room1_common_northeast", + "method": "json", + "object": { + "place_nested": [ { "chunks": [ "fbmw_room1_common" ], "x": 15, "y": 3 } ], + "place_loot": [ { "item": "crucible", "x": 18, "y": 4, "chance": 100 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmw_room2_common", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + "r ", + " c ", + " A c ", + " c ", + " " + ], + "palettes": [ "fbmw_common_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmw_room2_common_northeast", + "method": "json", + "object": { + "place_nested": [ { "chunks": [ "fbmw_room2_common" ], "x": 15, "y": 3 } ], + "place_loot": [ { "item": "55gal_drum", "x": 17, "y": 7, "chance": 100 }, { "item": "30gal_drum", "x": 17, "y": 8, "chance": 100 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmw_room10_common", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " Q ", + " ", + " ", + " ", + " " + ], + "palettes": [ "fbmw_common_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmw_room10_common_northeast", + "method": "json", + "object": { + "place_nested": [ { "chunks": [ "fbmw_room10_common" ], "x": 15, "y": 3 } ], + "place_loot": [ + { "item": "hammer_sledge", "x": 19, "y": 6, "chance": 100 }, + { "item": "knife_combat", "x": 19, "y": 6, "chance": 100 }, + { "item": "copper_knife", "x": 19, "y": 6, "chance": 100 } + ] + } + } +] \ No newline at end of file diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_log.json b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_log.json index 464fcc2fe01da..010b4a4a36354 100644 --- a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_log.json +++ b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_log.json @@ -60,58 +60,6 @@ "method": "json", "object": { "place_nested": [ { "chunks": [ "fbmw_room0_log" ], "x": 15, "y": 3 } ] } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room1_log", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " ftL ", - " ", - " ", - " ", - " x " - ], - "palettes": [ "fbmw_log_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room1_log_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room1_log" ], "x": 15, "y": 3 } ], - "place_loot": [ { "item": "crucible", "x": 18, "y": 4, "chance": 100 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room2_log", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - "r ", - " c ", - " A c ", - " c ", - " " - ], - "palettes": [ "fbmw_log_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room2_log_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room2_log" ], "x": 15, "y": 3 } ], - "place_loot": [ { "item": "55gal_drum", "x": 17, "y": 7, "chance": 100 }, { "item": "30gal_drum", "x": 17, "y": 8, "chance": 100 } ] - } - }, { "type": "mapgen", "method": "json", @@ -275,36 +223,6 @@ ] } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room10_log", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " Q ", - " ", - " ", - " ", - " " - ], - "palettes": [ "fbmw_log_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room10_log_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room10_log" ], "x": 15, "y": 3 } ], - "place_loot": [ - { "item": "hammer_sledge", "x": 19, "y": 6, "chance": 100 }, - { "item": "knife_combat", "x": 19, "y": 6, "chance": 100 }, - { "item": "copper_knife", "x": 19, "y": 6, "chance": 100 } - ] - } - }, { "type": "mapgen", "method": "json", diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_metal.json b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_metal.json index 313003f731045..6e6e1c074969a 100644 --- a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_metal.json +++ b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_metal.json @@ -60,49 +60,6 @@ "method": "json", "object": { "place_nested": [ { "chunks": [ "fbmw_room0_metal" ], "x": 15, "y": 3 } ] } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room1_metal", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " ftL ", - " ", - " ", - " ", - " x " - ], - "palettes": [ "fbmw_metal_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room1_metal_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room1_metal" ], "x": 15, "y": 3 } ], - "place_loot": [ { "item": "crucible", "x": 18, "y": 4, "chance": 100 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room2_metal", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - "r ", - " c ", - " A c ", - " c ", - " " - ], - "palettes": [ "fbmw_metal_palette" ] - } - }, { "type": "mapgen", "update_mapgen_id": "fbmw_room2_metal_northeast", @@ -275,36 +232,6 @@ ] } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room10_metal", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " Q ", - " ", - " ", - " ", - " " - ], - "palettes": [ "fbmw_metal_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room10_metal_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room10_metal" ], "x": 15, "y": 3 } ], - "place_loot": [ - { "item": "hammer_sledge", "x": 19, "y": 6, "chance": 100 }, - { "item": "knife_combat", "x": 19, "y": 6, "chance": 100 }, - { "item": "copper_knife", "x": 19, "y": 6, "chance": 100 } - ] - } - }, { "type": "mapgen", "method": "json", diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_rock.json b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_rock.json index cee55b1cdbbad..472bb10bbb53a 100644 --- a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_rock.json +++ b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_rock.json @@ -60,58 +60,6 @@ "method": "json", "object": { "place_nested": [ { "chunks": [ "fbmw_room0_rock" ], "x": 15, "y": 3 } ] } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room1_rock", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " ftL ", - " ", - " ", - " ", - " x " - ], - "palettes": [ "fbmw_rock_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room1_rock_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room1_rock" ], "x": 15, "y": 3 } ], - "place_loot": [ { "item": "crucible", "x": 18, "y": 4, "chance": 100 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room2_rock", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - "r ", - " c ", - " A c ", - " c ", - " " - ], - "palettes": [ "fbmw_rock_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room2_rock_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room2_rock" ], "x": 15, "y": 3 } ], - "place_loot": [ { "item": "55gal_drum", "x": 17, "y": 7, "chance": 100 }, { "item": "30gal_drum", "x": 17, "y": 8, "chance": 100 } ] - } - }, { "type": "mapgen", "method": "json", @@ -275,36 +223,6 @@ ] } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room10_rock", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " Q ", - " ", - " ", - " ", - " " - ], - "palettes": [ "fbmw_rock_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room10_rock_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room10_rock" ], "x": 15, "y": 3 } ], - "place_loot": [ - { "item": "hammer_sledge", "x": 19, "y": 6, "chance": 100 }, - { "item": "knife_combat", "x": 19, "y": 6, "chance": 100 }, - { "item": "copper_knife", "x": 19, "y": 6, "chance": 100 } - ] - } - }, { "type": "mapgen", "method": "json", diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_wad.json b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_wad.json index 9def240b55b82..f96ae443bfe04 100644 --- a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_wad.json +++ b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_wad.json @@ -60,58 +60,6 @@ "method": "json", "object": { "place_nested": [ { "chunks": [ "fbmw_room0_wad" ], "x": 15, "y": 3 } ] } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room1_wad", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " ftL ", - " ", - " ", - " ", - " x " - ], - "palettes": [ "fbmw_wad_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room1_wad_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room1_wad" ], "x": 15, "y": 3 } ], - "place_loot": [ { "item": "crucible", "x": 18, "y": 4, "chance": 100 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room2_wad", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - "r ", - " c ", - " A c ", - " c ", - " " - ], - "palettes": [ "fbmw_wad_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room2_wad_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room2_wad" ], "x": 15, "y": 3 } ], - "place_loot": [ { "item": "55gal_drum", "x": 17, "y": 7, "chance": 100 }, { "item": "30gal_drum", "x": 17, "y": 8, "chance": 100 } ] - } - }, { "type": "mapgen", "method": "json", @@ -275,36 +223,6 @@ ] } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room10_wad", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " Q ", - " ", - " ", - " ", - " " - ], - "palettes": [ "fbmw_wad_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room10_wad_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room10_wad" ], "x": 15, "y": 3 } ], - "place_loot": [ - { "item": "hammer_sledge", "x": 19, "y": 6, "chance": 100 }, - { "item": "knife_combat", "x": 19, "y": 6, "chance": 100 }, - { "item": "copper_knife", "x": 19, "y": 6, "chance": 100 } - ] - } - }, { "type": "mapgen", "method": "json", diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_wood.json b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_wood.json index 1414066e7c116..ebe24daaae131 100644 --- a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_wood.json +++ b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_wood.json @@ -37,23 +37,6 @@ "Q": "f_bellows" } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_0", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " ", - " ", - " ", - " ", - " " - ], - "palettes": [ "fbmw_wood_palette" ] - } - }, { "type": "mapgen", "update_mapgen_id": "faction_base_workshop_0", @@ -83,58 +66,6 @@ "method": "json", "object": { "place_nested": [ { "chunks": [ "fbmw_room0_wood" ], "x": 15, "y": 3 } ] } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room1_wood", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " ftL ", - " ", - " ", - " ", - " x " - ], - "palettes": [ "fbmw_wood_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room1_wood_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room1_wood" ], "x": 15, "y": 3 } ], - "place_loot": [ { "item": "crucible", "x": 18, "y": 4, "chance": 100 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room2_wood", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - "r ", - " c ", - " A c ", - " c ", - " " - ], - "palettes": [ "fbmw_wood_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room2_wood_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room2_wood" ], "x": 15, "y": 3 } ], - "place_loot": [ { "item": "55gal_drum", "x": 17, "y": 7, "chance": 100 }, { "item": "30gal_drum", "x": 17, "y": 8, "chance": 100 } ] - } - }, { "type": "mapgen", "method": "json", @@ -298,36 +229,6 @@ ] } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmw_room10_wood", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " Q ", - " ", - " ", - " ", - " " - ], - "palettes": [ "fbmw_wood_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmw_room10_wood_northeast", - "method": "json", - "object": { - "place_nested": [ { "chunks": [ "fbmw_room10_wood" ], "x": 15, "y": 3 } ], - "place_loot": [ - { "item": "hammer_sledge", "x": 19, "y": 6, "chance": 100 }, - { "item": "knife_combat", "x": 19, "y": 6, "chance": 100 }, - { "item": "copper_knife", "x": 19, "y": 6, "chance": 100 } - ] - } - }, { "type": "mapgen", "method": "json", diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json index f4d832dc82936..91179683a1ef4 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json @@ -14,40 +14,6 @@ "blueprint_excludes": [ { "id": "fbmw_northeast" } ], "blueprint_autocalc": true }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room1_rock_northeast", - "description": "Let's install a metal working forge and a charcoal kiln, we'll need a few tools too, so we'll include some storage space.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room1_rock_northeast", - "blueprint_name": "northeast kiln and forge", - "blueprint_requires": [ { "id": "fbmw_northeast" } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ], - "blueprint_resources": [ "fake_forge", "fake_char_kiln", "makeshift_hammer" ], - "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ], - "blueprint_autocalc": true - }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room2_rock_northeast", - "description": "Let's install an anvil, a quenching container and we'll need a workbench too.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room2_rock_northeast", - "blueprint_name": "northeast kiln and forge", - "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 2 } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_2" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 3 } ], - "blueprint_resources": [ "anvil", "crucible" ], - "components": [ [ [ "anvil", 1 ] ], [ [ "55gal_drum", 1 ] ], [ [ "30gal_drum", 1 ] ] ], - "blueprint_autocalc": true - }, { "type": "recipe", "result": "faction_base_modular_workshop_room3_rock_north", @@ -125,23 +91,6 @@ "blueprint_excludes": [ { "id": "fbmw_northwest" } ], "blueprint_autocalc": true }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room10_rock_northeast", - "description": "Let's install a bellows for our forage and add some more tools.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room10_rock_northeast", - "blueprint_name": "northeast bellows", - "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 3 }, { "id": "fbmw_northwest" } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_6" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 4 } ], - "blueprint_resources": [ "anvil", "crucible" ], - "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "knife_combat", 1 ], [ "copper_knife", 1 ] ] ], - "blueprint_autocalc": true - }, { "type": "recipe", "result": "faction_base_modular_workshop_room11to12_rock_southeast", diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json new file mode 100644 index 0000000000000..3f62565ea260a --- /dev/null +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json @@ -0,0 +1,53 @@ +[ + { + "type": "recipe", + "result": "faction_base_modular_workshop_room1_common_northeast", + "description": "Let's install a metal working forge and a charcoal kiln, we'll need a few tools too, so we'll include some storage space.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmw_room1_common_northeast", + "blueprint_name": "northeast kiln and forge", + "blueprint_requires": [ { "id": "fbmw_northeast" } ], + "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ], + "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ], + "blueprint_resources": [ "fake_forge", "fake_char_kiln", "makeshift_hammer" ], + "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_workshop_room2_common_northeast", + "description": "Let's install an anvil, a quenching container and we'll need a workbench too.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmw_room2_common_northeast", + "blueprint_name": "northeast kiln and forge", + "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 2 } ], + "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_2" } ], + "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 3 } ], + "blueprint_resources": [ "anvil", "crucible" ], + "components": [ [ [ "anvil", 1 ] ], [ [ "55gal_drum", 1 ] ], [ [ "30gal_drum", 1 ] ] ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_workshop_room10_common_northeast", + "description": "Let's install a bellows for our forage and add some more tools.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmw_room10_common_northeast", + "blueprint_name": "northeast bellows", + "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 3 }, { "id": "fbmw_northwest" } ], + "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_6" } ], + "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 4 } ], + "blueprint_resources": [ "anvil", "crucible" ], + "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "knife_combat", 1 ], [ "copper_knife", 1 ] ] ], + "blueprint_autocalc": true + } +] \ No newline at end of file diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json index f4e14ff113df7..68bfdc505498d 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json @@ -14,40 +14,6 @@ "blueprint_excludes": [ { "id": "fbmw_northeast" } ], "blueprint_autocalc": true }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room1_log_northeast", - "description": "Let's install a metal working forge and a charcoal kiln, we'll need a few tools too, so we'll include some storage space.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room1_log_northeast", - "blueprint_name": "northeast kiln and forge", - "blueprint_requires": [ { "id": "fbmw_northeast" } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ], - "blueprint_resources": [ "fake_forge", "fake_char_kiln", "makeshift_hammer" ], - "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ], - "blueprint_autocalc": true - }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room2_log_northeast", - "description": "Let's install an anvil, a quenching container and we'll need a workbench too.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room2_log_northeast", - "blueprint_name": "northeast kiln and forge", - "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 2 } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_2" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 3 } ], - "blueprint_resources": [ "anvil", "crucible" ], - "components": [ [ [ "anvil", 1 ] ], [ [ "55gal_drum", 1 ] ], [ [ "30gal_drum", 1 ] ] ], - "blueprint_autocalc": true - }, { "type": "recipe", "result": "faction_base_modular_workshop_room3_log_north", @@ -125,23 +91,6 @@ "blueprint_excludes": [ { "id": "fbmw_northwest" } ], "blueprint_autocalc": true }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room10_log_northeast", - "description": "Let's install a bellows for our forage and add some more tools.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room10_log_northeast", - "blueprint_name": "northeast bellows", - "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 3 }, { "id": "fbmw_northwest" } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_6" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 4 } ], - "blueprint_resources": [ "anvil", "crucible" ], - "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "knife_combat", 1 ], [ "copper_knife", 1 ] ] ], - "blueprint_autocalc": true - }, { "type": "recipe", "result": "faction_base_modular_workshop_room11to12_log_southeast", diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json index 00c7058e4e1cb..c8c08aa439797 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json @@ -14,40 +14,6 @@ "blueprint_excludes": [ { "id": "fbmw_northeast" } ], "blueprint_autocalc": true }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room1_metal_northeast", - "description": "Let's install a metal working forge and a charcoal kiln, we'll need a few tools too, so we'll include some storage space.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room1_metal_northeast", - "blueprint_name": "northeast kiln and forge", - "blueprint_requires": [ { "id": "fbmw_northeast" } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ], - "blueprint_resources": [ "fake_forge", "fake_char_kiln", "makeshift_hammer" ], - "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ], - "blueprint_autocalc": true - }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room2_metal_northeast", - "description": "Let's install an anvil, a quenching container and we'll need a workbench too.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room2_metal_northeast", - "blueprint_name": "northeast kiln and forge", - "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 2 } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_2" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 3 } ], - "blueprint_resources": [ "anvil", "crucible" ], - "components": [ [ [ "anvil", 1 ] ], [ [ "55gal_drum", 1 ] ], [ [ "30gal_drum", 1 ] ] ], - "blueprint_autocalc": true - }, { "type": "recipe", "result": "faction_base_modular_workshop_room3_metal_north", @@ -125,23 +91,6 @@ "blueprint_excludes": [ { "id": "fbmw_northwest" } ], "blueprint_autocalc": true }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room10_metal_northeast", - "description": "Let's install a bellows for our forage and add some more tools.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room10_metal_northeast", - "blueprint_name": "northeast bellows", - "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 3 }, { "id": "fbmw_northwest" } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_6" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 4 } ], - "blueprint_resources": [ "anvil", "crucible" ], - "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "knife_combat", 1 ], [ "copper_knife", 1 ] ] ], - "blueprint_autocalc": true - }, { "type": "recipe", "result": "faction_base_modular_workshop_room11to12_metal_southeast", diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json index cadc5fe2b1d5e..409607305e476 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json @@ -14,40 +14,6 @@ "blueprint_excludes": [ { "id": "fbmw_northeast" } ], "blueprint_autocalc": true }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room1_wad_northeast", - "description": "Let's install a metal working forge and a charcoal kiln, we'll need a few tools too, so we'll include some storage space.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room1_wad_northeast", - "blueprint_name": "northeast kiln and forge", - "blueprint_requires": [ { "id": "fbmw_northeast" } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ], - "blueprint_resources": [ "fake_forge", "fake_char_kiln", "makeshift_hammer" ], - "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ], - "blueprint_autocalc": true - }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room2_wad_northeast", - "description": "Let's install an anvil, a quenching container and we'll need a workbench too.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room2_wad_northeast", - "blueprint_name": "northeast kiln and forge", - "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 2 } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_2" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 3 } ], - "blueprint_resources": [ "anvil", "crucible" ], - "components": [ [ [ "anvil", 1 ] ], [ [ "55gal_drum", 1 ] ], [ [ "30gal_drum", 1 ] ] ], - "blueprint_autocalc": true - }, { "type": "recipe", "result": "faction_base_modular_workshop_room3_wad_north", @@ -125,23 +91,6 @@ "blueprint_excludes": [ { "id": "fbmw_northwest" } ], "blueprint_autocalc": true }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room10_wad_northeast", - "description": "Let's install a bellows for our forage and add some more tools.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room10_wad_northeast", - "blueprint_name": "northeast bellows", - "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 3 }, { "id": "fbmw_northwest" } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_6" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 4 } ], - "blueprint_resources": [ "anvil", "crucible" ], - "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "knife_combat", 1 ], [ "copper_knife", 1 ] ] ], - "blueprint_autocalc": true - }, { "type": "recipe", "result": "faction_base_modular_workshop_room11to12_wad_southeast", diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json index 3c06e24c2aca0..a1bc576a89773 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json @@ -29,40 +29,6 @@ "blueprint_excludes": [ { "id": "fbmw_northeast" } ], "blueprint_autocalc": true }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room1_wood_northeast", - "description": "Let's install a metal working forge and a charcoal kiln, we'll need a few tools too, so we'll include some storage space.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room1_wood_northeast", - "blueprint_name": "northeast kiln and forge", - "blueprint_requires": [ { "id": "fbmw_northeast" } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ], - "blueprint_resources": [ "fake_forge", "fake_char_kiln", "makeshift_hammer" ], - "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ], - "blueprint_autocalc": true - }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room2_wood_northeast", - "description": "Let's install an anvil, a quenching container and we'll need a workbench too.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room2_wood_northeast", - "blueprint_name": "northeast kiln and forge", - "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 2 } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_2" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 3 } ], - "blueprint_resources": [ "anvil", "crucible" ], - "components": [ [ [ "anvil", 1 ] ], [ [ "55gal_drum", 1 ] ], [ [ "30gal_drum", 1 ] ] ], - "blueprint_autocalc": true - }, { "type": "recipe", "result": "faction_base_modular_workshop_room3_wood_north", @@ -140,23 +106,6 @@ "blueprint_excludes": [ { "id": "fbmw_northwest" } ], "blueprint_autocalc": true }, - { - "type": "recipe", - "result": "faction_base_modular_workshop_room10_wood_northeast", - "description": "Let's install a bellows for our forage and add some more tools.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmw_room10_wood_northeast", - "blueprint_name": "northeast bellows", - "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 3 }, { "id": "fbmw_northwest" } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_6" } ], - "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 4 } ], - "blueprint_resources": [ "anvil", "crucible" ], - "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "knife_combat", 1 ], [ "copper_knife", 1 ] ] ], - "blueprint_autocalc": true - }, { "type": "recipe", "result": "faction_base_modular_workshop_room11to12_wood_southeast", From f521e6b8a4aa4defb725eb56a95b8e631be6303f Mon Sep 17 00:00:00 2001 From: eltank Date: Mon, 25 Nov 2019 02:27:53 -0800 Subject: [PATCH 2/6] Fix to allow workshop recipes to show up. --- .../recipe_modular_workshop/recipe_modular_workshop_common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json index 3f62565ea260a..f373fcc4a1482 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json @@ -10,7 +10,7 @@ "construction_blueprint": "fbmw_room1_common_northeast", "blueprint_name": "northeast kiln and forge", "blueprint_requires": [ { "id": "fbmw_northeast" } ], - "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ], + "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", "makeshift_hammer" ], "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ], From c4d3f6d7ba90ff7052ac5c399087f5f8b886cc27 Mon Sep 17 00:00:00 2001 From: eltank Date: Mon, 25 Nov 2019 02:29:47 -0800 Subject: [PATCH 3/6] Clean up workshop building recipe descriptions and provided resources. --- .../recipe_modular_workshop_common.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json index f373fcc4a1482..6e1e76eb848d9 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json @@ -2,51 +2,51 @@ { "type": "recipe", "result": "faction_base_modular_workshop_room1_common_northeast", - "description": "Let's install a metal working forge and a charcoal kiln, we'll need a few tools too, so we'll include some storage space.", + "description": "Let's install a metal working forge and a charcoal kiln. We'll need a few tools too, so we'll include some storage space.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room1_common_northeast", - "blueprint_name": "northeast kiln and forge", + "blueprint_name": "forge and kiln", "blueprint_requires": [ { "id": "fbmw_northeast" } ], "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", "makeshift_hammer" ], + "blueprint_resources": [ "fake_forge", "fake_char_kiln", "crucible", "makeshift_hammer" ], "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ], "blueprint_autocalc": true }, { "type": "recipe", "result": "faction_base_modular_workshop_room2_common_northeast", - "description": "Let's install an anvil, a quenching container and we'll need a workbench too.", + "description": "Let's install an anvil, some quenching containers and a workbench.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room2_common_northeast", - "blueprint_name": "northeast kiln and forge", + "blueprint_name": "anvil and workbench", "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 2 } ], "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_2" } ], "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 3 } ], - "blueprint_resources": [ "anvil", "crucible" ], + "blueprint_resources": [ "anvil" ], "components": [ [ [ "anvil", 1 ] ], [ [ "55gal_drum", 1 ] ], [ [ "30gal_drum", 1 ] ] ], "blueprint_autocalc": true }, { "type": "recipe", "result": "faction_base_modular_workshop_room10_common_northeast", - "description": "Let's install a bellows for our forage and add some more tools.", + "description": "Let's install a bellows for our forge and add some more tools.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room10_common_northeast", - "blueprint_name": "northeast bellows", + "blueprint_name": "bellows", "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 3 }, { "id": "fbmw_northwest" } ], "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_6" } ], "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 4 } ], - "blueprint_resources": [ "anvil", "crucible" ], + "blueprint_resources": [ "hammer_sledge", "copper_knife" ], "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "knife_combat", 1 ], [ "copper_knife", 1 ] ] ], "blueprint_autocalc": true } From 91b1edc02307b064d93ec0f383e028b65fec3ad1 Mon Sep 17 00:00:00 2001 From: eltank Date: Mon, 25 Nov 2019 03:18:21 -0800 Subject: [PATCH 4/6] add missing newlines --- .../basecamps/modular_workshop/modular_workshop_common.json | 2 +- .../recipe_modular_workshop/recipe_modular_workshop_common.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json index f6f7cb7f3333c..9a4d04bcad94b 100644 --- a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json +++ b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json @@ -116,4 +116,4 @@ ] } } -] \ No newline at end of file +] diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json index 6e1e76eb848d9..b8049a839e778 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json @@ -50,4 +50,4 @@ "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "knife_combat", 1 ], [ "copper_knife", 1 ] ] ], "blueprint_autocalc": true } -] \ No newline at end of file +] From 37eb1486c027cda8edf8595b11ba58256fda8613 Mon Sep 17 00:00:00 2001 From: eltank Date: Mon, 25 Nov 2019 03:30:03 -0800 Subject: [PATCH 5/6] lint --- .../basecamps/modular_workshop/modular_workshop_common.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json index 9a4d04bcad94b..28b79f6f7f526 100644 --- a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json +++ b/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json @@ -2,9 +2,7 @@ { "type": "palette", "id": "fbmw_common_palette", - "terrain": { - ".": "t_dirtfloor" - }, + "terrain": { ".": "t_dirtfloor" }, "furniture": { "t": "f_table", "L": "f_locker", From 190687126e8bfa00a05b3959f5ebac33d197f3f5 Mon Sep 17 00:00:00 2001 From: eltank Date: Mon, 25 Nov 2019 04:22:46 -0800 Subject: [PATCH 6/6] fix translation error --- .../recipe_modular_workshop/recipe_modular_workshop_common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json index b8049a839e778..467820b6584dc 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json @@ -2,7 +2,7 @@ { "type": "recipe", "result": "faction_base_modular_workshop_room1_common_northeast", - "description": "Let's install a metal working forge and a charcoal kiln. We'll need a few tools too, so we'll include some storage space.", + "description": "Let's install a metal working forge and a charcoal kiln. We'll need a few tools too, so we'll include some storage space.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false,