diff --git a/data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_beds.json b/data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_beds.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_beds.json rename to data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_beds.json diff --git a/data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_common.json b/data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_common.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_common.json rename to data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_common.json diff --git a/data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_log.json b/data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_log.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_log.json rename to data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_log.json diff --git a/data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_metal.json b/data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_metal.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_metal.json rename to data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_metal.json diff --git a/data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_migo_resin.json b/data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_migo_resin.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_migo_resin.json rename to data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_migo_resin.json diff --git a/data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rammed_earth.json b/data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rammed_earth.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rammed_earth.json rename to data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rammed_earth.json diff --git a/data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rock.json b/data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rock.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rock.json rename to data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rock.json diff --git a/data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wad.json b/data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wad.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wad.json rename to data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wad.json diff --git a/data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wood.json b/data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wood.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wood.json rename to data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wood.json diff --git a/data/json/mapgen/basecamps/fbmc_helipad/fbmc_helipad_common.json b/data/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_common.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_helipad/fbmc_helipad_common.json rename to data/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_common.json diff --git a/data/json/mapgen/basecamps/fbmc_helipad/fbmc_helipad_garage.json b/data/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_garage.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_helipad/fbmc_helipad_garage.json rename to data/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_garage.json diff --git a/data/json/mapgen/basecamps/fbmc_lighthouse/fbmc_lighthouse.json b/data/json/mapgen/basecamps/base/fbmc_lighthouse/fbmc_lighthouse.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_lighthouse/fbmc_lighthouse.json rename to data/json/mapgen/basecamps/base/fbmc_lighthouse/fbmc_lighthouse.json diff --git a/data/json/mapgen/basecamps/fbmc_lightindustry/fbmc_lightindustry_00.json b/data/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_00.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_lightindustry/fbmc_lightindustry_00.json rename to data/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_00.json diff --git a/data/json/mapgen/basecamps/fbmc_lightindustry/fbmc_lightindustry_00_beds.json b/data/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_00_beds.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_lightindustry/fbmc_lightindustry_00_beds.json rename to data/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_00_beds.json diff --git a/data/json/mapgen/basecamps/fbmc_lightindustry/fbmc_lightindustry_10.json b/data/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_10.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_lightindustry/fbmc_lightindustry_10.json rename to data/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_10.json diff --git a/data/json/mapgen/basecamps/fbmc_lightindustry/fbmc_lightindustry_10_beds.json b/data/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_10_beds.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_lightindustry/fbmc_lightindustry_10_beds.json rename to data/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_10_beds.json diff --git a/data/json/mapgen/basecamps/fbmc_lightindustry/fbmc_lightindustry_workshop.json b/data/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_workshop.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_lightindustry/fbmc_lightindustry_workshop.json rename to data/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_workshop.json diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+1.json b/data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+1.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+1.json rename to data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+1.json diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+2.json b/data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+2.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+2.json rename to data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+2.json diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+3.json b/data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+3.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+3.json rename to data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+3.json diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+4.json b/data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+4.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+4.json rename to data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+4.json diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_common.json b/data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_common.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_common.json rename to data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_common.json diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_expansion.json b/data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_expansion.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_expansion.json rename to data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_expansion.json diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_overmap.json b/data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_overmap.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_overmap.json rename to data/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_overmap.json diff --git a/data/json/mapgen/basecamps/fbmc_outpost/fbmc_outpost_cross.json b/data/json/mapgen/basecamps/base/fbmc_outpost/fbmc_outpost_cross.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_outpost/fbmc_outpost_cross.json rename to data/json/mapgen/basecamps/base/fbmc_outpost/fbmc_outpost_cross.json diff --git a/data/json/mapgen/basecamps/fbmc_outpost/fbmc_outpost_normal.json b/data/json/mapgen/basecamps/base/fbmc_outpost/fbmc_outpost_normal.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_outpost/fbmc_outpost_normal.json rename to data/json/mapgen/basecamps/base/fbmc_outpost/fbmc_outpost_normal.json diff --git a/data/json/mapgen/basecamps/fbmc_pottery_cottage/fbmc_pottery_cottage_blacksmith.json b/data/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_blacksmith.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_pottery_cottage/fbmc_pottery_cottage_blacksmith.json rename to data/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_blacksmith.json diff --git a/data/json/mapgen/basecamps/fbmc_pottery_cottage/fbmc_pottery_cottage_common.json b/data/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_common.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_pottery_cottage/fbmc_pottery_cottage_common.json rename to data/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_common.json diff --git a/data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_beds.json b/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_beds.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_beds.json rename to data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_beds.json diff --git a/data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_common.json b/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_common.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_common.json rename to data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_common.json diff --git a/data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_log.json b/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_log.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_log.json rename to data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_log.json diff --git a/data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_metal.json b/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_metal.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_metal.json rename to data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_metal.json diff --git a/data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_migo_resin.json b/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_migo_resin.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_migo_resin.json rename to data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_migo_resin.json diff --git a/data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_rammed_earth.json b/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rammed_earth.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_rammed_earth.json rename to data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rammed_earth.json diff --git a/data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_rock.json b/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rock.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_rock.json rename to data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rock.json diff --git a/data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_wad.json b/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wad.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_wad.json rename to data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wad.json diff --git a/data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_wood.json b/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wood.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_radio_tower/fbmc_radio_tower_wood.json rename to data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wood.json diff --git a/data/json/mapgen/basecamps/fbmc_sealab_small/fbmc_sealab_small_common.json b/data/json/mapgen/basecamps/base/fbmc_sealab_small/fbmc_sealab_small_common.json similarity index 100% rename from data/json/mapgen/basecamps/fbmc_sealab_small/fbmc_sealab_small_common.json rename to data/json/mapgen/basecamps/base/fbmc_sealab_small/fbmc_sealab_small_common.json diff --git a/data/json/mapgen/basecamps/modular_firestation_1/modular_firestation1.json b/data/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation1.json similarity index 100% rename from data/json/mapgen/basecamps/modular_firestation_1/modular_firestation1.json rename to data/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation1.json diff --git a/data/json/mapgen/basecamps/modular_firestation_1/modular_firestation_walls_all.json b/data/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation_walls_all.json similarity index 100% rename from data/json/mapgen/basecamps/modular_firestation_1/modular_firestation_walls_all.json rename to data/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation_walls_all.json diff --git a/data/json/mapgen/basecamps/modular_field_common.json b/data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_common.json similarity index 100% rename from data/json/mapgen/basecamps/modular_field_common.json rename to data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_common.json diff --git a/data/json/mapgen/basecamps/modular_field_defenses.json b/data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_defenses.json similarity index 100% rename from data/json/mapgen/basecamps/modular_field_defenses.json rename to data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_defenses.json diff --git a/data/json/mapgen/basecamps/modular_field_log.json b/data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_log.json similarity index 100% rename from data/json/mapgen/basecamps/modular_field_log.json rename to data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_log.json diff --git a/data/json/mapgen/basecamps/modular_field_metal.json b/data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_metal.json similarity index 100% rename from data/json/mapgen/basecamps/modular_field_metal.json rename to data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_metal.json diff --git a/data/json/mapgen/basecamps/modular_field_migo_resin.json b/data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_migo_resin.json similarity index 100% rename from data/json/mapgen/basecamps/modular_field_migo_resin.json rename to data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_migo_resin.json diff --git a/data/json/mapgen/basecamps/modular_field_rammed_earth.json b/data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rammed_earth.json similarity index 100% rename from data/json/mapgen/basecamps/modular_field_rammed_earth.json rename to data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rammed_earth.json diff --git a/data/json/mapgen/basecamps/modular_field_rock.json b/data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rock.json similarity index 100% rename from data/json/mapgen/basecamps/modular_field_rock.json rename to data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rock.json diff --git a/data/json/mapgen/basecamps/modular_field_tent.json b/data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_tent.json similarity index 100% rename from data/json/mapgen/basecamps/modular_field_tent.json rename to data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_tent.json diff --git a/data/json/mapgen/basecamps/modular_field_wad.json b/data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wad.json similarity index 100% rename from data/json/mapgen/basecamps/modular_field_wad.json rename to data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wad.json diff --git a/data/json/mapgen/basecamps/modular_field_wood.json b/data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wood.json similarity index 100% rename from data/json/mapgen/basecamps/modular_field_wood.json rename to data/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wood.json diff --git a/data/json/mapgen/basecamps/primitive_field.json b/data/json/mapgen/basecamps/base/modular_hub/version_1/primitive_field.json similarity index 73% rename from data/json/mapgen/basecamps/primitive_field.json rename to data/json/mapgen/basecamps/base/modular_hub/version_1/primitive_field.json index 925e521dfd561..64722dc503890 100644 --- a/data/json/mapgen/basecamps/primitive_field.json +++ b/data/json/mapgen/basecamps/base/modular_hub/version_1/primitive_field.json @@ -225,324 +225,6 @@ "palettes": [ "acidia_camp_palette" ] } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_farm_long_fields", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - "mmmmmm", - "mmmmmm", - " ", - " ", - " " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_farm_short_fields", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "mm", - "mm" - ], "palettes": [ "acidia_camp_palette" ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_farm_0", - "object": { - "mapgensize": [ 13, 13 ], - "rows": [ - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " U___U ", - " _____ ", - " _____ ", - " _____ ", - " _____ ", - " " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_farm_2", - "object": { - "mapgensize": [ 13, 13 ], - "rows": [ - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " *,,,* ", - " ,''', ", - " ,''H, ", - " *'HH* ", - " ***** ", - " " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_farm_3", - "object": { - "mapgensize": [ 13, 13 ], - "rows": [ - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " *+* ", - " * * ", - " * * ", - " ", - " ", - " " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_farm_4", - "object": { - "mapgensize": [ 13, 13 ], - "rows": [ - " ", - " ", - " ", - " ", - " ", - " ", - " ***+** ", - " *c''u ", - " wc''' ", - " *c'cc ", - " wc''' ", - " *c'cc ", - " ****** " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_garage_0", - "object": { - "mapgensize": [ 17, 17 ], - "rows": [ - "_____ ", - "_________________", - "_________________", - "_________________", - "____UU___________", - "____U____________", - "_________________", - " _____________", - " _____________", - " _____________", - " U____________", - " UU___________", - " _____________", - " _____________", - " _____________", - " ", - " " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_garage_1", - "object": { - "mapgensize": [ 17, 17 ], - "rows": [ - " ", - " ", - " ", - " ", - " *** ", - " *r' ", - " *r' ", - " *c' ", - " *c' ", - " *'' ", - " *'' ", - " *** ", - " ", - " ", - " ", - " ", - " " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_garage_2", - "object": { - "mapgensize": [ 17, 17 ], - "rows": [ - " ", - " ", - " ", - " ", - " ***", - " ''*", - " '''", - " ''*", - " ''*", - " '''", - " ''*", - " ***", - " ", - " ", - " ", - " ", - " " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_garage_3", - "object": { - "mapgensize": [ 17, 17 ], - "rows": [ - " ", - " ", - " ", - " ", - " ''''''' ", - " ''''''' ", - " ''''''' ", - " ''''''' ", - " ''''''' ", - " ''''''' ", - " ''''''' ", - " ''''''' ", - " ", - " ", - " ", - " ", - " " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_garage_4", - "object": { - "mapgensize": [ 17, 17 ], - "rows": [ - " ", - " *** ***", - " * *", - " ", - " ", - " ", - " ", - " '", - " '", - " ", - " ", - " ", - " ", - " * *", - " *** ***", - " ", - " " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_garage_5", - "object": { - "mapgensize": [ 17, 17 ], - "rows": [ - " ", - " ''''''' ", - " ''''''''''3 ", - " '''''''''''''", - " '' '''", - " ", - " ", - " ", - " ", - " r ", - " r ", - " '' '''", - " '''''''''''''", - " ''''''''''' ", - " ''''''' ", - " ", - " " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "bc_prim_garage_6", - "object": { - "mapgensize": [ 17, 17 ], - "rows": [ - "***** ", - "*'bb ", - "*''' ", - "*'''+ ", - "*((' ", - "*ttr ", - "**** ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - ], - "palettes": [ "acidia_camp_palette" ] - } - }, { "type": "mapgen", "method": "json", @@ -1163,115 +845,6 @@ "method": "json", "object": { "set": [ { "point": "terrain", "id": "t_radio_controls", "x": 13, "y": 21 } ] } }, - { - "type": "mapgen", - "//": "legacy name for now", - "update_mapgen_id": "faction_base_farm_0", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "bc_prim_farm_0" ], "x": 1, "y": 10 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "faction_base_field_camp_farm_1", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 0 }, - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 0 }, - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 0 }, - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 3 }, - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 3 }, - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 3 }, - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 6 }, - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 6 }, - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 6 } - ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "faction_base_field_camp_farm_2", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "bc_prim_farm_2" ], "x": 1, "y": 10 }, - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 6 }, - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 6 }, - { "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 6 } - ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "faction_base_field_camp_farm_3", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "bc_prim_farm_3" ], "x": 1, "y": 10 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 14 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 14 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 14 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 16 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 16 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 16 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 18 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 18 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 18 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 20 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 20 }, - { "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 20 } - ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "faction_base_field_camp_farm_4", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "bc_prim_farm_4" ], "x": 1, "y": 10 } ] } - }, - { - "type": "mapgen", - "//": "legacy name for now", - "update_mapgen_id": "faction_base_garage_0", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_0" ], "x": 2, "y": 6 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "faction_base_field_camp_garage_1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_1" ], "x": 2, "y": 6 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "faction_base_field_camp_garage_2", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_2" ], "x": 2, "y": 6 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "faction_base_field_camp_garage_3", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_3" ], "x": 2, "y": 6 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "faction_base_field_camp_garage_4", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_4" ], "x": 2, "y": 6 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "faction_base_field_camp_garage_5", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_5" ], "x": 2, "y": 6 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "faction_base_field_camp_garage_6", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_6" ], "x": 2, "y": 6 } ] } - }, { "type": "mapgen", "//": "legacy name for now", diff --git a/data/json/mapgen/basecamps/modular_shelter/modular_shelter_common.json b/data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_common.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter/modular_shelter_common.json rename to data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_common.json diff --git a/data/json/mapgen/basecamps/modular_shelter/modular_shelter_log.json b/data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_log.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter/modular_shelter_log.json rename to data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_log.json diff --git a/data/json/mapgen/basecamps/modular_shelter/modular_shelter_rock.json b/data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_rock.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter/modular_shelter_rock.json rename to data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_rock.json diff --git a/data/json/mapgen/basecamps/modular_shelter/modular_shelter_standard.json b/data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_standard.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter/modular_shelter_standard.json rename to data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_standard.json diff --git a/data/json/mapgen/basecamps/modular_shelter/modular_shelter_wad.json b/data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wad.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter/modular_shelter_wad.json rename to data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wad.json diff --git a/data/json/mapgen/basecamps/modular_shelter/modular_shelter_wood.json b/data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wood.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter/modular_shelter_wood.json rename to data/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wood.json diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_common.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_common.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_common.json rename to data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_common.json diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_log.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_log.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_log.json rename to data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_log.json diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_rock.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_rock.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_rock.json rename to data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_rock.json diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_standard.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_standard.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_standard.json rename to data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_standard.json diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wad.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wad.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wad.json rename to data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wad.json diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wood.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wood.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wood.json rename to data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wood.json diff --git a/data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_common.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_common.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_common.json rename to data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_common.json diff --git a/data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_log.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_log.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_log.json rename to data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_log.json diff --git a/data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_rock.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_rock.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_rock.json rename to data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_rock.json diff --git a/data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_standard.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_standard.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_standard.json rename to data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_standard.json diff --git a/data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_wad.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wad.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_wad.json rename to data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wad.json diff --git a/data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_wood.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wood.json similarity index 100% rename from data/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_wood.json rename to data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wood.json diff --git a/data/json/mapgen/basecamps/modular_canteen/modular_canteen_common.json b/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_common.json similarity index 100% rename from data/json/mapgen/basecamps/modular_canteen/modular_canteen_common.json rename to data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_common.json diff --git a/data/json/mapgen/basecamps/modular_canteen/modular_canteen_log.json b/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_log.json similarity index 100% rename from data/json/mapgen/basecamps/modular_canteen/modular_canteen_log.json rename to data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_log.json diff --git a/data/json/mapgen/basecamps/modular_canteen/modular_canteen_metal.json b/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_metal.json similarity index 100% rename from data/json/mapgen/basecamps/modular_canteen/modular_canteen_metal.json rename to data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_metal.json diff --git a/data/json/mapgen/basecamps/modular_canteen/modular_canteen_migo_resin.json b/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_migo_resin.json similarity index 100% rename from data/json/mapgen/basecamps/modular_canteen/modular_canteen_migo_resin.json rename to data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_migo_resin.json diff --git a/data/json/mapgen/basecamps/modular_canteen/modular_canteen_rammed_earth.json b/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rammed_earth.json similarity index 100% rename from data/json/mapgen/basecamps/modular_canteen/modular_canteen_rammed_earth.json rename to data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rammed_earth.json diff --git a/data/json/mapgen/basecamps/modular_canteen/modular_canteen_rock.json b/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rock.json similarity index 100% rename from data/json/mapgen/basecamps/modular_canteen/modular_canteen_rock.json rename to data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rock.json diff --git a/data/json/mapgen/basecamps/modular_canteen/modular_canteen_wad.json b/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wad.json similarity index 100% rename from data/json/mapgen/basecamps/modular_canteen/modular_canteen_wad.json rename to data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wad.json diff --git a/data/json/mapgen/basecamps/modular_canteen/modular_canteen_wood.json b/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wood.json similarity index 100% rename from data/json/mapgen/basecamps/modular_canteen/modular_canteen_wood.json rename to data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wood.json diff --git a/data/json/mapgen/basecamps/expansion/modular_farm/version_1/primitive_farm.json b/data/json/mapgen/basecamps/expansion/modular_farm/version_1/primitive_farm.json new file mode 100644 index 0000000000000..6fb4ef99f17f0 --- /dev/null +++ b/data/json/mapgen/basecamps/expansion/modular_farm/version_1/primitive_farm.json @@ -0,0 +1,212 @@ +[ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmf_0", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_farm_0", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmf_0" ], "x": 10, "y": 10 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_farm_long_fields", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + "mmmmmm", + "mmmmmm", + " ", + " ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_farm_short_fields", + "object": { "mapgensize": [ 2, 2 ], "rows": [ + "mm", + "mm" + ], "palettes": [ "acidia_camp_palette" ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_farm_0", + "object": { + "mapgensize": [ 13, 13 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " U___U ", + " _____ ", + " _____ ", + " _____ ", + " _____ ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_farm_2", + "object": { + "mapgensize": [ 13, 13 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " *,,,* ", + " ,''', ", + " ,''H, ", + " *'HH* ", + " ***** ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_farm_3", + "object": { + "mapgensize": [ 13, 13 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " *+* ", + " * * ", + " * * ", + " ", + " ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_farm_4", + "object": { + "mapgensize": [ 13, 13 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ***+** ", + " *c''u ", + " wc''' ", + " *c'cc ", + " wc''' ", + " *c'cc ", + " ****** " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmf_1", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "bc_prim_farm_0" ], "x": 1, "y": 10 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_field_camp_farm_1", + "method": "json", + "object": { + "place_nested": [ + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 0 }, + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 0 }, + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 0 }, + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 3 }, + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 3 }, + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 3 }, + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 6 }, + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 6 }, + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 6 } + ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_field_camp_farm_2", + "method": "json", + "object": { + "place_nested": [ + { "chunks": [ "bc_prim_farm_2" ], "x": 1, "y": 10 }, + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 6 }, + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 6 }, + { "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 6 } + ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_field_camp_farm_3", + "method": "json", + "object": { + "place_nested": [ + { "chunks": [ "bc_prim_farm_3" ], "x": 1, "y": 10 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 14 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 14 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 14 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 16 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 16 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 16 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 18 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 18 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 18 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 20 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 20 }, + { "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 20 } + ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_field_camp_farm_4", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "bc_prim_farm_4" ], "x": 1, "y": 10 } ] } + } +] diff --git a/data/json/mapgen/basecamps/expansion/modular_garage/version_1/primitive_garage.json b/data/json/mapgen/basecamps/expansion/modular_garage/version_1/primitive_garage.json new file mode 100644 index 0000000000000..6ff4e8c8712f5 --- /dev/null +++ b/data/json/mapgen/basecamps/expansion/modular_garage/version_1/primitive_garage.json @@ -0,0 +1,263 @@ +[ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmg_0", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_garage_0", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmg_0" ], "x": 10, "y": 10 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_garage_0", + "object": { + "mapgensize": [ 17, 17 ], + "rows": [ + "_____ ", + "_________________", + "_________________", + "_________________", + "____UU___________", + "____U____________", + "_________________", + " _____________", + " _____________", + " _____________", + " U____________", + " UU___________", + " _____________", + " _____________", + " _____________", + " ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_garage_1", + "object": { + "mapgensize": [ 17, 17 ], + "rows": [ + " ", + " ", + " ", + " ", + " *** ", + " *r' ", + " *r' ", + " *c' ", + " *c' ", + " *'' ", + " *'' ", + " *** ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_garage_2", + "object": { + "mapgensize": [ 17, 17 ], + "rows": [ + " ", + " ", + " ", + " ", + " ***", + " ''*", + " '''", + " ''*", + " ''*", + " '''", + " ''*", + " ***", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_garage_3", + "object": { + "mapgensize": [ 17, 17 ], + "rows": [ + " ", + " ", + " ", + " ", + " ''''''' ", + " ''''''' ", + " ''''''' ", + " ''''''' ", + " ''''''' ", + " ''''''' ", + " ''''''' ", + " ''''''' ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_garage_4", + "object": { + "mapgensize": [ 17, 17 ], + "rows": [ + " ", + " *** ***", + " * *", + " ", + " ", + " ", + " ", + " '", + " '", + " ", + " ", + " ", + " ", + " * *", + " *** ***", + " ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_garage_5", + "object": { + "mapgensize": [ 17, 17 ], + "rows": [ + " ", + " ''''''' ", + " ''''''''''3 ", + " '''''''''''''", + " '' '''", + " ", + " ", + " ", + " ", + " r ", + " r ", + " '' '''", + " '''''''''''''", + " ''''''''''' ", + " ''''''' ", + " ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "bc_prim_garage_6", + "object": { + "mapgensize": [ 17, 17 ], + "rows": [ + "***** ", + "*'bb ", + "*''' ", + "*'''+ ", + "*((' ", + "*ttr ", + "**** ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "acidia_camp_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmg_1", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_0" ], "x": 2, "y": 6 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_field_camp_garage_1", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_1" ], "x": 2, "y": 6 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_field_camp_garage_2", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_2" ], "x": 2, "y": 6 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_field_camp_garage_3", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_3" ], "x": 2, "y": 6 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_field_camp_garage_4", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_4" ], "x": 2, "y": 6 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_field_camp_garage_5", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_5" ], "x": 2, "y": 6 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_field_camp_garage_6", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "bc_prim_garage_6" ], "x": 2, "y": 6 } ] } + } +] diff --git a/data/json/mapgen/basecamps/modular_livestock/modular_livestock_common.json b/data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_common.json similarity index 99% rename from data/json/mapgen/basecamps/modular_livestock/modular_livestock_common.json rename to data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_common.json index 1e0120cd0ddaf..dacfbeb5f893d 100644 --- a/data/json/mapgen/basecamps/modular_livestock/modular_livestock_common.json +++ b/data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_common.json @@ -1,10 +1,4 @@ [ - { - "type": "mapgen", - "update_mapgen_id": "faction_base_livestock_0", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbml_0" ], "x": 15, "y": 3 } ] } - }, { "type": "mapgen", "method": "json", @@ -22,6 +16,12 @@ "palettes": [ "fbml_wood_palette" ] } }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_livestock_0", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_0" ], "x": 10, "y": 10 } ] } + }, { "type": "mapgen", "method": "json", diff --git a/data/json/mapgen/basecamps/modular_livestock/modular_livestock_log.json b/data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_log.json similarity index 100% rename from data/json/mapgen/basecamps/modular_livestock/modular_livestock_log.json rename to data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_log.json diff --git a/data/json/mapgen/basecamps/modular_livestock/modular_livestock_metal.json b/data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_metal.json similarity index 100% rename from data/json/mapgen/basecamps/modular_livestock/modular_livestock_metal.json rename to data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_metal.json diff --git a/data/json/mapgen/basecamps/modular_livestock/modular_livestock_migo_resin.json b/data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_migo_resin.json similarity index 100% rename from data/json/mapgen/basecamps/modular_livestock/modular_livestock_migo_resin.json rename to data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_migo_resin.json diff --git a/data/json/mapgen/basecamps/modular_livestock/modular_livestock_rammed_earth.json b/data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rammed_earth.json similarity index 100% rename from data/json/mapgen/basecamps/modular_livestock/modular_livestock_rammed_earth.json rename to data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rammed_earth.json diff --git a/data/json/mapgen/basecamps/modular_livestock/modular_livestock_rock.json b/data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rock.json similarity index 100% rename from data/json/mapgen/basecamps/modular_livestock/modular_livestock_rock.json rename to data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rock.json diff --git a/data/json/mapgen/basecamps/modular_livestock/modular_livestock_wad.json b/data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wad.json similarity index 100% rename from data/json/mapgen/basecamps/modular_livestock/modular_livestock_wad.json rename to data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wad.json diff --git a/data/json/mapgen/basecamps/modular_livestock/modular_livestock_wood.json b/data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wood.json similarity index 100% rename from data/json/mapgen/basecamps/modular_livestock/modular_livestock_wood.json rename to data/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wood.json diff --git a/data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_common.json b/data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_common.json similarity index 96% rename from data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_common.json rename to data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_common.json index 4f1c2300cf5c4..0ac96f18aacd9 100644 --- a/data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_common.json +++ b/data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_common.json @@ -18,7 +18,7 @@ }, { "type": "mapgen", - "update_mapgen_id": "faction_base_saltworks_0", + "update_mapgen_id": "fbmsw_0", "method": "json", "object": { "place_nested": [ { "chunks": [ "fbmsw_0" ], "x": 15, "y": 3 } ] } }, diff --git a/data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_log.json b/data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_log.json similarity index 100% rename from data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_log.json rename to data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_log.json diff --git a/data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_metal.json b/data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_metal.json similarity index 100% rename from data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_metal.json rename to data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_metal.json diff --git a/data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_migo_resin.json b/data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_migo_resin.json similarity index 100% rename from data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_migo_resin.json rename to data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_migo_resin.json diff --git a/data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_rammed_earth.json b/data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_rammed_earth.json similarity index 100% rename from data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_rammed_earth.json rename to data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_rammed_earth.json diff --git a/data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_rock.json b/data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_rock.json similarity index 100% rename from data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_rock.json rename to data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_rock.json diff --git a/data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_wad.json b/data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_wad.json similarity index 100% rename from data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_wad.json rename to data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_wad.json diff --git a/data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_wood.json b/data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_wood.json similarity index 100% rename from data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_wood.json rename to data/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_wood.json diff --git a/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_common.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_common.json new file mode 100644 index 0000000000000..9cc50cba1e3c6 --- /dev/null +++ b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_common.json @@ -0,0 +1,25 @@ +[ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbms_0", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "fbms_wood_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_storehouse_0", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbms_0" ], "x": 10, "y": 10 } ] } + } +] diff --git a/data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_log.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_log.json similarity index 100% rename from data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_log.json rename to data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_log.json diff --git a/data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_metal.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_metal.json similarity index 100% rename from data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_metal.json rename to data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_metal.json diff --git a/data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_migo_resin.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_migo_resin.json similarity index 100% rename from data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_migo_resin.json rename to data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_migo_resin.json diff --git a/data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_rammed_earth.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rammed_earth.json similarity index 100% rename from data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_rammed_earth.json rename to data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rammed_earth.json diff --git a/data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_rock.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rock.json similarity index 100% rename from data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_rock.json rename to data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rock.json diff --git a/data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_wad.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wad.json similarity index 100% rename from data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_wad.json rename to data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wad.json diff --git a/data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_wood.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wood.json similarity index 94% rename from data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_wood.json rename to data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wood.json index 7143aae742cd7..5e43c8e7d230a 100644 --- a/data/json/mapgen/basecamps/modular_storehouse/modular_storehouse_wood.json +++ b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wood.json @@ -13,29 +13,6 @@ }, "furniture": { "b": "f_bench", "t": "f_table", "x": "f_brazier", "U": "f_birdbath", "l": "f_locker", "B": "f_bookcase" } }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbms_0", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ", - " ", - " ", - " ", - " ", - " " - ], - "palettes": [ "fbms_wood_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "faction_base_storehouse_0", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbml_0" ], "x": 15, "y": 3 } ] } - }, { "type": "mapgen", "method": "json", diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_common.json similarity index 93% rename from data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json rename to data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_common.json index 28b79f6f7f526..2eea0d1100ce3 100644 --- a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json +++ b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_common.json @@ -32,6 +32,12 @@ "palettes": [ "fbmw_common_palette" ] } }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_modular_workshop_0", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmw_0" ], "x": 10, "y": 10 } ] } + }, { "type": "mapgen", "method": "json", diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_log.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_log.json similarity index 100% rename from data/json/mapgen/basecamps/modular_workshop/modular_workshop_log.json rename to data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_log.json diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_metal.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_metal.json similarity index 100% rename from data/json/mapgen/basecamps/modular_workshop/modular_workshop_metal.json rename to data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_metal.json diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_migo_resin.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_migo_resin.json similarity index 100% rename from data/json/mapgen/basecamps/modular_workshop/modular_workshop_migo_resin.json rename to data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_migo_resin.json diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_rammed_earth.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rammed_earth.json similarity index 100% rename from data/json/mapgen/basecamps/modular_workshop/modular_workshop_rammed_earth.json rename to data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rammed_earth.json diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_rock.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rock.json similarity index 100% rename from data/json/mapgen/basecamps/modular_workshop/modular_workshop_rock.json rename to data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rock.json diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_wad.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wad.json similarity index 100% rename from data/json/mapgen/basecamps/modular_workshop/modular_workshop_wad.json rename to data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wad.json diff --git a/data/json/mapgen/basecamps/modular_workshop/modular_workshop_wood.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wood.json similarity index 100% rename from data/json/mapgen/basecamps/modular_workshop/modular_workshop_wood.json rename to data/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wood.json diff --git a/data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_beds.json b/data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_beds.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_beds.json rename to data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_beds.json diff --git a/data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_common.json b/data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_common.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_common.json rename to data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_common.json diff --git a/data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_log.json b/data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_log.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_log.json rename to data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_log.json diff --git a/data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_metal.json b/data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_metal.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_metal.json rename to data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_metal.json diff --git a/data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_migo_resin.json b/data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_migo_resin.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_migo_resin.json rename to data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_migo_resin.json diff --git a/data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rammed_earth.json b/data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rammed_earth.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rammed_earth.json rename to data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rammed_earth.json diff --git a/data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rock.json b/data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rock.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rock.json rename to data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rock.json diff --git a/data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wad.json b/data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wad.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wad.json rename to data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wad.json diff --git a/data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wood.json b/data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wood.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wood.json rename to data/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wood.json diff --git a/data/json/recipes/basecamps/fbmc_helipad/recipe_modular_helipad_common.json b/data/json/recipes/basecamps/base/fbmc_helipad/recipe_modular_helipad_common.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_helipad/recipe_modular_helipad_common.json rename to data/json/recipes/basecamps/base/fbmc_helipad/recipe_modular_helipad_common.json diff --git a/data/json/recipes/basecamps/fbmc_helipad/recipe_modular_helipad_garage.json b/data/json/recipes/basecamps/base/fbmc_helipad/recipe_modular_helipad_garage.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_helipad/recipe_modular_helipad_garage.json rename to data/json/recipes/basecamps/base/fbmc_helipad/recipe_modular_helipad_garage.json diff --git a/data/json/recipes/basecamps/fbmc_lighthouse/recipe_modular_lighthouse_common.json b/data/json/recipes/basecamps/base/fbmc_lighthouse/recipe_modular_lighthouse_common.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_lighthouse/recipe_modular_lighthouse_common.json rename to data/json/recipes/basecamps/base/fbmc_lighthouse/recipe_modular_lighthouse_common.json diff --git a/data/json/recipes/basecamps/fbmc_lightindustry/recipe_modular_lightindustry_00.json b/data/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_00.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_lightindustry/recipe_modular_lightindustry_00.json rename to data/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_00.json diff --git a/data/json/recipes/basecamps/fbmc_lightindustry/recipe_modular_lightindustry_00_beds.json b/data/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_00_beds.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_lightindustry/recipe_modular_lightindustry_00_beds.json rename to data/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_00_beds.json diff --git a/data/json/recipes/basecamps/fbmc_lightindustry/recipe_modular_lightindustry_10.json b/data/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_10.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_lightindustry/recipe_modular_lightindustry_10.json rename to data/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_10.json diff --git a/data/json/recipes/basecamps/fbmc_lightindustry/recipe_modular_lightindustry_10_beds.json b/data/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_10_beds.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_lightindustry/recipe_modular_lightindustry_10_beds.json rename to data/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_10_beds.json diff --git a/data/json/recipes/basecamps/fbmc_lightindustry/recipe_modular_lightindustry_workshop.json b/data/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_workshop.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_lightindustry/recipe_modular_lightindustry_workshop.json rename to data/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_workshop.json diff --git a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+1.json b/data/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+1.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+1.json rename to data/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+1.json diff --git a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+2.json b/data/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+2.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+2.json rename to data/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+2.json diff --git a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+3.json b/data/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+3.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+3.json rename to data/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+3.json diff --git a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+4.json b/data/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+4.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+4.json rename to data/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+4.json diff --git a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_expansion_surveys.json b/data/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_expansion_surveys.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_expansion_surveys.json rename to data/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_expansion_surveys.json diff --git a/data/json/recipes/basecamps/fbmc_outpost/recipe_modular_outpost_cross.json b/data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_cross.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_outpost/recipe_modular_outpost_cross.json rename to data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_cross.json diff --git a/data/json/recipes/basecamps/fbmc_outpost/recipe_modular_outpost_normal.json b/data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_normal.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_outpost/recipe_modular_outpost_normal.json rename to data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_normal.json diff --git a/data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json b/data/json/recipes/basecamps/base/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json rename to data/json/recipes/basecamps/base/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json diff --git a/data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_common.json b/data/json/recipes/basecamps/base/fbmc_pottery_cottage/recipe_pottery_cottage_common.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_common.json rename to data/json/recipes/basecamps/base/fbmc_pottery_cottage/recipe_pottery_cottage_common.json diff --git a/data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_beds.json b/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_beds.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_beds.json rename to data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_beds.json diff --git a/data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_common.json b/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_common.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_common.json rename to data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_common.json diff --git a/data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_log.json b/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_log.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_log.json rename to data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_log.json diff --git a/data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_metal.json b/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_metal.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_metal.json rename to data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_metal.json diff --git a/data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_migo_resin.json b/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_migo_resin.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_migo_resin.json rename to data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_migo_resin.json diff --git a/data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_rammed_earth.json b/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_rammed_earth.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_rammed_earth.json rename to data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_rammed_earth.json diff --git a/data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_rock.json b/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_rock.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_rock.json rename to data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_rock.json diff --git a/data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_wad.json b/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_wad.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_wad.json rename to data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_wad.json diff --git a/data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_wood.json b/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_wood.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_radio_tower/recipe_modular_radio_tower_wood.json rename to data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_wood.json diff --git a/data/json/recipes/basecamps/fbmc_sealab_small/recipe_sealab_small_common.json b/data/json/recipes/basecamps/base/fbmc_sealab_small/recipe_sealab_small_common.json similarity index 100% rename from data/json/recipes/basecamps/fbmc_sealab_small/recipe_sealab_small_common.json rename to data/json/recipes/basecamps/base/fbmc_sealab_small/recipe_sealab_small_common.json diff --git a/data/json/recipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json b/data/json/recipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json new file mode 100644 index 0000000000000..792835e903692 --- /dev/null +++ b/data/json/recipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json @@ -0,0 +1,196 @@ +[ + { + "type": "recipe_group", + "id": "fbmc_firestation_recipes_1", + "building_type": "BASE", + "recipes": [ + { "id": "tinder", "description": " Craft: Tinder" }, + { "id": "pointy_stick", "description": " Craft: Pointy Sticks" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_firestation_farm_recipes_1", + "building_type": "FARM", + "recipes": [ + { "id": "seed_veggy_wild", "description": " Craft: Wild Veggy Stems" }, + { "id": "seed_raw_dandelion", "description": " Craft: Dandelion Seeds" }, + { "id": "seed_potato_raw", "description": " Craft: Potato, Starter" }, + { "id": "seed_buckwheat", "description": " Craft: Buckwheat Seeds" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_firestation_cooking_recipes_1", + "building_type": "COOK", + "recipes": [ + { "id": "tinder", "description": " Craft: Tinder" }, + { "id": "meat_cooked", "description": " Cook: Meat, Cooked" }, + { "id": "fish_cooked", "description": " Cook: Fish, Cooked" }, + { "id": "veggy_cooked", "description": " Cook: Veggy, Cooked" }, + { "id": "boiled_egg", "description": " Cook: Egg, Boiled" }, + { "id": "starch", "description": " Cook: Starch" }, + { "id": "starch_from_fibrous_stuff", "description": " Cook: Cattail Starch" }, + { "id": "flatbread", "description": " Cook: Flatbread" }, + { "id": "veggy_wild_cooked", "description": " Cook: Veggy, Cooked Wild" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_firestation_cooking_recipes_2", + "building_type": "COOK", + "recipes": [ + { "id": "flour", "description": " Cook: Flour" }, + { "id": "salt", "description": " Cook: Salt" }, + { "id": "bread", "description": " Cook: Bread" }, + { "id": "fruit_leather", "description": " Cook: Fruit Leather" }, + { "id": "jerky", "description": " Cook: Meat Jerky" }, + { "id": "mushroom_cooked", "description": " Cook: Mushroom, Cooked" }, + { "id": "lard", "description": " Cook: Lard" }, + { "id": "cornmeal", "description": " Cook: Cornmeal" }, + { "id": "meat_smoked", "description": " Cook: Meat, Smoked" }, + { "id": "fish_smoked", "description": " Cook: Fish, Smoked" }, + { "id": "dry_mushroom", "description": " Cook: Mushroom, Dried" }, + { "id": "dry_fruit", "description": " Cook: Fruit, Dehydrated" }, + { "id": "sausage", "description": " Cook: Sausage" }, + { "id": "sausage_wasteland", "description": " Cook: Sausage, Wasteland" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_firestation_cooking_recipes_3", + "building_type": "COOK", + "recipes": [ + { "id": "pie_meat", "description": " Cook: Meat Pie" }, + { "id": "pie_veggy", "description": " Cook: Veggy Pie" }, + { "id": "sugar", "description": " Cook: Sugar" }, + { "id": "hardtack", "description": " Cook: Hardtack" }, + { "id": "veggy_pickled_jarred", "description": " Cook: Veggy, Pickled" }, + { "id": "cheese_hard", "description": " Cook: Cheese, Hard" }, + { "id": "pemmican", "description": " Cook: Pemmican" }, + { "id": "veggy_aspic", "description": " Cook: Veggy Aspic" }, + { "id": "meat_canned_jarred", "description": " Cook: Meat, Canned" }, + { "id": "meat_aspic", "description": " Cook: Meat Aspic" }, + { "id": "kompot", "description": " Cook: Kompot" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_firestation_blacksmith_recipes_1", + "building_type": "SMITH", + "recipes": [ + { "id": "scrap_copper", "description": " Craft: Copper, Scrap" }, + { "id": "charcoal_npc", "description": " Craft: Charcoal" }, + { "id": "spike", "description": " Craft: Spike" }, + { "id": "caltrops_glass", "description": " Craft: Glass Caltrops" }, + { "id": "steel_chunk", "description": " Craft: Steel, Chunk" }, + { "id": "anvil", "description": " Craft: Anvil" }, + { "id": "steel_lump", "description": " Craft: Steel, Lump" } + ] + }, + { + "type": "recipe_group", + "id": "blacksmith_recipes_2", + "building_type": "SMITH", + "recipes": [ + { "id": "copper_knife", "description": " Craft: Knife, Copper" }, + { "id": "sword_crude", "description": " Craft: Sword, Crude" }, + { "id": "pot_copper", "description": " Craft: Pot, Copper" }, + { "id": "bolt_metal", "description": " Craft: Crossbow Bolt, Steel" }, + { "id": "armor_scrapsuit", "description": " Craft: Armor, Scrap Suit" }, + { "id": "helmet_scrap", "description": " Craft: Armor, Scrap Helmet" }, + { "id": "cuirass_scrap", "description": " Craft: Armor, Scrap Cuirass" }, + { "id": "armguard_scrap", "description": " Craft: Armor, Scrap Arm Guards" }, + { "id": "legguard_scrap", "description": " Craft: Armor, Scrap Leg Guards" }, + { "id": "boots_scrap", "description": " Craft: Armor, Scrap Boots" }, + { "id": "copper_ax", "description": " Craft: Axe, Copper" }, + { "id": "spear_copper", "description": " Craft: Spear, Copper" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_firestation_blacksmith_recipes_3", + "building_type": "SMITH", + "recipes": [ + { "id": "chisel", "description": " Craft: Metalworking Chisel" }, + { "id": "hammer", "description": " Craft: Hammer" }, + { "id": "tongs", "description": " Craft: Metal Tongs" }, + { "id": "nail", "description": " Craft: Nail" }, + { "id": "wire", "description": " Craft: Wire" }, + { "id": "swage", "description": " Craft: Swage and Die Set" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_firestation_blacksmith_recipes_4", + "building_type": "SMITH", + "recipes": [ + { "id": "blade", "description": " Craft: Blade" }, + { "id": "bearing", "description": " Craft: Bearings" }, + { "id": "caltrops", "description": " Craft: Caltrops" }, + { "id": "hand_drill", "description": " Craft: Hand Drill" }, + { "id": "sheet_metal", "description": " Craft: Sheet Metal" }, + { "id": "chain", "description": " Craft: Chain" }, + { "id": "shovel", "description": " Craft: Shovel" }, + { "id": "rebar", "description": " Craft: Rebar" }, + { "id": "gold_ring", "description": " Craft: Gold Ring" }, + { "id": "hammer_sledge", "description": " Craft: Hammer, Sledge" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_firestation_blacksmith_recipes_5", + "building_type": "SMITH", + "recipes": [ + { "id": "knife_combat", "description": " Craft: Knife, Combat" }, + { "id": "spear_steel", "description": " Craft: Spear, Steel" }, + { "id": "machete", "description": " Craft: Machete" }, + { "id": "pipe", "description": " Craft: Pipe" }, + { "id": "screwdriver", "description": " Craft: Screwdriver" }, + { "id": "throwing_axe", "description": " Craft: Axe, Throwing" }, + { "id": "wrench", "description": " Craft: Wrench" }, + { "id": "hatchet", "description": " Craft: Hatchet" }, + { "id": "throwing_knife", "description": " Craft: Knife, Throwing" }, + { "id": "crowbar", "description": " Craft: Crowbar" }, + { "id": "pot", "description": " Craft: Pot" }, + { "id": "hoe", "description": " Craft: Hoe" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_firestation_blacksmith_recipes_6", + "building_type": "SMITH", + "recipes": [ + { "id": "pliers", "description": " Craft: Pliers" }, + { "id": "halberd", "description": " Craft: Halberd" }, + { "id": "cuirass_lightplate", "description": " Craft: Armor, Cuirass" }, + { "id": "pockknife", "description": " Craft: Knife, Pocket" }, + { "id": "warhammer", "description": " Craft: Hammer, War" }, + { "id": "helmet_plate", "description": " Craft: Helm, Great" }, + { "id": "armor_lightplate", "description": " Craft: Armor, Plate" }, + { "id": "broadsword", "description": " Craft: Sword, Broadsword" }, + { "id": "scimitar", "description": " Craft: Sword, Scimitar" }, + { "id": "fire_ax", "description": " Craft: Axe, Fire" }, + { "id": "hacksaw", "description": " Craft: Hacksaw" }, + { "id": "saw", "description": " Craft: Woodsaw" }, + { "id": "pike", "description": " Craft: Spear, Awl Pike" }, + { "id": "rapier", "description": " Craft: Sword, Rapier" }, + { "id": "halligan", "description": " Craft: Halligan Bar" }, + { "id": "zweihander", "description": " Craft: Sword, Zweihander" }, + { "id": "pickaxe", "description": " Craft: Pickaxe" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_firestation_blacksmith_recipes_7", + "building_type": "SMITH", + "recipes": [ + { "id": "sheet_metal_npc_drop", "description": " Craft: Sheet Metal, Drop Hammer" }, + { "id": "chain_npc_drop", "description": " Craft: Chain, Drop Hammer" }, + { "id": "nail_npc_drop", "description": " Craft: Nail, Drop Hammer" }, + { "id": "wire_npc_drop", "description": " Craft: Wire, Drop Hammer" }, + { "id": "pipe_npc_drop", "description": " Craft: Pipe, Drop Hammer" }, + { "id": "rebar_npc_drop", "description": " Craft: Rebar, Drop Hammer" } + ] + } +] diff --git a/data/json/recipes/basecamps/recipe_modular_firestation_1/recipe_modular_firestation1.json b/data/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation1.json similarity index 95% rename from data/json/recipes/basecamps/recipe_modular_firestation_1/recipe_modular_firestation1.json rename to data/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation1.json index 268d361b9de91..dbdebdb880f80 100644 --- a/data/json/recipes/basecamps/recipe_modular_firestation_1/recipe_modular_firestation1.json +++ b/data/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation1.json @@ -13,7 +13,7 @@ "construction_blueprint": "fbmc_firestation1_0", "blueprint_provides": [ { "id": "gathering" }, - { "id": "primitive_camp_recipes_1" }, + { "id": "fbmc_firestation_recipes_1" }, { "id": "fbmc_firestation1_0" }, { "id": "firewood" }, { "id": "foraging" }, @@ -102,7 +102,12 @@ "construction_blueprint": "fbmc_firestation1_farm", "blueprint_name": "break up driveway", "blueprint_requires": [ { "id": "fbmc_firestation1_kitchen", "amount": 2 } ], - "blueprint_provides": [ { "id": "fbmc_firestation1_farm" }, { "id": "farming" }, { "id": "reseeding" }, { "id": "farm_recipes_1" } ], + "blueprint_provides": [ + { "id": "fbmc_firestation1_farm" }, + { "id": "farming" }, + { "id": "reseeding" }, + { "id": "fbmc_firestation_farm_recipes_1" } + ], "blueprint_excludes": [ { "id": "fbmc_firestation1_farm" } ], "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "check_blueprint_needs": false, @@ -141,7 +146,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_firestation_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], @@ -166,7 +171,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_firestation_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], @@ -190,7 +195,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_firestation_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], @@ -209,7 +214,7 @@ "construction_blueprint": "fbmc_firestation1_smoking_kiln", "blueprint_name": "build smoking racks and charcoal kiln", "blueprint_requires": [ { "id": "fbmc_firestation1_fire" } ], - "blueprint_provides": [ { "id": "fbmc_firestation1_smoking" }, { "id": "kitchen_recipes_2" } ], + "blueprint_provides": [ { "id": "fbmc_firestation1_smoking" }, { "id": "fbmc_firestation_cooking_recipes_2" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_smoking" } ], "blueprint_resources": [ "fake_char_smoker", "fake_char_kiln" ] }, @@ -226,7 +231,12 @@ "construction_blueprint": "fbmc_firestation1_butchery_rack", "blueprint_name": "build butchery area", "blueprint_requires": [ { "id": "fbmc_firestation1_smoking" } ], - "blueprint_provides": [ { "id": "fbmc_firestation1_butchery" }, { "id": "kitchen_recipes_3" }, { "id": "trapping" }, { "id": "hunting" } ], + "blueprint_provides": [ + { "id": "fbmc_firestation1_butchery" }, + { "id": "fbmc_firestation_cooking_recipes_3" }, + { "id": "trapping" }, + { "id": "hunting" } + ], "blueprint_excludes": [ { "id": "fbmc_firestation1_butchery" } ], "components": [ [ [ "knife_butcher", 1 ], [ "knife_steak", 1 ], [ "knife_chef", 1 ], [ "knife_carving", 1 ] ] ] }, @@ -359,7 +369,7 @@ "construction_blueprint": "fbmc_firestation1_forge", "blueprint_name": "build a metalworking forge", "blueprint_requires": [ { "id": "fbmc_firestation1_smoking" } ], - "blueprint_provides": [ { "id": "fbmc_firestation1_forge" }, { "id": "blacksmith_recipes_1" } ], + "blueprint_provides": [ { "id": "fbmc_firestation1_forge" }, { "id": "fbmc_firestation_blacksmith_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_forge" } ], "blueprint_resources": [ "fake_forge", "hammer" ], "components": [ [ [ "hammer", 1 ] ] ] @@ -377,7 +387,7 @@ "construction_blueprint": "fbmc_firestation1_forge2", "blueprint_name": "add an anvil and crucible", "blueprint_requires": [ { "id": "fbmc_firestation1_forge" } ], - "blueprint_provides": [ { "id": "fbmc_firestation1_anvil" }, { "id": "blacksmith_recipes_2" } ], + "blueprint_provides": [ { "id": "fbmc_firestation1_anvil" }, { "id": "fbmc_firestation_blacksmith_recipes_2" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_anvil" } ], "blueprint_resources": [ "anvil", "crucible" ], "check_blueprint_needs": false, @@ -396,7 +406,7 @@ "construction_blueprint": "fbmc_firestation1_forge3", "blueprint_name": "build a pottery kiln", "blueprint_requires": [ { "id": "fbmc_firestation1_anvil" } ], - "blueprint_provides": [ { "id": "fbmc_firestation1_pottery" }, { "id": "blacksmith_recipes_3" } ], + "blueprint_provides": [ { "id": "fbmc_firestation1_pottery" }, { "id": "fbmc_firestation_blacksmith_recipes_3" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_pottery" } ], "blueprint_resources": [ "anvil", "crucible" ], "components": [ [ [ "glassblowing_book", 1 ] ], [ [ "glasses_safety", 1 ] ], [ [ "chemistry_set", 1 ] ], [ [ "pipe", 1 ] ] ] @@ -415,7 +425,7 @@ "construction_blueprint": "fbmc_firestation1_forge4", "blueprint_name": "place advanced tools", "blueprint_requires": [ { "id": "fbmc_firestation1_pottery" } ], - "blueprint_provides": [ { "id": "fbmc_firestation1_tools" }, { "id": "blacksmith_recipes_4" } ], + "blueprint_provides": [ { "id": "fbmc_firestation1_tools" }, { "id": "fbmc_firestation_blacksmith_recipes_4" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_tools" } ], "blueprint_resources": [ "tongs", "chisel", "hammer", "swage" ], "blueprint_needs": { }, @@ -434,7 +444,7 @@ "construction_blueprint": "fbmc_firestation1_workbench", "blueprint_name": "build a workbench", "blueprint_requires": [ { "id": "fbmc_firestation1_tools" } ], - "blueprint_provides": [ { "id": "fbmc_firestation1_workbench" }, { "id": "blacksmith_recipes_5" } ], + "blueprint_provides": [ { "id": "fbmc_firestation1_workbench" }, { "id": "fbmc_firestation_blacksmith_recipes_5" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_workbench" } ], "blueprint_needs": { "time": "2 h", @@ -459,7 +469,7 @@ "construction_blueprint": "fbmc_firestation1_bellows", "blueprint_name": "build a bellows and barrel", "blueprint_requires": [ { "id": "fbmc_firestation1_workbench" } ], - "blueprint_provides": [ { "id": "fbmc_firestation1_bellows" }, { "id": "blacksmith_recipes_6" } ], + "blueprint_provides": [ { "id": "fbmc_firestation1_bellows" }, { "id": "fbmc_firestation_blacksmith_recipes_6" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_bellows" } ], "components": [ [ [ "hammer_sledge", 1 ] ], [ [ "30gal_drum", 1 ] ], [ [ "knife_combat", 1 ], [ "copper_knife", 1 ] ] ] }, @@ -476,7 +486,7 @@ "construction_blueprint": "fbmc_firestation1_drophammer", "blueprint_name": "build a drop hammer.", "blueprint_requires": [ { "id": "fbmc_firestation1_bellows" } ], - "blueprint_provides": [ { "id": "fbmc_firestation1_drophammer" }, { "id": "blacksmith_recipes_7" } ], + "blueprint_provides": [ { "id": "fbmc_firestation1_drophammer" }, { "id": "fbmc_firestation_blacksmith_recipes_7" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_drophammer" } ], "blueprint_resources": [ "wrench", "pliers", "fake_drop_hammer" ], "components": [ [ [ "wrench", 1 ] ], [ [ "pliers", 1 ] ] ] diff --git a/data/json/recipes/basecamps/recipe_modular_firestation_1/recipe_modular_firestation_walls_all.json b/data/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation_walls_all.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_firestation_1/recipe_modular_firestation_walls_all.json rename to data/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation_walls_all.json diff --git a/data/json/recipes/basecamps/recipe_modular_field_common.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_common.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_field_common.json rename to data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_common.json diff --git a/data/json/recipes/basecamps/recipe_modular_field_defenses.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_defenses.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_field_defenses.json rename to data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_defenses.json diff --git a/data/json/recipes/basecamps/recipe_modular_field_log.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_log.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_field_log.json rename to data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_log.json diff --git a/data/json/recipes/basecamps/recipe_modular_field_metal.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_metal.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_field_metal.json rename to data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_metal.json diff --git a/data/json/recipes/basecamps/recipe_modular_field_migo_resin.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_migo_resin.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_field_migo_resin.json rename to data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_migo_resin.json diff --git a/data/json/recipes/basecamps/recipe_modular_field_rammed_earth.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_rammed_earth.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_field_rammed_earth.json rename to data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_rammed_earth.json diff --git a/data/json/recipes/basecamps/recipe_modular_field_rock.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_rock.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_field_rock.json rename to data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_rock.json diff --git a/data/json/recipes/basecamps/recipe_modular_field_tent.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_tent.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_field_tent.json rename to data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_tent.json diff --git a/data/json/recipes/basecamps/recipe_modular_field_wad.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_wad.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_field_wad.json rename to data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_wad.json diff --git a/data/json/recipes/basecamps/recipe_modular_field_wood.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_wood.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_field_wood.json rename to data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_wood.json diff --git a/data/json/recipes/basecamps/recipe_primitive_field.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_primitive_field.json similarity index 80% rename from data/json/recipes/basecamps/recipe_primitive_field.json rename to data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_primitive_field.json index c5e9b8ec7986a..e48dd97f7a352 100644 --- a/data/json/recipes/basecamps/recipe_primitive_field.json +++ b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_primitive_field.json @@ -493,270 +493,6 @@ ], "check_blueprint_needs": false }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_farm_0", - "description": "Survey land for a farm shop.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "faction_base_farm_0", - "blueprint_name": "Farm survey", - "time": "180 m", - "blueprint_requires": [ { "id": "not_an_upgrade" } ], - "blueprint_needs": { - "time": "10 h", - "skills": [ [ "survival", 3 ] ], - "inline": { - "tools": [ [ [ "elec_jackhammer", 14000 ], [ "jackhammer", 280 ], [ "pickaxe", -1 ] ] ], - "qualities": [ [ { "id": "DIG", "level": 2 } ] ], - "components": [ ] - } - } - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_farm_1", - "description": "Plowing a few plots should get us started.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "autolearn": false, - "never_learn": true, - "time": "540 m", - "construction_blueprint": "faction_base_field_camp_farm_1", - "blueprint_name": "Farm basic plots", - "blueprint_provides": [ { "id": "farming" } ], - "blueprint_requires": [ { "id": "faction_base_farm_0" } ], - "qualities": [ [ { "id": "DIG", "level": 1 } ] ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_farm_2", - "description": "We could use a farming shed to store resources where we'll be working.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "difficulty": 4, - "autolearn": false, - "never_learn": true, - "time": "3600 m", - "construction_blueprint": "faction_base_field_camp_farm_2", - "blueprint_name": "Farm basic shed", - "blueprint_requires": [ { "id": "faction_base_farm_0" } ], - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "log", 54 ] ], [ [ "stick", 90 ] ] ], - "check_blueprint_needs": false - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_farm_3", - "description": "Our farm could be expanded by finishing the shed and adding additional plots.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "difficulty": 4, - "autolearn": false, - "never_learn": true, - "time": "2160 m", - "construction_blueprint": "faction_base_field_camp_farm_3", - "blueprint_name": "Farm upgraded shed", - "blueprint_requires": [ { "id": "faction_base_farm_0" }, { "id": "faction_base_farm_1" } ], - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "log", 24 ] ], [ [ "stick", 36 ] ], [ [ "2x4", 16 ] ], [ [ "nail", 36 ] ] ], - "check_blueprint_needs": false - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_farm_4", - "description": "Building a processing shack should allow us to reclaim additional seeds from our byproducts.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "difficulty": 4, - "autolearn": false, - "never_learn": true, - "//": "1hrs*26wall + 1.5 hr*1door + 0.5hrs*14pits + 2hrs*2window + 2hrs*20log roof + 0.5hrs*9counter + 0.5hrs*1table = 83.5 hrs (12hrs on/off) 7 days total; requires 26wall*(2log+3stick+6 2x4 ) + 1door*(16 2x4+36nail) + 2windows*(15 2x4+30nail+2log+glass) + 20roof*(2log+4stick+8 2x4) + 1table*(8nail+6 2x4) + 9counter*(8nail+6 2x4)", - "time": "84 h", - "construction_blueprint": "faction_base_field_camp_farm_4", - "blueprint_name": "Farm processing shack", - "blueprint_provides": [ { "id": "reseeding" }, { "id": "farm_recipes_1" } ], - "blueprint_requires": [ { "id": "faction_base_farm_3" } ], - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "log", 96 ] ], [ [ "stick", 158 ] ], [ [ "2x4", 336 ] ], [ [ "nail", 176 ] ], [ [ "glass_sheet", 2 ] ] ], - "check_blueprint_needs": false - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_garage_0", - "description": "Survey land for a garage.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "autolearn": false, - "construction_blueprint": "faction_base_garage_0", - "blueprint_name": "Garage survey", - "never_learn": true, - "time": "180 m", - "blueprint_requires": [ { "id": "not_an_upgrade" } ], - "blueprint_needs": { - "time": "1 d 6 h", - "skills": [ [ "survival", 3 ] ], - "inline": { - "tools": [ [ [ "elec_jackhammer", 42000 ], [ "jackhammer", 840 ], [ "pickaxe", -1 ] ] ], - "qualities": [ [ { "id": "DIG", "level": 2 } ] ], - "components": [ ] - } - } - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_garage_1", - "description": "Building a tool rack should be the first priority.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "difficulty": 4, - "autolearn": false, - "never_learn": true, - "construction_blueprint": "faction_base_field_camp_garage_1", - "blueprint_name": "Garage tool rack", - "blueprint_provides": [ { "id": "dismantling" } ], - "blueprint_requires": [ { "id": "faction_base_garage_0" } ], - "blueprint_resources": [ "wrench", "hacksaw" ], - "time": "5040 m", - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], - "components": [ - [ [ "log", 72 ] ], - [ [ "stick", 72 ] ], - [ [ "2x4", 110 ] ], - [ [ "nail", 16 ] ], - [ [ "pipe", 24 ] ], - [ [ "wrench", 1 ] ], - [ [ "hacksaw", 1 ] ], - [ [ "sheet_metal", 4 ] ] - ], - "check_blueprint_needs": false - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_garage_2", - "description": "We should start construction of a roof for the garage.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "difficulty": 4, - "autolearn": false, - "never_learn": true, - "construction_blueprint": "faction_base_field_camp_garage_2", - "blueprint_name": "Garage partial roof", - "blueprint_requires": [ { "id": "faction_base_garage_1" } ], - "time": "4320 m", - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "log", 68 ] ], [ [ "stick", 60 ] ], [ [ "2x4", 112 ] ] ], - "check_blueprint_needs": false - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_garage_3", - "description": "Finishing out the roof will let our mechanics work rain or shine.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "difficulty": 4, - "autolearn": false, - "never_learn": true, - "time": "10080 m", - "construction_blueprint": "faction_base_field_camp_garage_3", - "blueprint_name": "Garage completed roof", - "blueprint_requires": [ { "id": "faction_base_garage_2" } ], - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "log", 112 ] ], [ [ "2x4", 448 ] ] ], - "check_blueprint_needs": false - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_garage_4", - "description": "Our garage isn't big enough to work on larger vehicles. Let's start expanding it.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "difficulty": 4, - "autolearn": false, - "never_learn": true, - "time": "4320 m", - "construction_blueprint": "faction_base_field_camp_garage_4", - "blueprint_name": "Garage partial expansion", - "blueprint_requires": [ { "id": "faction_base_garage_3" } ], - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "log", 65 ] ], [ [ "stick", 96 ] ] ], - "check_blueprint_needs": false - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_garage_5", - "description": "Finishing the roof will let us park RVs and buses in the garage.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "difficulty": 5, - "autolearn": false, - "never_learn": true, - "time": "11520 m", - "construction_blueprint": "faction_base_field_camp_garage_5", - "blueprint_name": "Garage expanded roof", - "blueprint_requires": [ { "id": "faction_base_garage_4" } ], - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], - "components": [ - [ [ "log", 124 ] ], - [ [ "stick", 96 ] ], - [ [ "2x4", 752 ] ], - [ [ "nail", 24 ] ], - [ [ "pipe", 24 ] ], - [ [ "sheet_metal", 4 ] ] - ], - "check_blueprint_needs": false - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_garage_6", - "description": "Attaching quarters will let our mechanics work longer hours when needed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "difficulty": 4, - "autolearn": false, - "never_learn": true, - "time": "2880 m", - "construction_blueprint": "faction_base_field_camp_garage_6", - "blueprint_name": "Garage mechanics quarters", - "blueprint_requires": [ { "id": "faction_base_garage_5" } ], - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], - "components": [ - [ [ "log", 95 ] ], - [ [ "stick", 90 ] ], - [ [ "2x4", 154 ] ], - [ [ "nail", 72 ] ], - [ [ "pipe", 12 ] ], - [ [ "sheet_metal", 2 ] ], - [ [ "straw_pile", 16 ], [ "pine_bough", 20 ] ] - ], - "check_blueprint_needs": false - }, { "type": "recipe", "activity_level": "MODERATE_EXERCISE", diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter/modular_shelter_recipe_groups.json b/data/json/recipes/basecamps/base/recipe_modular_shelter/modular_shelter_recipe_groups.json new file mode 100644 index 0000000000000..92528ec4668ae --- /dev/null +++ b/data/json/recipes/basecamps/base/recipe_modular_shelter/modular_shelter_recipe_groups.json @@ -0,0 +1,27 @@ +[ + { + "type": "recipe_group", + "id": "fbmc_shelter_recipes_1", + "building_type": "BASE", + "recipes": [ + { "id": "tinder", "description": " Craft: Tinder" }, + { "id": "pointy_stick", "description": " Craft: Pointy Sticks" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_shelter_cooking_recipes_1", + "building_type": "COOK", + "recipes": [ + { "id": "tinder", "description": " Craft: Tinder" }, + { "id": "meat_cooked", "description": " Cook: Meat, Cooked" }, + { "id": "fish_cooked", "description": " Cook: Fish, Cooked" }, + { "id": "veggy_cooked", "description": " Cook: Veggy, Cooked" }, + { "id": "boiled_egg", "description": " Cook: Egg, Boiled" }, + { "id": "starch", "description": " Cook: Starch" }, + { "id": "starch_from_fibrous_stuff", "description": " Cook: Cattail Starch" }, + { "id": "flatbread", "description": " Cook: Flatbread" }, + { "id": "veggy_wild_cooked", "description": " Cook: Veggy, Cooked Wild" } + ] + } +] diff --git a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json b/data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_common.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_common.json index e7a868dceede2..274c3a65b432a 100644 --- a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json +++ b/data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_common.json @@ -13,7 +13,7 @@ "construction_blueprint": "fbmc_shelter_0", "blueprint_provides": [ { "id": "gathering" }, - { "id": "primitive_camp_recipes_1" }, + { "id": "fbmc_shelter_recipes_1" }, { "id": "fbmc_shelter_0" }, { "id": "firewood" }, { "id": "foraging" }, @@ -41,7 +41,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_shelter_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], @@ -75,7 +75,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_shelter_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], @@ -108,7 +108,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_shelter_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], diff --git a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_log.json b/data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_log.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_log.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_log.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_rock.json b/data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_rock.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_rock.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_rock.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_standard.json b/data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_standard.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_standard.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_standard.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_wad.json b/data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_wad.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_wad.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_wad.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_wood.json b/data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_wood.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_wood.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_wood.json diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/modular_shelter_1_recipe_groups.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/modular_shelter_1_recipe_groups.json new file mode 100644 index 0000000000000..ffdbb706def7d --- /dev/null +++ b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/modular_shelter_1_recipe_groups.json @@ -0,0 +1,27 @@ +[ + { + "type": "recipe_group", + "id": "fbmc_shelter_1_recipes_1", + "building_type": "BASE", + "recipes": [ + { "id": "tinder", "description": " Craft: Tinder" }, + { "id": "pointy_stick", "description": " Craft: Pointy Sticks" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_shelter_1_cooking_recipes_1", + "building_type": "COOK", + "recipes": [ + { "id": "tinder", "description": " Craft: Tinder" }, + { "id": "meat_cooked", "description": " Cook: Meat, Cooked" }, + { "id": "fish_cooked", "description": " Cook: Fish, Cooked" }, + { "id": "veggy_cooked", "description": " Cook: Veggy, Cooked" }, + { "id": "boiled_egg", "description": " Cook: Egg, Boiled" }, + { "id": "starch", "description": " Cook: Starch" }, + { "id": "starch_from_fibrous_stuff", "description": " Cook: Cattail Starch" }, + { "id": "flatbread", "description": " Cook: Flatbread" }, + { "id": "veggy_wild_cooked", "description": " Cook: Veggy, Cooked Wild" } + ] + } +] diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json index cca4bb35b94a3..1ab6f034ab99f 100644 --- a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json +++ b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json @@ -13,7 +13,7 @@ "construction_blueprint": "fbmc_shelter_1_0", "blueprint_provides": [ { "id": "gathering" }, - { "id": "primitive_camp_recipes_1" }, + { "id": "fbmc_shelter_1_recipes_1" }, { "id": "fbmc_shelter_1_0" }, { "id": "firewood" }, { "id": "foraging" }, @@ -41,7 +41,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_shelter_1_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], @@ -75,7 +75,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_shelter_1_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], @@ -108,7 +108,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_shelter_1_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/modular_shelter_2_recipe_groups.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/modular_shelter_2_recipe_groups.json new file mode 100644 index 0000000000000..b9b62eb6ae183 --- /dev/null +++ b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/modular_shelter_2_recipe_groups.json @@ -0,0 +1,27 @@ +[ + { + "type": "recipe_group", + "id": "fbmc_shelter_2_recipes_1", + "building_type": "BASE", + "recipes": [ + { "id": "tinder", "description": " Craft: Tinder" }, + { "id": "pointy_stick", "description": " Craft: Pointy Sticks" } + ] + }, + { + "type": "recipe_group", + "id": "fbmc_shelter_2_cooking_recipes_1", + "building_type": "COOK", + "recipes": [ + { "id": "tinder", "description": " Craft: Tinder" }, + { "id": "meat_cooked", "description": " Cook: Meat, Cooked" }, + { "id": "fish_cooked", "description": " Cook: Fish, Cooked" }, + { "id": "veggy_cooked", "description": " Cook: Veggy, Cooked" }, + { "id": "boiled_egg", "description": " Cook: Egg, Boiled" }, + { "id": "starch", "description": " Cook: Starch" }, + { "id": "starch_from_fibrous_stuff", "description": " Cook: Cattail Starch" }, + { "id": "flatbread", "description": " Cook: Flatbread" }, + { "id": "veggy_wild_cooked", "description": " Cook: Veggy, Cooked Wild" } + ] + } +] diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json index 26f4db5df5093..ca7ec851222b1 100644 --- a/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json +++ b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json @@ -12,7 +12,7 @@ "construction_blueprint": "fbmc_shelter_2_0", "blueprint_provides": [ { "id": "gathering" }, - { "id": "primitive_camp_recipes_1" }, + { "id": "fbmc_shelter_2_recipes_1" }, { "id": "fbmc_shelter_2_0" }, { "id": "firewood" }, { "id": "foraging" }, @@ -39,7 +39,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_shelter_2_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], @@ -72,7 +72,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_shelter_2_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], @@ -104,7 +104,7 @@ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, - { "id": "kitchen_recipes_1" } + { "id": "fbmc_shelter_2_cooking_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_fire" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_wood.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wood.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_wood.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wood.json diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_common.json b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_common.json similarity index 98% rename from data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_common.json rename to data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_common.json index 295a53a00ce0f..5aa1b11f269cc 100644 --- a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_common.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_common.json @@ -11,7 +11,7 @@ "never_learn": true, "construction_blueprint": "faction_base_canteen_0", "blueprint_name": "kitchen survey", - "time": "180 m", + "time": "3 h", "blueprint_requires": [ { "id": "not_an_upgrade" } ], "blueprint_provides": [ { "id": "fbmk_0" } ] }, @@ -35,7 +35,7 @@ { "id": "hunting" } ], "blueprint_excludes": [ { "id": "fbmk_canteen_fire" } ], - "blueprint_resources": [ "fake_fireplace", "pot" ], + "blueprint_resources": [ "fake_fireplace", "fake_fireplace", "pot" ], "blueprint_needs": { "time": "4 h 30 m", "skills": [ [ "fabrication", 2 ], [ "survival", 1 ] ], @@ -68,7 +68,7 @@ { "id": "hunting" } ], "blueprint_excludes": [ { "id": "fbmk_canteen_fire" } ], - "blueprint_resources": [ "fake_fireplace", "pot" ], + "blueprint_resources": [ "fake_fireplace", "fake_fireplace", "pot" ], "blueprint_needs": { "time": "2 h 30 m", "skills": [ [ "fabrication", 5 ], [ "mechanics", 3 ] ], @@ -98,7 +98,7 @@ "construction_blueprint": "fbmk_canteen_well", "blueprint_name": "build a well", "blueprint_requires": [ { "id": "fbmk_canteen_fire" } ], - "blueprint_provides": [ { "id": "fbmk_canteen_well" } ], + "blueprint_provides": [ { "id": "fbmk_canteen_well" }, { "id": "water_well" } ], "blueprint_excludes": [ { "id": "fbmk_canteen_well" } ], "blueprint_needs": { "time": "11 h", diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_log.json b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_log.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_log.json rename to data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_log.json diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_metal.json b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_metal.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_metal.json rename to data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_metal.json diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_migo_resin.json b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_migo_resin.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_migo_resin.json rename to data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_migo_resin.json diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rammed_earth.json b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_rammed_earth.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rammed_earth.json rename to data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_rammed_earth.json diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rock.json b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_rock.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rock.json rename to data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_rock.json diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wad.json b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_wad.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wad.json rename to data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_wad.json diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wood.json b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_wood.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wood.json rename to data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_wood.json diff --git a/data/json/recipes/basecamps/expansion/recipe_modular_farm/version_1/recipe_primitive_farm.json b/data/json/recipes/basecamps/expansion/recipe_modular_farm/version_1/recipe_primitive_farm.json new file mode 100644 index 0000000000000..eb8b0ab1491bb --- /dev/null +++ b/data/json/recipes/basecamps/expansion/recipe_modular_farm/version_1/recipe_primitive_farm.json @@ -0,0 +1,94 @@ +[ + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_farm_0", + "description": "Survey land for a farming area.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_farm_0", + "blueprint_name": "farm area survey", + "time": "3 h", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "fbmf_0" } ] + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_farm_1", + "description": "Plowing a few plots should get us started.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "time": "540 m", + "construction_blueprint": "faction_base_field_camp_farm_1", + "blueprint_name": "Farm basic plots", + "blueprint_provides": [ { "id": "farming" } ], + "blueprint_requires": [ { "id": "fbmf_0" } ], + "qualities": [ [ { "id": "DIG", "level": 1 } ] ] + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_farm_2", + "description": "We could use a farming shed to store resources where we'll be working.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "difficulty": 4, + "autolearn": false, + "never_learn": true, + "time": "3600 m", + "construction_blueprint": "faction_base_field_camp_farm_2", + "blueprint_name": "Farm basic shed", + "blueprint_requires": [ { "id": "fbmf_0" } ], + "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "log", 54 ] ], [ [ "stick", 90 ] ] ], + "check_blueprint_needs": false + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_farm_3", + "description": "Our farm could be expanded by finishing the shed and adding additional plots.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "difficulty": 4, + "autolearn": false, + "never_learn": true, + "time": "2160 m", + "construction_blueprint": "faction_base_field_camp_farm_3", + "blueprint_name": "Farm upgraded shed", + "blueprint_requires": [ { "id": "fbmf_0" }, { "id": "faction_base_farm_1" } ], + "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "log", 24 ] ], [ [ "stick", 36 ] ], [ [ "2x4", 16 ] ], [ [ "nail", 36 ] ] ], + "check_blueprint_needs": false + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_farm_4", + "description": "Building a processing shack should allow us to reclaim additional seeds from our byproducts.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "difficulty": 4, + "autolearn": false, + "never_learn": true, + "//": "1hrs*26wall + 1.5 hr*1door + 0.5hrs*14pits + 2hrs*2window + 2hrs*20log roof + 0.5hrs*9counter + 0.5hrs*1table = 83.5 hrs (12hrs on/off) 7 days total; requires 26wall*(2log+3stick+6 2x4 ) + 1door*(16 2x4+36nail) + 2windows*(15 2x4+30nail+2log+glass) + 20roof*(2log+4stick+8 2x4) + 1table*(8nail+6 2x4) + 9counter*(8nail+6 2x4)", + "time": "84 h", + "construction_blueprint": "faction_base_field_camp_farm_4", + "blueprint_name": "Farm processing shack", + "blueprint_provides": [ { "id": "reseeding" }, { "id": "farm_recipes_1" } ], + "blueprint_requires": [ { "id": "faction_base_farm_3" } ], + "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "log", 96 ] ], [ [ "stick", 158 ] ], [ [ "2x4", 336 ] ], [ [ "nail", 176 ] ], [ [ "glass_sheet", 2 ] ] ], + "check_blueprint_needs": false + } +] diff --git a/data/json/recipes/basecamps/expansion/recipe_modular_garage/version_1/recipe_primitive_garage.json b/data/json/recipes/basecamps/expansion/recipe_modular_garage/version_1/recipe_primitive_garage.json new file mode 100644 index 0000000000000..9cc284f5eeb88 --- /dev/null +++ b/data/json/recipes/basecamps/expansion/recipe_modular_garage/version_1/recipe_primitive_garage.json @@ -0,0 +1,158 @@ +[ + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_garage_0", + "description": "Survey land for a garage.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_garage_0", + "blueprint_name": "garage survey", + "time": "3 h", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "fbmg_0" } ] + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_garage_1", + "description": "Building a tool rack should be the first priority.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "difficulty": 4, + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_field_camp_garage_1", + "blueprint_name": "Garage tool rack", + "blueprint_provides": [ { "id": "dismantling" } ], + "blueprint_requires": [ { "id": "fbmg_0" } ], + "blueprint_resources": [ "wrench", "hacksaw" ], + "time": "5040 m", + "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], + "components": [ + [ [ "log", 72 ] ], + [ [ "stick", 72 ] ], + [ [ "2x4", 110 ] ], + [ [ "nail", 16 ] ], + [ [ "pipe", 24 ] ], + [ [ "wrench", 1 ] ], + [ [ "hacksaw", 1 ] ], + [ [ "sheet_metal", 4 ] ] + ], + "check_blueprint_needs": false + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_garage_2", + "description": "We should start construction of a roof for the garage.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "difficulty": 4, + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_field_camp_garage_2", + "blueprint_name": "Garage partial roof", + "blueprint_requires": [ { "id": "faction_base_garage_1" } ], + "time": "4320 m", + "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "log", 68 ] ], [ [ "stick", 60 ] ], [ [ "2x4", 112 ] ] ], + "check_blueprint_needs": false + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_garage_3", + "description": "Finishing out the roof will let our mechanics work rain or shine.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "difficulty": 4, + "autolearn": false, + "never_learn": true, + "time": "10080 m", + "construction_blueprint": "faction_base_field_camp_garage_3", + "blueprint_name": "Garage completed roof", + "blueprint_requires": [ { "id": "faction_base_garage_2" } ], + "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "log", 112 ] ], [ [ "2x4", 448 ] ] ], + "check_blueprint_needs": false + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_garage_4", + "description": "Our garage isn't big enough to work on larger vehicles. Let's start expanding it.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "difficulty": 4, + "autolearn": false, + "never_learn": true, + "time": "4320 m", + "construction_blueprint": "faction_base_field_camp_garage_4", + "blueprint_name": "Garage partial expansion", + "blueprint_requires": [ { "id": "faction_base_garage_3" } ], + "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "log", 65 ] ], [ [ "stick", 96 ] ] ], + "check_blueprint_needs": false + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_garage_5", + "description": "Finishing the roof will let us park RVs and buses in the garage.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "difficulty": 5, + "autolearn": false, + "never_learn": true, + "time": "11520 m", + "construction_blueprint": "faction_base_field_camp_garage_5", + "blueprint_name": "Garage expanded roof", + "blueprint_requires": [ { "id": "faction_base_garage_4" } ], + "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], + "components": [ + [ [ "log", 124 ] ], + [ [ "stick", 96 ] ], + [ [ "2x4", 752 ] ], + [ [ "nail", 24 ] ], + [ [ "pipe", 24 ] ], + [ [ "sheet_metal", 4 ] ] + ], + "check_blueprint_needs": false + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_garage_6", + "description": "Attaching quarters will let our mechanics work longer hours when needed.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "difficulty": 4, + "autolearn": false, + "never_learn": true, + "time": "2880 m", + "construction_blueprint": "faction_base_field_camp_garage_6", + "blueprint_name": "Garage mechanics quarters", + "blueprint_requires": [ { "id": "faction_base_garage_5" } ], + "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ], + "components": [ + [ [ "log", 95 ] ], + [ [ "stick", 90 ] ], + [ [ "2x4", 154 ] ], + [ [ "nail", 72 ] ], + [ [ "pipe", 12 ] ], + [ [ "sheet_metal", 2 ] ], + [ [ "straw_pile", 16 ], [ "pine_bough", 20 ] ] + ], + "check_blueprint_needs": false + } +] diff --git a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_common.json b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_common.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_common.json rename to data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_common.json index bd4af3b89927a..5b35c725f1663 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_common.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_common.json @@ -11,7 +11,7 @@ "never_learn": true, "construction_blueprint": "faction_base_livestock_0", "blueprint_name": "Livestock survey", - "time": "180 m", + "time": "3 h", "blueprint_requires": [ { "id": "not_an_upgrade" } ], "blueprint_provides": [ { "id": "fbml_0" } ] }, diff --git a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_log.json b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_log.json similarity index 98% rename from data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_log.json rename to data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_log.json index 40331cbecb018..84152fb9cd9df 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_log.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_log.json @@ -40,7 +40,7 @@ "never_learn": true, "construction_blueprint": "fbml_stable0_log_southwest", "blueprint_name": "southwest stable", - "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], + "blueprint_requires": [ { "id": "fbml_0" } ], "blueprint_provides": [ { "id": "fbml_southwest" }, { "id": "stables" } ], "blueprint_excludes": [ { "id": "fbml_southwest" } ] }, diff --git a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_metal.json b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_metal.json similarity index 98% rename from data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_metal.json rename to data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_metal.json index 4b03531bea970..c3ea38293cc02 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_metal.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_metal.json @@ -40,7 +40,7 @@ "never_learn": true, "construction_blueprint": "fbml_stable0_metal_southwest", "blueprint_name": "southwest stable", - "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], + "blueprint_requires": [ { "id": "fbml_0" } ], "blueprint_provides": [ { "id": "fbml_southwest" }, { "id": "stables" } ], "blueprint_excludes": [ { "id": "fbml_southwest" } ] }, diff --git a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_migo_resin.json b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_migo_resin.json similarity index 98% rename from data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_migo_resin.json rename to data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_migo_resin.json index f8701cf1015e4..acd200f4f2d1a 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_migo_resin.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_migo_resin.json @@ -40,7 +40,7 @@ "never_learn": true, "construction_blueprint": "fbml_stable0_migo_resin_southwest", "blueprint_name": "southwest stable", - "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], + "blueprint_requires": [ { "id": "fbml_0" } ], "blueprint_provides": [ { "id": "fbml_southwest" }, { "id": "stables" } ], "blueprint_excludes": [ { "id": "fbml_southwest" } ] }, diff --git a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rammed_earth.json b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rammed_earth.json similarity index 98% rename from data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rammed_earth.json rename to data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rammed_earth.json index 3948a6607197b..bba2e4a40c7c0 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rammed_earth.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rammed_earth.json @@ -40,7 +40,7 @@ "never_learn": true, "construction_blueprint": "fbml_stable0_rammed_earth_southwest", "blueprint_name": "southwest stable", - "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], + "blueprint_requires": [ { "id": "fbml_0" } ], "blueprint_provides": [ { "id": "fbml_southwest" }, { "id": "stables" } ], "blueprint_excludes": [ { "id": "fbml_southwest" } ] }, diff --git a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rock.json b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rock.json similarity index 98% rename from data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rock.json rename to data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rock.json index c88636e7bbaa9..c17fb26e516c2 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rock.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rock.json @@ -40,7 +40,7 @@ "never_learn": true, "construction_blueprint": "fbml_stable0_rock_southwest", "blueprint_name": "southwest stable", - "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], + "blueprint_requires": [ { "id": "fbml_0" } ], "blueprint_provides": [ { "id": "fbml_southwest" }, { "id": "stables" } ], "blueprint_excludes": [ { "id": "fbml_southwest" } ] }, diff --git a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wad.json b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wad.json similarity index 98% rename from data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wad.json rename to data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wad.json index a11990b364329..8c91868766c84 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wad.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wad.json @@ -40,7 +40,7 @@ "never_learn": true, "construction_blueprint": "fbml_stable0_wad_southwest", "blueprint_name": "southwest stable", - "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], + "blueprint_requires": [ { "id": "fbml_0" } ], "blueprint_provides": [ { "id": "fbml_southwest" }, { "id": "stables" } ], "blueprint_excludes": [ { "id": "fbml_southwest" } ] }, diff --git a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wood.json b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wood.json similarity index 98% rename from data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wood.json rename to data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wood.json index a314d080c5767..687ac89b6bebd 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wood.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wood.json @@ -40,7 +40,7 @@ "never_learn": true, "construction_blueprint": "fbml_stable0_wood_southwest", "blueprint_name": "southwest stable", - "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], + "blueprint_requires": [ { "id": "fbml_0" } ], "blueprint_provides": [ { "id": "fbml_southwest" }, { "id": "stables" } ], "blueprint_excludes": [ { "id": "fbml_southwest" } ] }, diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_common.json b/data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_common.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_common.json rename to data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_common.json diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_log.json b/data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_log.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_log.json rename to data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_log.json diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json b/data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_metal.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json rename to data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_metal.json diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_migo_resin.json b/data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_migo_resin.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_migo_resin.json rename to data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_migo_resin.json diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json b/data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_rammed_earth.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json rename to data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_rammed_earth.json diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_stone.json b/data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_stone.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_stone.json rename to data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_stone.json diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json b/data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_wad.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json rename to data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_wad.json diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wood.json b/data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_wood.json similarity index 100% rename from data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wood.json rename to data/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_wood.json diff --git a/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_common.json b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_common.json new file mode 100644 index 0000000000000..b0a3ced9ad82d --- /dev/null +++ b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_common.json @@ -0,0 +1,18 @@ +[ + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_storehouse_0", + "description": "Survey land for a storehouse area.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_storehouse_0", + "blueprint_name": "Storehuse survey", + "time": "3 h", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "fbms_0" } ] + } +] diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_log.json b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_log.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_log.json rename to data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_log.json index 190c99a792165..4232a167fb968 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_log.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_log.json @@ -33,7 +33,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbms_room1_log_west", - "blueprint_name": "east storage wing", + "blueprint_name": "west storage wing", "blueprint_requires": [ { "id": "fbms_0" } ], "blueprint_provides": [ { "id": "fbms_west" } ], "blueprint_excludes": [ { "id": "fbms_west" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_metal.json b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_metal.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_metal.json rename to data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_metal.json index 2ed3c3b2c8fc9..2f84a04742e09 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_metal.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_metal.json @@ -33,7 +33,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbms_room1_metal_west", - "blueprint_name": "east storage wing", + "blueprint_name": "west storage wing", "blueprint_requires": [ { "id": "fbms_0" } ], "blueprint_provides": [ { "id": "fbms_west" } ], "blueprint_excludes": [ { "id": "fbms_west" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_migo_resin.json b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_migo_resin.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_migo_resin.json rename to data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_migo_resin.json index be05b14306e55..12cb039f2ab4e 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_migo_resin.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_migo_resin.json @@ -29,7 +29,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbms_room1_migo_resin_west", - "blueprint_name": "east storage wing", + "blueprint_name": "west storage wing", "blueprint_requires": [ { "id": "fbms_0" } ], "blueprint_provides": [ { "id": "fbms_west" } ], "blueprint_excludes": [ { "id": "fbms_west" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rammed_earth.json b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rammed_earth.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rammed_earth.json rename to data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rammed_earth.json index 50aa63ba59053..26109171b0709 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rammed_earth.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rammed_earth.json @@ -24,7 +24,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbms_room1_rammed_earth_west", - "blueprint_name": "east storage wing", + "blueprint_name": "west storage wing", "blueprint_requires": [ { "id": "fbms_0" } ], "blueprint_provides": [ { "id": "fbms_west" } ], "blueprint_excludes": [ { "id": "fbms_west" } ] diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rock.json b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rock.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rock.json rename to data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rock.json index 2aa9fb3609fec..902427ba05a45 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rock.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rock.json @@ -40,7 +40,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbms_room1_rock_west", - "blueprint_name": "east storage wing", + "blueprint_name": "west storage wing", "blueprint_requires": [ { "id": "fbms_0" } ], "blueprint_provides": [ { "id": "fbms_west" } ], "blueprint_excludes": [ { "id": "fbms_west" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wad.json b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wad.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wad.json rename to data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wad.json index 520521acdd04c..16cc560fe5dba 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wad.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wad.json @@ -42,7 +42,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbms_room1_wad_west", - "blueprint_name": "east storage wing", + "blueprint_name": "west storage wing", "blueprint_requires": [ { "id": "fbms_0" } ], "blueprint_provides": [ { "id": "fbms_west" } ], "blueprint_excludes": [ { "id": "fbms_west" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wood.json b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wood.json similarity index 96% rename from data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wood.json rename to data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wood.json index 712f57b4695fe..106ee794ae9ef 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wood.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wood.json @@ -1,20 +1,4 @@ [ - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_storehouse_0", - "description": "Survey land for a storage building.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "faction_base_storehouse_0", - "blueprint_name": "Storage Building survey", - "time": "180 m", - "blueprint_requires": [ { "id": "not_an_upgrade" } ], - "blueprint_provides": [ { "id": "fbms_0" } ] - }, { "type": "recipe", "activity_level": "MODERATE_EXERCISE", @@ -49,7 +33,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbms_room1_wood_west", - "blueprint_name": "east storage wing", + "blueprint_name": "west storage wing", "blueprint_requires": [ { "id": "fbms_0" } ], "blueprint_provides": [ { "id": "fbms_west" } ], "blueprint_excludes": [ { "id": "fbms_west" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_common.json similarity index 88% rename from data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json rename to data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_common.json index b2a000b529dd6..8028c43e9e317 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_common.json @@ -1,4 +1,20 @@ [ + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "faction_base_workshop_0", + "description": "Survey land for a workshop.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_workshop_0", + "blueprint_name": "workshop survey", + "time": "3 h", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "fbmw_0" } ] + }, { "type": "recipe", "activity_level": "MODERATE_EXERCISE", diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_log.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json rename to data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_log.json index f7c80bfd67ccf..fc76b2ccdf27b 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_log.json @@ -64,7 +64,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room4_log_east", - "blueprint_name": "east forage wall", + "blueprint_name": "east forge wall", "blueprint_requires": [ { "id": "fbmw_north" } ], "blueprint_provides": [ { "id": "fbmw_east" }, { "id": "blacksmith_recipes_3" } ], "blueprint_excludes": [ { "id": "fbmw_east" } ], @@ -96,7 +96,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room5_log_center", - "blueprint_name": "west forage wall", + "blueprint_name": "west forge wall", "blueprint_requires": [ { "id": "fbmw_east" } ], "blueprint_provides": [ { "id": "fbmw_center" } ], "blueprint_excludes": [ { "id": "fbmw_center" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_metal.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json rename to data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_metal.json index af6361baf7e1a..42091d8554a04 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_metal.json @@ -77,7 +77,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room4_metal_east", - "blueprint_name": "east forage wall", + "blueprint_name": "east forge wall", "blueprint_requires": [ { "id": "fbmw_north" } ], "blueprint_provides": [ { "id": "fbmw_east" }, { "id": "blacksmith_recipes_3" } ], "blueprint_excludes": [ { "id": "fbmw_east" } ], @@ -117,7 +117,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room5_metal_center", - "blueprint_name": "west forage wall", + "blueprint_name": "west forge wall", "blueprint_requires": [ { "id": "fbmw_east" } ], "blueprint_provides": [ { "id": "fbmw_center" } ], "blueprint_excludes": [ { "id": "fbmw_center" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_migo_resin.json b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_migo_resin.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_migo_resin.json rename to data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_migo_resin.json index c519432d39f32..a687b6ee2960c 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_migo_resin.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_migo_resin.json @@ -53,7 +53,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room4_migo_resin_east", - "blueprint_name": "east forage wall", + "blueprint_name": "east forge wall", "blueprint_requires": [ { "id": "fbmw_north" } ], "blueprint_provides": [ { "id": "fbmw_east" }, { "id": "blacksmith_recipes_3" } ], "blueprint_excludes": [ { "id": "fbmw_east" } ], @@ -83,7 +83,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room5_migo_resin_center", - "blueprint_name": "west forage wall", + "blueprint_name": "west forge wall", "blueprint_requires": [ { "id": "fbmw_east" } ], "blueprint_provides": [ { "id": "fbmw_center" } ], "blueprint_excludes": [ { "id": "fbmw_center" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_rammed_earth.json b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rammed_earth.json similarity index 98% rename from data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_rammed_earth.json rename to data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rammed_earth.json index 192a22ca4770e..54d7f2ae6b528 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_rammed_earth.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rammed_earth.json @@ -39,7 +39,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room4_rammed_earth_east", - "blueprint_name": "east forage wall", + "blueprint_name": "east forge wall", "blueprint_requires": [ { "id": "fbmw_north" } ], "blueprint_provides": [ { "id": "fbmw_east" }, { "id": "blacksmith_recipes_3" } ], "blueprint_excludes": [ { "id": "fbmw_east" } ] @@ -54,7 +54,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room5_rammed_earth_center", - "blueprint_name": "west forage wall", + "blueprint_name": "west forge wall", "blueprint_requires": [ { "id": "fbmw_east" } ], "blueprint_provides": [ { "id": "fbmw_center" } ], "blueprint_excludes": [ { "id": "fbmw_center" } ] diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rock.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json rename to data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rock.json index 89b531d157434..8530479ff6416 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rock.json @@ -74,7 +74,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room4_rock_east", - "blueprint_name": "east forage wall", + "blueprint_name": "east forge wall", "blueprint_requires": [ { "id": "fbmw_north" } ], "blueprint_provides": [ { "id": "fbmw_east" }, { "id": "blacksmith_recipes_3" } ], "blueprint_excludes": [ { "id": "fbmw_east" } ], @@ -107,7 +107,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room5_rock_center", - "blueprint_name": "west forage wall", + "blueprint_name": "west forge wall", "blueprint_requires": [ { "id": "fbmw_east" } ], "blueprint_provides": [ { "id": "fbmw_center" } ], "blueprint_excludes": [ { "id": "fbmw_center" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wad.json similarity index 99% rename from data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json rename to data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wad.json index 2d67c10e80d7d..d5128d63908f9 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wad.json @@ -74,7 +74,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room4_wad_east", - "blueprint_name": "east forage wall", + "blueprint_name": "east forge wall", "blueprint_requires": [ { "id": "fbmw_north" } ], "blueprint_provides": [ { "id": "fbmw_east" }, { "id": "blacksmith_recipes_3" } ], "blueprint_excludes": [ { "id": "fbmw_east" } ], @@ -108,7 +108,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room5_wad_center", - "blueprint_name": "west forage wall", + "blueprint_name": "west forge wall", "blueprint_requires": [ { "id": "fbmw_east" } ], "blueprint_provides": [ { "id": "fbmw_center" } ], "blueprint_excludes": [ { "id": "fbmw_center" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wood.json similarity index 93% rename from data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json rename to data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wood.json index 103f8314ba6d0..4a0c418564767 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wood.json @@ -1,20 +1,4 @@ [ - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_workshop_0", - "description": "Survey land for a workshop area.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "skill_used": "fabrication", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "faction_base_workshop_0", - "blueprint_name": "workshop survey", - "time": "180 m", - "blueprint_requires": [ { "id": "not_an_upgrade" } ], - "blueprint_provides": [ { "id": "fbmw_0" } ] - }, { "type": "recipe", "activity_level": "MODERATE_EXERCISE", @@ -73,7 +57,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room4_wood_east", - "blueprint_name": "east forage wall", + "blueprint_name": "east forge wall", "blueprint_requires": [ { "id": "fbmw_north" } ], "blueprint_provides": [ { "id": "fbmw_east" }, { "id": "blacksmith_recipes_3" } ], "blueprint_excludes": [ { "id": "fbmw_east" } ], @@ -104,7 +88,7 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmw_room5_wood_center", - "blueprint_name": "west forage wall", + "blueprint_name": "west forge wall", "blueprint_requires": [ { "id": "fbmw_east" } ], "blueprint_provides": [ { "id": "fbmw_center" } ], "blueprint_excludes": [ { "id": "fbmw_center" } ], diff --git a/data/json/recipes/basecamps/legacy_recipe_groups.json b/data/json/recipes/basecamps/legacy_recipe_groups.json new file mode 100644 index 0000000000000..edd0d2f371471 --- /dev/null +++ b/data/json/recipes/basecamps/legacy_recipe_groups.json @@ -0,0 +1,232 @@ +[ + { + "type": "recipe_group", + "id": "kitchen_recipes_1", + "building_type": "COOK", + "recipes": [ + { "id": "tinder", "description": " Craft: Tinder" }, + { "id": "meat_cooked", "description": " Cook: Meat, Cooked" }, + { "id": "fish_cooked", "description": " Cook: Fish, Cooked" }, + { "id": "veggy_cooked", "description": " Cook: Veggy, Cooked" }, + { "id": "boiled_egg", "description": " Cook: Egg, Boiled" }, + { "id": "starch", "description": " Cook: Starch" }, + { "id": "starch_from_fibrous_stuff", "description": " Cook: Cattail Starch" }, + { "id": "flatbread", "description": " Cook: Flatbread" }, + { "id": "veggy_wild_cooked", "description": " Cook: Veggy, Cooked Wild" } + ] + }, + { + "type": "recipe_group", + "id": "kitchen_recipes_2", + "building_type": "COOK", + "recipes": [ + { "id": "flour", "description": " Cook: Flour" }, + { "id": "salt", "description": " Cook: Salt" }, + { "id": "bread", "description": " Cook: Bread" }, + { "id": "fruit_leather", "description": " Cook: Fruit Leather" }, + { "id": "jerky", "description": " Cook: Meat Jerky" }, + { "id": "mushroom_cooked", "description": " Cook: Mushroom, Cooked" }, + { "id": "lard", "description": " Cook: Lard" }, + { "id": "cornmeal", "description": " Cook: Cornmeal" }, + { "id": "meat_smoked", "description": " Cook: Meat, Smoked" }, + { "id": "fish_smoked", "description": " Cook: Fish, Smoked" }, + { "id": "dry_mushroom", "description": " Cook: Mushroom, Dried" }, + { "id": "dry_fruit", "description": " Cook: Fruit, Dehydrated" }, + { "id": "sausage", "description": " Cook: Sausage" }, + { "id": "sausage_wasteland", "description": " Cook: Sausage, Wasteland" } + ] + }, + { + "type": "recipe_group", + "id": "kitchen_recipes_3", + "building_type": "COOK", + "recipes": [ + { "id": "pie_meat", "description": " Cook: Meat Pie" }, + { "id": "pie_veggy", "description": " Cook: Veggy Pie" }, + { "id": "sugar", "description": " Cook: Sugar" }, + { "id": "hardtack", "description": " Cook: Hardtack" }, + { "id": "veggy_pickled_jarred", "description": " Cook: Veggy, Pickled" }, + { "id": "cheese_hard", "description": " Cook: Cheese, Hard" }, + { "id": "pemmican", "description": " Cook: Pemmican" }, + { "id": "veggy_aspic", "description": " Cook: Veggy Aspic" }, + { "id": "meat_canned_jarred", "description": " Cook: Meat, Canned" }, + { "id": "meat_aspic", "description": " Cook: Meat Aspic" }, + { "id": "kompot", "description": " Cook: Kompot" } + ] + }, + { + "type": "recipe_group", + "id": "saltworks_recipes_1", + "building_type": "COOK", + "recipes": [ + { "id": "salt_from_salt_water", "description": " Craft: Salt from salt water" }, + { "id": "salted_fish", "description": " Cook: Fish, Salted" } + ] + }, + { + "type": "recipe_group", + "id": "saltworks_recipes_2", + "building_type": "COOK", + "recipes": [ + { "id": "brew_fruit_wine", "description": " Brew: Fruit Wine Must" }, + { "id": "brew_mead", "description": " Brew: Spiced Wine Must" }, + { "id": "brew_dandelion_wine", "description": " Brew: Dandelion Wine Must" }, + { "id": "brew_burdock_wine", "description": " Brew: Burdock Wine Must" }, + { "id": "brew_pine_wine", "description": " Brew: Pine Wine Must" }, + { "id": "brew_hb_beer", "description": " Brew: Beer" } + ] + }, + { + "type": "recipe_group", + "id": "saltworks_recipes_3", + "building_type": "COOK", + "recipes": [ + { "id": "brandy", "description": " Distill: Brandy" }, + { "id": "gin_from_mash", "description": " Distill: Gin" }, + { "id": "vodka_from_wash", "description": " Distill: Vodka" }, + { "id": "rum", "description": " Distill: Rum" } + ] + }, + { + "type": "recipe_group", + "id": "primitive_camp_recipes_1", + "building_type": "BASE", + "recipes": [ + { "id": "tinder", "description": " Craft: Tinder" }, + { "id": "pointy_stick", "description": " Craft: Pointy Sticks" }, + { "id": "wood_panel_from nailed planks", "description": " Craft: Wooden Panel, Nailed Planks" }, + { "id": "wood_panel_from wooden beams", "description": " Craft: Wooden Panel, Wooden Beams" }, + { "id": "wood_beam_from logs", "description": " Craft: Wooden Beam" } + ] + }, + { + "type": "recipe_group", + "id": "farm_recipes_1", + "building_type": "FARM", + "recipes": [ + { "id": "seed_veggy_wild", "description": " Craft: Wild Veggy Stems" }, + { "id": "seed_raw_dandelion", "description": " Craft: Dandelion Seeds" }, + { "id": "seed_potato_raw", "description": " Craft: Potato, Starter" }, + { "id": "seed_buckwheat", "description": " Craft: Buckwheat Seeds" } + ] + }, + { + "type": "recipe_group", + "id": "blacksmith_recipes_1", + "building_type": "SMITH", + "recipes": [ + { "id": "scrap_copper", "description": " Craft: Copper, Scrap" }, + { "id": "charcoal_npc", "description": " Craft: Charcoal" }, + { "id": "spike", "description": " Craft: Spike" }, + { "id": "caltrops_glass", "description": " Craft: Glass Caltrops" }, + { "id": "steel_chunk", "description": " Craft: Steel, Chunk" }, + { "id": "anvil", "description": " Craft: Anvil" }, + { "id": "steel_lump", "description": " Craft: Steel, Lump" } + ] + }, + { + "type": "recipe_group", + "id": "blacksmith_recipes_2", + "building_type": "SMITH", + "recipes": [ + { "id": "copper_knife", "description": " Craft: Knife, Copper" }, + { "id": "sword_crude", "description": " Craft: Sword, Crude" }, + { "id": "pot_copper", "description": " Craft: Pot, Copper" }, + { "id": "bolt_metal", "description": " Craft: Crossbow Bolt, Steel" }, + { "id": "armor_scrapsuit", "description": " Craft: Armor, Scrap Suit" }, + { "id": "helmet_scrap", "description": " Craft: Armor, Scrap Helmet" }, + { "id": "cuirass_scrap", "description": " Craft: Armor, Scrap Cuirass" }, + { "id": "armguard_scrap", "description": " Craft: Armor, Scrap Arm Guards" }, + { "id": "legguard_scrap", "description": " Craft: Armor, Scrap Leg Guards" }, + { "id": "boots_scrap", "description": " Craft: Armor, Scrap Boots" }, + { "id": "copper_ax", "description": " Craft: Axe, Copper" }, + { "id": "spear_copper", "description": " Craft: Spear, Copper" } + ] + }, + { + "type": "recipe_group", + "id": "blacksmith_recipes_3", + "building_type": "SMITH", + "recipes": [ + { "id": "chisel", "description": " Craft: Metalworking Chisel" }, + { "id": "hammer", "description": " Craft: Hammer" }, + { "id": "tongs", "description": " Craft: Metal Tongs" }, + { "id": "nail", "description": " Craft: Nail" }, + { "id": "wire", "description": " Craft: Wire" }, + { "id": "swage", "description": " Craft: Swage and Die Set" } + ] + }, + { + "type": "recipe_group", + "id": "blacksmith_recipes_4", + "building_type": "SMITH", + "recipes": [ + { "id": "blade", "description": " Craft: Blade" }, + { "id": "bearing", "description": " Craft: Bearings" }, + { "id": "caltrops", "description": " Craft: Caltrops" }, + { "id": "hand_drill", "description": " Craft: Hand Drill" }, + { "id": "sheet_metal", "description": " Craft: Sheet Metal" }, + { "id": "chain", "description": " Craft: Chain" }, + { "id": "shovel", "description": " Craft: Shovel" }, + { "id": "rebar", "description": " Craft: Rebar" }, + { "id": "gold_ring", "description": " Craft: Gold Ring" }, + { "id": "hammer_sledge", "description": " Craft: Hammer, Sledge" } + ] + }, + { + "type": "recipe_group", + "id": "blacksmith_recipes_5", + "building_type": "SMITH", + "recipes": [ + { "id": "knife_combat", "description": " Craft: Knife, Combat" }, + { "id": "spear_steel", "description": " Craft: Spear, Steel" }, + { "id": "machete", "description": " Craft: Machete" }, + { "id": "pipe", "description": " Craft: Pipe" }, + { "id": "screwdriver", "description": " Craft: Screwdriver" }, + { "id": "throwing_axe", "description": " Craft: Axe, Throwing" }, + { "id": "wrench", "description": " Craft: Wrench" }, + { "id": "hatchet", "description": " Craft: Hatchet" }, + { "id": "throwing_knife", "description": " Craft: Knife, Throwing" }, + { "id": "crowbar", "description": " Craft: Crowbar" }, + { "id": "pot", "description": " Craft: Pot" }, + { "id": "hoe", "description": " Craft: Hoe" } + ] + }, + { + "type": "recipe_group", + "id": "blacksmith_recipes_6", + "building_type": "SMITH", + "recipes": [ + { "id": "pliers", "description": " Craft: Pliers" }, + { "id": "halberd", "description": " Craft: Halberd" }, + { "id": "cuirass_lightplate", "description": " Craft: Armor, Cuirass" }, + { "id": "pockknife", "description": " Craft: Knife, Pocket" }, + { "id": "warhammer", "description": " Craft: Hammer, War" }, + { "id": "helmet_plate", "description": " Craft: Helm, Great" }, + { "id": "armor_lightplate", "description": " Craft: Armor, Plate" }, + { "id": "broadsword", "description": " Craft: Sword, Broadsword" }, + { "id": "scimitar", "description": " Craft: Sword, Scimitar" }, + { "id": "fire_ax", "description": " Craft: Axe, Fire" }, + { "id": "hacksaw", "description": " Craft: Hacksaw" }, + { "id": "saw", "description": " Craft: Woodsaw" }, + { "id": "pike", "description": " Craft: Spear, Awl Pike" }, + { "id": "rapier", "description": " Craft: Sword, Rapier" }, + { "id": "halligan", "description": " Craft: Halligan Bar" }, + { "id": "zweihander", "description": " Craft: Sword, Zweihander" }, + { "id": "pickaxe", "description": " Craft: Pickaxe" } + ] + }, + { + "type": "recipe_group", + "id": "blacksmith_recipes_7", + "building_type": "SMITH", + "recipes": [ + { "id": "sheet_metal_npc_drop", "description": " Craft: Sheet Metal, Drop Hammer" }, + { "id": "chain_npc_drop", "description": " Craft: Chain, Drop Hammer" }, + { "id": "nail_npc_drop", "description": " Craft: Nail, Drop Hammer" }, + { "id": "wire_npc_drop", "description": " Craft: Wire, Drop Hammer" }, + { "id": "pipe_npc_drop", "description": " Craft: Pipe, Drop Hammer" }, + { "id": "rebar_npc_drop", "description": " Craft: Rebar, Drop Hammer" } + ] + } +] diff --git a/data/json/recipes/basecamps/recipe_groups.json b/data/json/recipes/basecamps/recipe_groups.json index 4c68c73162f1c..e7e5872803582 100644 --- a/data/json/recipes/basecamps/recipe_groups.json +++ b/data/json/recipes/basecamps/recipe_groups.json @@ -4,25 +4,21 @@ "id": "all_faction_base_types", "building_type": "NONE", "recipes": [ - { "id": "faction_base_modular_hub_field_0", "description": "Field Camp", "om_terrains": [ "field" ] }, - { - "id": "faction_base_firestation_0", - "description": "Side Bunkroom Firestation Base", - "om_terrains": [ "fire_station" ] - }, + { "id": "faction_base_modular_hub_field_0", "description": "Modular Field Camp version 1", "om_terrains": [ "field" ] }, + { "id": "faction_base_firestation_0", "description": "Firestation Base", "om_terrains": [ "fire_station" ] }, { "id": "faction_base_shelter_0", - "description": "Open Center Evac Shelter Base", + "description": "Evac Shelter Base", "om_terrains": [ "shelter", "shelter_vandal" ] }, { "id": "faction_base_shelter_1_0", - "description": "Corner Stairs Evac Shelter Base", + "description": "Evac Shelter Base", "om_terrains": [ "shelter_1", "shelter_1_vandal" ] }, { "id": "faction_base_shelter_2_0", - "description": "Central Stairs Evac Shelter Base", + "description": "Evac Shelter Base", "om_terrains": [ "shelter_2", "shelter_2_vandal" ] }, { @@ -99,6 +95,7 @@ "id": "all_faction_base_expansions", "building_type": "NONE", "recipes": [ + { "id": "faction_base_canteen_0", "description": "Canteen", "om_terrains": [ "field" ] }, { "id": "faction_base_farm_0", "description": "Farm version 1. Shed, plots, some farming recipes", @@ -110,10 +107,9 @@ "om_terrains": [ "field" ] }, { "id": "faction_base_garage_0", "description": "Garage", "om_terrains": [ "field" ] }, - { "id": "faction_base_canteen_0", "description": "Canteen", "om_terrains": [ "field" ] }, { "id": "faction_base_livestock_0", "description": "Livestock Area", "om_terrains": [ "field" ] }, - { "id": "faction_base_storehouse_0", "description": "Central Storage Building", "om_terrains": [ "field" ] }, { "id": "faction_base_saltworks_0", "description": "Saltworks Area", "om_terrains": [ "field" ] }, + { "id": "faction_base_storehouse_0", "description": "Central Storage Building", "om_terrains": [ "field" ] }, { "id": "faction_base_workshop_0", "description": "Fabrication Workshop", "om_terrains": [ "field" ] }, { "id": "faction_base_lightindustry_workshop_0", diff --git a/doc/BASECAMP.md b/doc/BASECAMP.md index 02ff4bc7ee913..95ba1bf27f7e1 100644 --- a/doc/BASECAMP.md +++ b/doc/BASECAMP.md @@ -35,8 +35,7 @@ These are arbitrary strings and can be used to control the branching of the upgr provides `"id"` | meaning -- | -- `"bed"` | every 2 `"amount"`' of `"bed"` allows another expansion in the camp, to a maximum of 8, not include the camp center. -`"tool_storage"` | after this upgrade mission is complete, the Store Tools mission will be available -. +`"tool_storage"` | after this upgrade mission is complete, the Store Tools mission will be available. `"radio"` | after this upgrade mission is complete, two way radios communicating to the camp have extended range. `"pantry"` | after this upgrade mission is complete, the Distribute Food mission is more efficient when dealing with short term spoilage items. `"gathering"` | after this upgrade mission is complete, the Gather Materials, Distribute Food, and Reset Sort Points basecamp missions will be available. @@ -141,7 +140,7 @@ There are two special recipe groups, `"all_faction_base_types"` and `"all_factio }, ``` -Each entry in the `"recipes"` array must be a dictionary with the `"id"`, `"description"`, and `"om_terrains"` fields. `"id"` is the recipe `"id"` of the recipe that starts that basecamp or basecamp expansion upgrade path. `"description"` is a short name of the basecamp or basecamp expansion. `"om_terrains"` is a list of overmap terrain ids which can be used as the basis for the basecamp or basecamp expansion. +Each entry in the `"recipes"` array must be a dictionary with the `"id"`, `"description"`, and `"om_terrains"` fields. `"id"` is the recipe `"id"` of the recipe that starts that basecamp or basecamp expansion upgrade path, and has to conform to the pattern `"faction_base_X_0"`, where X distinguishes the entry from the others, with the prefix and suffix required by the code. `"description"` is a short name of the basecamp or basecamp expansion. `"om_terrains"` is a list of overmap terrain ids which can be used as the basis for the basecamp or basecamp expansion. All recipes that start an upgrade path or expansion should have a blueprint requirement that can never be met, such as "not_an_upgrade", to prevent them from showing up as available upgrades. Additionally, if you want to add an expansion, you must create an OMT with the same `id` as the expansion's `id`. @@ -196,3 +195,12 @@ Modular bases use the following naming scheme for recipes. Each element is sepa * AREA <-- the area in the 3x3 grid of the modular camp layout. blueprint keywords follow a similar scheme, but `"faction_base_modular"` is collapsed into `"fbm"` and the overmap terrain id is collapsed into a short identifier. ie, `"fbmf"` is the keyword identifier for elements of the modular field base. + +# Adding basecamp expansions + +Basecamp expansion upgrade paths are defined by the corresponding set of files to the basecamps themselves, with two additions (at the end of the list): +* The recipe JSONs that define what the material, tool, and skill requirements to perform an upgrade mission and the blueprint mapgen, blueprint requirements, blueprint provides, and blueprint resources associated with each upgrade mission. +* The mapgen_update JSONs that define how the map will change when the upgrade mission is complete. These may include shared instances of nested mapgen, such a standard room or tent. +* The recipe_group JSONs that define what recipes can be crafted after completing the upgrade mission and what camps and expansions are available. +* ../json/overmap/overmap_terrain/overmap_terrain_faction_base.json has to be updated to provide an overmap identifier for each new expansion. +* ../json/mapgen/faction_buildings.json also has to be updated to introduce an entry for the new expansion. \ No newline at end of file