From 8d91b8e115a8b1d68a525c078ecbf42bb87e2a2b Mon Sep 17 00:00:00 2001 From: Mark Langsdorf Date: Fri, 14 Jun 2019 21:58:30 -0500 Subject: [PATCH 1/4] basecamps: create a tinymap::fake_load function for bp_autocalc Using tinymap::load during data validation apparently causes all kinds of write-after-free errors and stomps over all the game data and is generally bad. So don't do that any more. Instead, borrow enough of the code from map::load and map::loadn to load a tinymap that is never intended to saved or integrated with the real MAPBUFFER. Similarly, when using a tinymap loaded by fake_map, don't try to retrieve the regional settings and just use a dummy variable. --- src/map.cpp | 36 ++++++++++++++++++++++++++++++++++++ src/map.h | 4 +++- src/mapgen.cpp | 17 +++++------------ 3 files changed, 44 insertions(+), 13 deletions(-) diff --git a/src/map.cpp b/src/map.cpp index 6050e03175411..438557af65c6d 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7590,6 +7590,42 @@ bool tinymap::inbounds( const tripoint &p ) const return generic_inbounds( p, map_boundaries, map_clearance ); } +// set up a map just long enough scribble on it +// this tinymap should never, ever get saved +bool tinymap::fake_load( const furn_id &fur_type, const ter_id &ter_type, const trap_id &trap_type ) +{ + bool do_terset = true; + set_abs_sub( 0, 0, 0 ); + for( int gridx = 0; gridx < my_MAPSIZE; gridx++ ) { + for( int gridy = 0; gridy < my_MAPSIZE; gridy++ ) { + submap *tmpsub = MAPBUFFER.lookup_submap( gridx, gridy, 0 ); + if( tmpsub == nullptr ) { + generate_uniform( gridx, gridy, 0, ter_type ); + do_terset = false; + tmpsub = MAPBUFFER.lookup_submap( gridx, gridy, 0 ); + if( tmpsub == nullptr ) { + dbg( D_ERROR ) << "failed to generate a fake submap at 0, 0, 0 "; + debugmsg( "failed to generate a fake submap at 0,0,0" ); + return false; + } + } + const size_t gridn = get_nonant( { gridx, gridy, 0 } ); + + setsubmap( gridn, tmpsub ); + } + } + + for( const tripoint &pos : points_in_rectangle( { 0, 0, 0 }, + tripoint( MAPSIZE * SEEX, MAPSIZE * SEEY, 0 ) ) ) { + if( do_terset ) { + ter_set( pos, ter_type ); + } + furn_set( pos, fur_type ); + trap_set( pos, trap_type ); + } + return true; +} + void map::set_graffiti( const tripoint &p, const std::string &contents ) { if( !inbounds( p ) ) { diff --git a/src/map.h b/src/map.h index 788a32ea2429f..60ed458ca0345 100644 --- a/src/map.h +++ b/src/map.h @@ -1524,6 +1524,7 @@ class map */ submap *get_submap_at_grid( const point &gridp ) const; submap *get_submap_at_grid( const tripoint &gridp ) const; + protected: /** * Get the index of a submap pointer in the grid given by grid coordinates. The grid * coordinates must be valid: 0 <= x < my_MAPSIZE, same for y. @@ -1537,7 +1538,7 @@ class map * The given submap pointer must not be null. */ void setsubmap( size_t grididx, submap *smap ); - + private: /** * Internal versions of public functions to avoid checking same variables multiple times. * They lack safety checks, because their callers already do those. @@ -1720,6 +1721,7 @@ class tinymap : public map public: tinymap( int mapsize = 2, bool zlevels = false ); bool inbounds( const tripoint &p ) const override; + bool fake_load( const furn_id &fur_type, const ter_id &ter_type, const trap_id &trap_type ); }; #endif diff --git a/src/mapgen.cpp b/src/mapgen.cpp index 4c6266a60b2fe..9b96e24f047b4 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -8455,23 +8455,16 @@ std::pair, std::map> get_changed_ids_from_up return std::make_pair( terrains, furnitures ); } - const tripoint omt_pos = tripoint( 0, 0, 0 ); - tinymap fake_map; - fake_map.load( 0, 0, 0, false ); - for( const tripoint &pos : fake_map.points_in_rectangle( omt_pos, - tripoint( MAPSIZE * SEEX, MAPSIZE * SEEY, 0 ) ) ) { - fake_map.furn_set( pos, f_null ); - fake_map.ter_set( pos, t_dirt ); - fake_map.trap_set( pos, tr_null ); + if( !fake_map.fake_load( f_null, t_dirt, tr_null ) ) { + return std::make_pair( terrains, furnitures ); } - - const regional_settings &rsettings = overmap_buffer.get_settings( omt_pos.x, omt_pos.y, - omt_pos.z ); oter_id any = oter_id( "field" ); + // just need a variable here, it doesn't need to be valid + const regional_settings dummy_settings; mapgendata fake_md( any, any, any, any, any, any, any, any, - any, any, omt_pos.z, rsettings, fake_map ); + any, any, 0, dummy_settings, fake_map ); if( update_function->second[0]->update_map( fake_md ) ) { for( const tripoint &pos : fake_map.points_in_rectangle( { 0, 0, 0 }, { 23, 23, 0 } ) ) { From 4bcb18b759033609483f608330db4fe98559581b Mon Sep 17 00:00:00 2001 From: Mark Langsdorf Date: Sat, 15 Jun 2019 09:37:06 -0500 Subject: [PATCH 2/4] basecamps: use the correct name for setting initial camp provides the recipe is the fully encoded camp type, not just the camp type. --- src/basecamp.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/basecamp.cpp b/src/basecamp.cpp index e166a02f4c19d..276ef1f066dda 100644 --- a/src/basecamp.cpp +++ b/src/basecamp.cpp @@ -163,7 +163,8 @@ void basecamp::define_camp( npc &p, const std::string &camp_type ) e.pos = omt_pos; expansions[ base_camps::base_dir ] = e; omt_ref = oter_id( "faction_base_camp_0" ); - update_provides( e.type, expansions[ base_camps::base_dir ] ); + update_provides( base_camps::faction_encode_abs( e, 0 ), + expansions[ base_camps::base_dir ] ); } else { expansions[ base_camps::base_dir ] = parse_expansion( om_cur, omt_pos ); } From b90188004e301709d70287187105a8cfa5067772 Mon Sep 17 00:00:00 2001 From: Mark Langsdorf Date: Sat, 15 Jun 2019 09:39:50 -0500 Subject: [PATCH 3/4] modular basecamps: refer to the central camp as a hub and produce dirt change the name of the core part of a modular camp to a modular hub, and differentiate betweeh the modular hub field (which is built in a field) and other modular hubs (such as one built on a mall roof). No other modular hubs are currently supported, but add some more scaffolding for that effort. Make sure that digging trenches produces appropriate amounts of rocks and soil. --- .../basecamps/modular_field_common.json | 126 +++---- .../basecamps/modular_field_defenses.json | 52 ++- .../mapgen/basecamps/modular_field_metal.json | 158 ++++---- .../mapgen/basecamps/modular_field_tent.json | 34 +- .../mapgen/basecamps/modular_field_wad.json | 158 ++++---- .../mapgen/basecamps/modular_field_wood.json | 158 ++++---- .../json/recipes/basecamps/recipe_groups.json | 2 +- .../recipe_modular_field_common.json | 351 ++++++++++-------- .../recipe_modular_field_defenses.json | 78 ++-- .../basecamps/recipe_modular_field_metal.json | 226 +++++------ .../basecamps/recipe_modular_field_tent.json | 60 +-- .../basecamps/recipe_modular_field_wad.json | 226 +++++------ .../basecamps/recipe_modular_field_wood.json | 226 +++++------ 13 files changed, 951 insertions(+), 904 deletions(-) diff --git a/data/json/mapgen/basecamps/modular_field_common.json b/data/json/mapgen/basecamps/modular_field_common.json index a238e7dbff7b8..d02837d3821f4 100644 --- a/data/json/mapgen/basecamps/modular_field_common.json +++ b/data/json/mapgen/basecamps/modular_field_common.json @@ -1,7 +1,7 @@ [ { "type": "mapgen", - "update_mapgen_id": "fbmf_0", + "update_mapgen_id": "fbmh_0", "method": "json", "object": { "set": [ @@ -12,26 +12,26 @@ }, { "type": "mapgen", - "update_mapgen_id": "fbmf_fireplace_northeast", + "update_mapgen_id": "fbmh_fireplace_northeast", "method": "json", "object": { "set": [ { "point": "furniture", "id": "f_fireplace", "x": 19, "y": 6 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_brazier_northeast", + "update_mapgen_id": "fbmh_brazier_northeast", "method": "json", "object": { "set": [ { "point": "furniture", "id": "f_brazier", "x": 19, "y": 6 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_stove_northeast", + "update_mapgen_id": "fbmh_stove_northeast", "method": "json", "object": { "set": [ { "point": "furniture", "id": "f_woodstove", "x": 19, "y": 6 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_strawbed", + "nested_mapgen_id": "fbmh_strawbed", "object": { "mapgensize": [ 2, 2 ], "set": [ @@ -42,14 +42,14 @@ }, { "type": "mapgen", - "update_mapgen_id": "fbmf_strawbed1_northeast", + "update_mapgen_id": "fbmh_strawbed1_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_strawbed" ], "x": 18, "y": 5 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_strawbed" ], "x": 18, "y": 5 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_bedset", + "nested_mapgen_id": "fbmh_bedset", "object": { "mapgensize": [ 3, 3 ], "set": [ @@ -61,167 +61,167 @@ }, { "type": "mapgen", - "update_mapgen_id": "fbmf_bed1_northeast", + "update_mapgen_id": "fbmh_bed1_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_bedset" ], "x": 17, "y": 5 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_bedset" ], "x": 17, "y": 5 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_strawbed2_northeast", + "update_mapgen_id": "fbmh_strawbed2_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_strawbed" ], "x": 18, "y": 7 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_strawbed" ], "x": 18, "y": 7 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_bed2_northeast", + "update_mapgen_id": "fbmh_bed2_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_bedset" ], "x": 17, "y": 7 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_bedset" ], "x": 17, "y": 7 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_strawbed3_east", + "update_mapgen_id": "fbmh_tent_strawbed3_east", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_strawbed" ], "x": 18, "y": 11 }, { "chunks": [ "fbmf_strawbed" ], "x": 18, "y": 13 } ] + "place_nested": [ { "chunks": [ "fbmh_strawbed" ], "x": 18, "y": 11 }, { "chunks": [ "fbmh_strawbed" ], "x": 18, "y": 13 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_bed3_east", + "update_mapgen_id": "fbmh_tent_bed3_east", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_bedset" ], "x": 17, "y": 11 }, { "chunks": [ "fbmf_bedset" ], "x": 17, "y": 13 } ] + "place_nested": [ { "chunks": [ "fbmh_bedset" ], "x": 17, "y": 11 }, { "chunks": [ "fbmh_bedset" ], "x": 17, "y": 13 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room_strawbed3_east", + "update_mapgen_id": "fbmh_room_strawbed3_east", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_strawbed" ], "x": 18, "y": 10 }, { "chunks": [ "fbmf_strawbed" ], "x": 18, "y": 13 } ] + "place_nested": [ { "chunks": [ "fbmh_strawbed" ], "x": 18, "y": 10 }, { "chunks": [ "fbmh_strawbed" ], "x": 18, "y": 13 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room_bed3_east", + "update_mapgen_id": "fbmh_room_bed3_east", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_bedset" ], "x": 17, "y": 10 }, { "chunks": [ "fbmf_bedset" ], "x": 17, "y": 13 } ] + "place_nested": [ { "chunks": [ "fbmh_bedset" ], "x": 17, "y": 10 }, { "chunks": [ "fbmh_bedset" ], "x": 17, "y": 13 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_strawbed3_southeast", + "update_mapgen_id": "fbmh_tent_strawbed3_southeast", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_strawbed" ], "x": 18, "y": 17 }, { "chunks": [ "fbmf_strawbed" ], "x": 18, "y": 19 } ] + "place_nested": [ { "chunks": [ "fbmh_strawbed" ], "x": 18, "y": 17 }, { "chunks": [ "fbmh_strawbed" ], "x": 18, "y": 19 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_bed3_southeast", + "update_mapgen_id": "fbmh_tent_bed3_southeast", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_bedset" ], "x": 17, "y": 17 }, { "chunks": [ "fbmf_bedset" ], "x": 17, "y": 19 } ] + "place_nested": [ { "chunks": [ "fbmh_bedset" ], "x": 17, "y": 17 }, { "chunks": [ "fbmh_bedset" ], "x": 17, "y": 19 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room_strawbed3_southeast", + "update_mapgen_id": "fbmh_room_strawbed3_southeast", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_strawbed" ], "x": 18, "y": 16 }, { "chunks": [ "fbmf_strawbed" ], "x": 18, "y": 19 } ] + "place_nested": [ { "chunks": [ "fbmh_strawbed" ], "x": 18, "y": 16 }, { "chunks": [ "fbmh_strawbed" ], "x": 18, "y": 19 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room_bed3_southeast", + "update_mapgen_id": "fbmh_room_bed3_southeast", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_bedset" ], "x": 17, "y": 16 }, { "chunks": [ "fbmf_bedset" ], "x": 17, "y": 19 } ] + "place_nested": [ { "chunks": [ "fbmh_bedset" ], "x": 17, "y": 16 }, { "chunks": [ "fbmh_bedset" ], "x": 17, "y": 19 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_strawbed3_northwest", + "update_mapgen_id": "fbmh_strawbed3_northwest", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_strawbed" ], "x": 4, "y": 5 }, { "chunks": [ "fbmf_strawbed" ], "x": 4, "y": 7 } ] + "place_nested": [ { "chunks": [ "fbmh_strawbed" ], "x": 4, "y": 5 }, { "chunks": [ "fbmh_strawbed" ], "x": 4, "y": 7 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_bed3_northwest", + "update_mapgen_id": "fbmh_bed3_northwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_bedset" ], "x": 4, "y": 5 }, { "chunks": [ "fbmf_bedset" ], "x": 4, "y": 7 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_bedset" ], "x": 4, "y": 5 }, { "chunks": [ "fbmh_bedset" ], "x": 4, "y": 7 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_strawbed3_west", + "update_mapgen_id": "fbmh_tent_strawbed3_west", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_strawbed" ], "x": 4, "y": 11 }, { "chunks": [ "fbmf_strawbed" ], "x": 4, "y": 13 } ] + "place_nested": [ { "chunks": [ "fbmh_strawbed" ], "x": 4, "y": 11 }, { "chunks": [ "fbmh_strawbed" ], "x": 4, "y": 13 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_bed3_west", + "update_mapgen_id": "fbmh_tent_bed3_west", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_bedset" ], "x": 4, "y": 11 }, { "chunks": [ "fbmf_bedset" ], "x": 4, "y": 13 } ] + "place_nested": [ { "chunks": [ "fbmh_bedset" ], "x": 4, "y": 11 }, { "chunks": [ "fbmh_bedset" ], "x": 4, "y": 13 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room_strawbed3_west", + "update_mapgen_id": "fbmh_room_strawbed3_west", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_strawbed" ], "x": 4, "y": 10 }, { "chunks": [ "fbmf_strawbed" ], "x": 4, "y": 13 } ] + "place_nested": [ { "chunks": [ "fbmh_strawbed" ], "x": 4, "y": 10 }, { "chunks": [ "fbmh_strawbed" ], "x": 4, "y": 13 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room_bed3_west", + "update_mapgen_id": "fbmh_room_bed3_west", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_bedset" ], "x": 4, "y": 10 }, { "chunks": [ "fbmf_bedset" ], "x": 4, "y": 13 } ] + "place_nested": [ { "chunks": [ "fbmh_bedset" ], "x": 4, "y": 10 }, { "chunks": [ "fbmh_bedset" ], "x": 4, "y": 13 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_strawbed3_southwest", + "update_mapgen_id": "fbmh_tent_strawbed3_southwest", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_strawbed" ], "x": 4, "y": 17 }, { "chunks": [ "fbmf_strawbed" ], "x": 4, "y": 19 } ] + "place_nested": [ { "chunks": [ "fbmh_strawbed" ], "x": 4, "y": 17 }, { "chunks": [ "fbmh_strawbed" ], "x": 4, "y": 19 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_bed3_southwest", + "update_mapgen_id": "fbmh_tent_bed3_southwest", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_bedset" ], "x": 4, "y": 17 }, { "chunks": [ "fbmf_bedset" ], "x": 4, "y": 19 } ] + "place_nested": [ { "chunks": [ "fbmh_bedset" ], "x": 4, "y": 17 }, { "chunks": [ "fbmh_bedset" ], "x": 4, "y": 19 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room_strawbed3_southwest", + "update_mapgen_id": "fbmh_room_strawbed3_southwest", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_strawbed" ], "x": 4, "y": 16 }, { "chunks": [ "fbmf_strawbed" ], "x": 4, "y": 19 } ] + "place_nested": [ { "chunks": [ "fbmh_strawbed" ], "x": 4, "y": 16 }, { "chunks": [ "fbmh_strawbed" ], "x": 4, "y": 19 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room_bed3_southwest", + "update_mapgen_id": "fbmh_room_bed3_southwest", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_bedset" ], "x": 4, "y": 16 }, { "chunks": [ "fbmf_bedset" ], "x": 4, "y": 19 } ] + "place_nested": [ { "chunks": [ "fbmh_bedset" ], "x": 4, "y": 16 }, { "chunks": [ "fbmh_bedset" ], "x": 4, "y": 19 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_kitchen_fireplace_center", + "update_mapgen_id": "fbmh_core_kitchen_fireplace_center", "method": "json", "object": { "mapgensize": [ 6, 6 ], @@ -233,20 +233,20 @@ }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_kitchen_butchery_center", + "update_mapgen_id": "fbmh_core_kitchen_butchery_center", "method": "json", "object": { "set": [ { "point": "furniture", "id": "f_butcher_rack", "x": 12, "y": 10 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_kitchen_toolrack_center", + "update_mapgen_id": "fbmh_core_kitchen_toolrack_center", "method": "json", "object": { "set": [ { "point": "furniture", "id": "f_bookcase", "x": 10, "y": 10 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_tableset", + "nested_mapgen_id": "fbmh_core_tableset", "object": { "mapgensize": [ 3, 3 ], "set": [ @@ -258,23 +258,23 @@ }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_kitchen_table_center", + "update_mapgen_id": "fbmh_core_kitchen_table_center", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_core_tableset" ], "x": 11, "y": 12 }, { "chunks": [ "fbmf_core_tableset" ], "x": 11, "y": 13 } ] + "place_nested": [ { "chunks": [ "fbmh_core_tableset" ], "x": 11, "y": 12 }, { "chunks": [ "fbmh_core_tableset" ], "x": 11, "y": 13 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_kitchen_table_south", + "update_mapgen_id": "fbmh_core_kitchen_table_south", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_core_tableset" ], "x": 11, "y": 16 }, { "chunks": [ "fbmf_core_tableset" ], "x": 11, "y": 15 } ] + "place_nested": [ { "chunks": [ "fbmh_core_tableset" ], "x": 11, "y": 16 }, { "chunks": [ "fbmh_core_tableset" ], "x": 11, "y": 15 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_kitchen_stove_south", + "update_mapgen_id": "fbmh_core_kitchen_stove_south", "method": "json", "object": { "set": [ @@ -285,25 +285,25 @@ }, { "type": "mapgen", - "update_mapgen_id": "fbmf_well_north", + "update_mapgen_id": "fbmh_well_north", "method": "json", "object": { "set": [ { "point": "terrain", "id": "t_water_pump", "x": 13, "y": 6 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_root_cellar_north", + "update_mapgen_id": "fbmh_root_cellar_north", "method": "json", "object": { "set": [ { "point": "terrain", "id": "t_rootcellar", "x": 12, "y": 8 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_radio_tower_north", + "update_mapgen_id": "fbmh_radio_tower_north", "method": "json", "object": { "set": [ { "point": "terrain", "id": "t_radio_tower", "x": 13, "y": 3 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_radio_console_north", + "update_mapgen_id": "fbmh_radio_console_north", "method": "json", "object": { "set": [ { "point": "terrain", "id": "t_radio_controls", "x": 13, "y": 4 } ] } } diff --git a/data/json/mapgen/basecamps/modular_field_defenses.json b/data/json/mapgen/basecamps/modular_field_defenses.json index 84388fb9754d3..369f164303924 100644 --- a/data/json/mapgen/basecamps/modular_field_defenses.json +++ b/data/json/mapgen/basecamps/modular_field_defenses.json @@ -1,62 +1,82 @@ [ { "type": "mapgen", - "update_mapgen_id": "fbmf_trench_north", + "update_mapgen_id": "fbmh_trench_north", "method": "json", - "object": { "set": [ { "line": "terrain", "id": "t_pit", "x": 3, "x2": 20, "y": 0, "y2": 0 } ] } + "object": { + "set": [ { "line": "terrain", "id": "t_pit", "x": 3, "x2": 20, "y": 0, "y2": 0 } ], + "place_items": [ { "x": [ 3, 20 ], "y": 1, "item": "digging_soil_loam_50L", "chance": 99, "repeat": 720 } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_trench_south", + "update_mapgen_id": "fbmh_trench_south", "method": "json", - "object": { "set": [ { "line": "terrain", "id": "t_pit", "x": 3, "x2": 20, "y": 23, "y2": 23 } ] } + "object": { + "set": [ { "line": "terrain", "id": "t_pit", "x": 3, "x2": 20, "y": 23, "y2": 23 } ], + "place_items": [ { "x": [ 3, 20 ], "y": 22, "item": "digging_soil_loam_50L", "chance": 99, "repeat": 720 } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_trench_corner_northeast", + "update_mapgen_id": "fbmh_trench_corner_northeast", "method": "json", - "object": { "set": [ { "line": "terrain", "id": "t_pit", "x": 21, "x2": 21, "y": 0, "y2": 4 } ] } + "object": { + "set": [ { "line": "terrain", "id": "t_pit", "x": 21, "x2": 21, "y": 0, "y2": 4 } ], + "place_items": [ { "x": 20, "y": [ 0, 4 ], "item": "digging_soil_loam_50L", "chance": 99, "repeat": 200 } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_trench_corner_northwest", + "update_mapgen_id": "fbmh_trench_corner_northwest", "method": "json", - "object": { "set": [ { "line": "terrain", "id": "t_pit", "x": 2, "x2": 2, "y": 0, "y2": 4 } ] } + "object": { + "set": [ { "line": "terrain", "id": "t_pit", "x": 2, "x2": 2, "y": 0, "y2": 4 } ], + "place_items": [ { "x": 3, "y": [ 0, 4 ], "item": "digging_soil_loam_50L", "chance": 99, "repeat": 200 } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_trench_corner_southeast", + "update_mapgen_id": "fbmh_trench_corner_southeast", "method": "json", - "object": { "set": [ { "line": "terrain", "id": "t_pit", "x": 21, "x2": 21, "y": 19, "y2": 23 } ] } + "object": { + "set": [ { "line": "terrain", "id": "t_pit", "x": 21, "x2": 21, "y": 19, "y2": 23 } ], + "place_items": [ { "x": 20, "y": [ 19, 23 ], "item": "digging_soil_loam_50L", "chance": 99, "repeat": 200 } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_trench_corner_southwest", + "update_mapgen_id": "fbmh_trench_corner_southwest", "method": "json", - "object": { "set": [ { "line": "terrain", "id": "t_pit", "x": 2, "x2": 2, "y": 19, "y2": 23 } ] } + "object": { + "set": [ { "line": "terrain", "id": "t_pit", "x": 2, "x2": 2, "y": 19, "y2": 23 } ], + "place_items": [ { "x": 2, "y": [ 19, 23 ], "item": "digging_soil_loam_50L", "chance": 99, "repeat": 200 } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_trench_east", + "update_mapgen_id": "fbmh_trench_east", "method": "json", "object": { "set": [ { "line": "terrain", "id": "t_pit", "x": 21, "x2": 22, "y": 0, "y2": 0 }, { "line": "terrain", "id": "t_pit", "x": 21, "x2": 22, "y": 23, "y2": 23 }, { "line": "terrain", "id": "t_pit", "x": 23, "x2": 23, "y": 0, "y2": 23 } - ] + ], + "place_items": [ { "x": 22, "y": [ 0, 23 ], "item": "digging_soil_loam_50L", "chance": 99, "repeat": 900 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_trench_west", + "update_mapgen_id": "fbmh_trench_west", "method": "json", "object": { "set": [ { "line": "terrain", "id": "t_pit", "x": 1, "x2": 2, "y": 0, "y2": 0 }, { "line": "terrain", "id": "t_pit", "x": 1, "x2": 2, "y": 23, "y2": 23 }, { "line": "terrain", "id": "t_pit", "x": 0, "x2": 0, "y": 0, "y2": 23 } - ] + ], + "place_items": [ { "x": 0, "y": [ 0, 23 ], "item": "digging_soil_loam_50L", "chance": 99, "repeat": 900 } ] } } ] diff --git a/data/json/mapgen/basecamps/modular_field_metal.json b/data/json/mapgen/basecamps/modular_field_metal.json index 244895d06a2a8..48a75f3f60c90 100644 --- a/data/json/mapgen/basecamps/modular_field_metal.json +++ b/data/json/mapgen/basecamps/modular_field_metal.json @@ -1,14 +1,14 @@ [ { "type": "palette", - "id": "fbmf_metal_palette", + "id": "fbmh_metal_palette", "terrain": { ";": "t_dirt", ".": "t_scrap_floor", "+": "t_door_metal_c", "v": "t_window_no_curtains", "w": "t_scrap_wall" }, "furniture": { } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_room0_metal", + "nested_mapgen_id": "fbmh_room0_metal", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -19,19 +19,19 @@ " ;;;;;", " ;;;;;" ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room0_metal_northeast", + "update_mapgen_id": "fbmh_room0_metal_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_room0_metal" ], "x": 15, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_room0_metal" ], "x": 15, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_room1_metal", + "nested_mapgen_id": "fbmh_room1_metal", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -42,19 +42,19 @@ " w...w", " " ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room1_metal_northeast", + "update_mapgen_id": "fbmh_room1_metal_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_room1_metal" ], "x": 15, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_room1_metal" ], "x": 15, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_room2_metal", + "nested_mapgen_id": "fbmh_room2_metal", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -65,19 +65,19 @@ " ", " wwwww" ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room2_metal_northeast", + "update_mapgen_id": "fbmh_room2_metal_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_room2_metal" ], "x": 15, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_room2_metal" ], "x": 15, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_metal_shack_east", + "nested_mapgen_id": "fbmh_metal_shack_east", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -88,19 +88,19 @@ "w....w", "w+wwww" ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_metal_east", + "update_mapgen_id": "fbmh_shack4_metal_east", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_metal_shack_east" ], "x": 15, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_metal_shack_east" ], "x": 15, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_metal_room_east", + "nested_mapgen_id": "fbmh_metal_room_east", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -111,34 +111,34 @@ "w....w", "w+wwww" ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_metal_east", + "update_mapgen_id": "fbmh_room4_metal_east", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_metal_room_east" ], "x": 15, "y": 9 } ], + "place_nested": [ { "chunks": [ "fbmh_metal_room_east" ], "x": 15, "y": 9 } ], "set": [ { "point": "terrain", "id": "t_wall_metal", "x": 15, "y": 8 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_metal_southeast", + "update_mapgen_id": "fbmh_shack4_metal_southeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_metal_shack_east" ], "x": 15, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_metal_shack_east" ], "x": 15, "y": 15 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_metal_southeast", + "update_mapgen_id": "fbmh_room4_metal_southeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_metal_room_east" ], "x": 15, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_metal_room_east" ], "x": 15, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_metal_shack_northwest", + "nested_mapgen_id": "fbmh_metal_shack_northwest", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -149,19 +149,19 @@ "w...w;", "wwwww;" ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_metal_northwest", + "update_mapgen_id": "fbmh_room4_metal_northwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_metal_shack_northwest" ], "x": 3, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_metal_shack_northwest" ], "x": 3, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_metal_shack_west", + "nested_mapgen_id": "fbmh_metal_shack_west", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -172,19 +172,19 @@ "w....w", "wwww+w" ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_metal_west", + "update_mapgen_id": "fbmh_shack4_metal_west", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_metal_shack_west" ], "x": 3, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_metal_shack_west" ], "x": 3, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_metal_room_west", + "nested_mapgen_id": "fbmh_metal_room_west", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -195,34 +195,34 @@ "w....w", "wwww+w" ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_metal_west", + "update_mapgen_id": "fbmh_room4_metal_west", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_metal_room_west" ], "x": 3, "y": 9 } ], + "place_nested": [ { "chunks": [ "fbmh_metal_room_west" ], "x": 3, "y": 9 } ], "set": [ { "point": "terrain", "id": "t_wall_metal", "x": 8, "y": 8 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_metal_southwest", + "update_mapgen_id": "fbmh_shack4_metal_southwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_metal_shack_west" ], "x": 3, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_metal_shack_west" ], "x": 3, "y": 15 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_metal_southwest", + "update_mapgen_id": "fbmh_room4_metal_southwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_metal_room_west" ], "x": 3, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_metal_room_west" ], "x": 3, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_ne_metal_center", + "nested_mapgen_id": "fbmh_core_shack_ne_metal_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -233,19 +233,19 @@ " ..w", " ..w" ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_ne_metal_center", + "update_mapgen_id": "fbmh_core_shack_ne_metal_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_ne_metal_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_ne_metal_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_ne_metal_center", + "nested_mapgen_id": "fbmh_core_ne_metal_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -256,19 +256,19 @@ " ...", " ..." ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_ne_metal_center", + "update_mapgen_id": "fbmh_core_ne_metal_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_ne_metal_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_ne_metal_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_nw_metal_center", + "nested_mapgen_id": "fbmh_core_shack_nw_metal_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -279,19 +279,19 @@ "w.. ", "w.. " ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_nw_metal_center", + "update_mapgen_id": "fbmh_core_shack_nw_metal_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_nw_metal_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_nw_metal_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_nw_metal_center", + "nested_mapgen_id": "fbmh_core_nw_metal_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -302,30 +302,30 @@ "... ", "... " ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_nw_metal_center", + "update_mapgen_id": "fbmh_core_nw_metal_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_nw_metal_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_nw_metal_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_metal_center", + "update_mapgen_id": "fbmh_core_metal_center", "method": "json", "object": { "place_nested": [ - { "chunks": [ "fbmf_core_nw_metal_center" ], "x": 9, "y": 9 }, - { "chunks": [ "fbmf_core_ne_metal_center" ], "x": 9, "y": 9 } + { "chunks": [ "fbmh_core_nw_metal_center" ], "x": 9, "y": 9 }, + { "chunks": [ "fbmh_core_ne_metal_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_se_metal_south", + "nested_mapgen_id": "fbmh_core_shack_se_metal_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -336,19 +336,19 @@ " ..w", " +ww" ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_se_metal_south", + "update_mapgen_id": "fbmh_core_shack_se_metal_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_se_metal_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_se_metal_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_se_metal_south", + "nested_mapgen_id": "fbmh_core_se_metal_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -359,19 +359,19 @@ " ...", " +ww" ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_se_metal_south", + "update_mapgen_id": "fbmh_core_se_metal_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_se_metal_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_se_metal_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_sw_metal_south", + "nested_mapgen_id": "fbmh_core_shack_sw_metal_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -382,19 +382,19 @@ "w.. ", "www " ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_sw_metal_south", + "update_mapgen_id": "fbmh_core_shack_sw_metal_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_sw_metal_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_sw_metal_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_sw_metal_south", + "nested_mapgen_id": "fbmh_core_sw_metal_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -405,23 +405,23 @@ "... ", "www " ], - "palettes": [ "fbmf_metal_palette" ] + "palettes": [ "fbmh_metal_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_sw_metal_south", + "update_mapgen_id": "fbmh_core_sw_metal_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_sw_metal_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_sw_metal_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_metal_south", + "update_mapgen_id": "fbmh_core_metal_south", "method": "json", "object": { "place_nested": [ - { "chunks": [ "fbmf_core_sw_metal_south" ], "x": 9, "y": 15 }, - { "chunks": [ "fbmf_core_se_metal_south" ], "x": 9, "y": 15 } + { "chunks": [ "fbmh_core_sw_metal_south" ], "x": 9, "y": 15 }, + { "chunks": [ "fbmh_core_se_metal_south" ], "x": 9, "y": 15 } ] } } diff --git a/data/json/mapgen/basecamps/modular_field_tent.json b/data/json/mapgen/basecamps/modular_field_tent.json index 7045c38c3f06d..e2675d80dbe0c 100644 --- a/data/json/mapgen/basecamps/modular_field_tent.json +++ b/data/json/mapgen/basecamps/modular_field_tent.json @@ -1,14 +1,14 @@ [ { "type": "palette", - "id": "fbmf_tent_palette", + "id": "fbmh_tent_palette", "terrain": { " ": "t_dirt", ".": "t_dirtfloor", "+": "t_dirtfloor", "w": "t_dirtfloor" }, "furniture": { "+": "f_canvas_door", "w": "f_canvas_wall" } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_large_tent_east", + "nested_mapgen_id": "fbmh_large_tent_east", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -19,31 +19,31 @@ " w...w", " wwwww" ], - "palettes": [ "fbmf_tent_palette" ] + "palettes": [ "fbmh_tent_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_northeast", + "update_mapgen_id": "fbmh_tent_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_large_tent_east" ], "x": 15, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_large_tent_east" ], "x": 15, "y": 3 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_east", + "update_mapgen_id": "fbmh_tent_east", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_large_tent_east" ], "x": 15, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_large_tent_east" ], "x": 15, "y": 9 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_southeast", + "update_mapgen_id": "fbmh_tent_southeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_large_tent_east" ], "x": 15, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_large_tent_east" ], "x": 15, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_large_tent_west", + "nested_mapgen_id": "fbmh_large_tent_west", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -54,25 +54,25 @@ "w...w ", "wwwww " ], - "palettes": [ "fbmf_tent_palette" ] + "palettes": [ "fbmh_tent_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_northwest", + "update_mapgen_id": "fbmh_tent_northwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_large_tent_west" ], "x": 3, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_large_tent_west" ], "x": 3, "y": 3 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_west", + "update_mapgen_id": "fbmh_tent_west", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_large_tent_west" ], "x": 3, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_large_tent_west" ], "x": 3, "y": 9 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_tent_southwest", + "update_mapgen_id": "fbmh_tent_southwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_large_tent_west" ], "x": 3, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_large_tent_west" ], "x": 3, "y": 15 } ] } } ] diff --git a/data/json/mapgen/basecamps/modular_field_wad.json b/data/json/mapgen/basecamps/modular_field_wad.json index 6c83e4be8ce3c..dfd368333f5c6 100644 --- a/data/json/mapgen/basecamps/modular_field_wad.json +++ b/data/json/mapgen/basecamps/modular_field_wad.json @@ -1,14 +1,14 @@ [ { "type": "palette", - "id": "fbmf_wad_palette", + "id": "fbmh_wad_palette", "terrain": { ";": "t_dirt", ".": "t_floor_primitive", "+": "t_door_makeshift_c", "v": "t_wall_wattle_half", "w": "t_wall_wattle" }, "furniture": { } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_room0_wad", + "nested_mapgen_id": "fbmh_room0_wad", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -19,19 +19,19 @@ " ;;;;;", " ;;;;;" ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room0_wad_northeast", + "update_mapgen_id": "fbmh_room0_wad_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_room0_wad" ], "x": 15, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_room0_wad" ], "x": 15, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_room1_wad", + "nested_mapgen_id": "fbmh_room1_wad", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -42,19 +42,19 @@ " w...w", " " ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room1_wad_northeast", + "update_mapgen_id": "fbmh_room1_wad_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_room1_wad" ], "x": 15, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_room1_wad" ], "x": 15, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_room2_wad", + "nested_mapgen_id": "fbmh_room2_wad", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -65,19 +65,19 @@ " ", " wwwww" ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room2_wad_northeast", + "update_mapgen_id": "fbmh_room2_wad_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_room2_wad" ], "x": 15, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_room2_wad" ], "x": 15, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_wad_shack_east", + "nested_mapgen_id": "fbmh_wad_shack_east", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -88,19 +88,19 @@ "w....w", "w+wwww" ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_wad_east", + "update_mapgen_id": "fbmh_shack4_wad_east", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wad_shack_east" ], "x": 15, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wad_shack_east" ], "x": 15, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_wad_room_east", + "nested_mapgen_id": "fbmh_wad_room_east", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -111,34 +111,34 @@ "w....w", "w+wwww" ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_wad_east", + "update_mapgen_id": "fbmh_room4_wad_east", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_wad_room_east" ], "x": 15, "y": 9 } ], + "place_nested": [ { "chunks": [ "fbmh_wad_room_east" ], "x": 15, "y": 9 } ], "set": [ { "point": "terrain", "id": "t_wall_wattle", "x": 15, "y": 8 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_wad_southeast", + "update_mapgen_id": "fbmh_shack4_wad_southeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wad_shack_east" ], "x": 15, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wad_shack_east" ], "x": 15, "y": 15 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_wad_southeast", + "update_mapgen_id": "fbmh_room4_wad_southeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wad_room_east" ], "x": 15, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wad_room_east" ], "x": 15, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_wad_shack_northwest", + "nested_mapgen_id": "fbmh_wad_shack_northwest", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -149,19 +149,19 @@ "w...w;", "wwwww;" ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_wad_northwest", + "update_mapgen_id": "fbmh_room4_wad_northwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wad_shack_northwest" ], "x": 3, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wad_shack_northwest" ], "x": 3, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_wad_shack_west", + "nested_mapgen_id": "fbmh_wad_shack_west", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -172,19 +172,19 @@ "w....w", "wwww+w" ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_wad_west", + "update_mapgen_id": "fbmh_shack4_wad_west", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wad_shack_west" ], "x": 3, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wad_shack_west" ], "x": 3, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_wad_room_west", + "nested_mapgen_id": "fbmh_wad_room_west", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -195,34 +195,34 @@ "w....w", "wwww+w" ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_wad_west", + "update_mapgen_id": "fbmh_room4_wad_west", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_wad_room_west" ], "x": 3, "y": 9 } ], + "place_nested": [ { "chunks": [ "fbmh_wad_room_west" ], "x": 3, "y": 9 } ], "set": [ { "point": "terrain", "id": "t_wall_wattle", "x": 8, "y": 8 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_wad_southwest", + "update_mapgen_id": "fbmh_shack4_wad_southwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wad_shack_west" ], "x": 3, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wad_shack_west" ], "x": 3, "y": 15 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_wad_southwest", + "update_mapgen_id": "fbmh_room4_wad_southwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wad_room_west" ], "x": 3, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wad_room_west" ], "x": 3, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_ne_wad_center", + "nested_mapgen_id": "fbmh_core_shack_ne_wad_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -233,19 +233,19 @@ " ..w", " ..w" ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_ne_wad_center", + "update_mapgen_id": "fbmh_core_shack_ne_wad_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_ne_wad_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_ne_wad_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_ne_wad_center", + "nested_mapgen_id": "fbmh_core_ne_wad_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -256,19 +256,19 @@ " ...", " ..." ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_ne_wad_center", + "update_mapgen_id": "fbmh_core_ne_wad_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_ne_wad_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_ne_wad_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_nw_wad_center", + "nested_mapgen_id": "fbmh_core_shack_nw_wad_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -279,19 +279,19 @@ "w.. ", "w.. " ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_nw_wad_center", + "update_mapgen_id": "fbmh_core_shack_nw_wad_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_nw_wad_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_nw_wad_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_nw_wad_center", + "nested_mapgen_id": "fbmh_core_nw_wad_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -302,30 +302,30 @@ "... ", "... " ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_nw_wad_center", + "update_mapgen_id": "fbmh_core_nw_wad_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_nw_wad_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_nw_wad_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_wad_center", + "update_mapgen_id": "fbmh_core_wad_center", "method": "json", "object": { "place_nested": [ - { "chunks": [ "fbmf_core_nw_wad_center" ], "x": 9, "y": 9 }, - { "chunks": [ "fbmf_core_ne_wad_center" ], "x": 9, "y": 9 } + { "chunks": [ "fbmh_core_nw_wad_center" ], "x": 9, "y": 9 }, + { "chunks": [ "fbmh_core_ne_wad_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_se_wad_south", + "nested_mapgen_id": "fbmh_core_shack_se_wad_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -336,19 +336,19 @@ " ..w", " +ww" ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_se_wad_south", + "update_mapgen_id": "fbmh_core_shack_se_wad_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_se_wad_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_se_wad_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_se_wad_south", + "nested_mapgen_id": "fbmh_core_se_wad_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -359,19 +359,19 @@ " ...", " +ww" ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_se_wad_south", + "update_mapgen_id": "fbmh_core_se_wad_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_se_wad_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_se_wad_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_sw_wad_south", + "nested_mapgen_id": "fbmh_core_shack_sw_wad_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -382,19 +382,19 @@ "w.. ", "www " ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_sw_wad_south", + "update_mapgen_id": "fbmh_core_shack_sw_wad_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_sw_wad_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_sw_wad_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_sw_wad_south", + "nested_mapgen_id": "fbmh_core_sw_wad_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -405,23 +405,23 @@ "... ", "www " ], - "palettes": [ "fbmf_wad_palette" ] + "palettes": [ "fbmh_wad_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_sw_wad_south", + "update_mapgen_id": "fbmh_core_sw_wad_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_sw_wad_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_sw_wad_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_wad_south", + "update_mapgen_id": "fbmh_core_wad_south", "method": "json", "object": { "place_nested": [ - { "chunks": [ "fbmf_core_sw_wad_south" ], "x": 9, "y": 15 }, - { "chunks": [ "fbmf_core_se_wad_south" ], "x": 9, "y": 15 } + { "chunks": [ "fbmh_core_sw_wad_south" ], "x": 9, "y": 15 }, + { "chunks": [ "fbmh_core_se_wad_south" ], "x": 9, "y": 15 } ] } } diff --git a/data/json/mapgen/basecamps/modular_field_wood.json b/data/json/mapgen/basecamps/modular_field_wood.json index cae2a3cae11e2..5f2db459d69ef 100644 --- a/data/json/mapgen/basecamps/modular_field_wood.json +++ b/data/json/mapgen/basecamps/modular_field_wood.json @@ -1,14 +1,14 @@ [ { "type": "palette", - "id": "fbmf_wood_palette", + "id": "fbmh_wood_palette", "terrain": { ";": "t_dirt", ".": "t_floor", "+": "t_door_c", "v": "t_window_no_curtains", "w": "t_wall_wood" }, "furniture": { } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_room0_wood", + "nested_mapgen_id": "fbmh_room0_wood", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -19,19 +19,19 @@ " ;;;;;", " ;;;;;" ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room0_wood_northeast", + "update_mapgen_id": "fbmh_room0_wood_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_room0_wood" ], "x": 15, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_room0_wood" ], "x": 15, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_room1_wood", + "nested_mapgen_id": "fbmh_room1_wood", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -42,19 +42,19 @@ " w...w", " " ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room1_wood_northeast", + "update_mapgen_id": "fbmh_room1_wood_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_room1_wood" ], "x": 15, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_room1_wood" ], "x": 15, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_room2_wood", + "nested_mapgen_id": "fbmh_room2_wood", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -65,19 +65,19 @@ " ", " wwwww" ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room2_wood_northeast", + "update_mapgen_id": "fbmh_room2_wood_northeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_room2_wood" ], "x": 15, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_room2_wood" ], "x": 15, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_wood_shack_east", + "nested_mapgen_id": "fbmh_wood_shack_east", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -88,19 +88,19 @@ "w....w", "w+wwww" ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_wood_east", + "update_mapgen_id": "fbmh_shack4_wood_east", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wood_shack_east" ], "x": 15, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wood_shack_east" ], "x": 15, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_wood_room_east", + "nested_mapgen_id": "fbmh_wood_room_east", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -111,34 +111,34 @@ "w....w", "w+wwww" ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_wood_east", + "update_mapgen_id": "fbmh_room4_wood_east", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_wood_room_east" ], "x": 15, "y": 9 } ], + "place_nested": [ { "chunks": [ "fbmh_wood_room_east" ], "x": 15, "y": 9 } ], "set": [ { "point": "terrain", "id": "t_wall_wood", "x": 15, "y": 8 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_wood_southeast", + "update_mapgen_id": "fbmh_shack4_wood_southeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wood_shack_east" ], "x": 15, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wood_shack_east" ], "x": 15, "y": 15 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_wood_southeast", + "update_mapgen_id": "fbmh_room4_wood_southeast", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wood_room_east" ], "x": 15, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wood_room_east" ], "x": 15, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_wood_shack_northwest", + "nested_mapgen_id": "fbmh_wood_shack_northwest", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -149,19 +149,19 @@ "w...w;", "wwwww;" ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_wood_northwest", + "update_mapgen_id": "fbmh_room4_wood_northwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wood_shack_northwest" ], "x": 3, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wood_shack_northwest" ], "x": 3, "y": 3 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_wood_shack_west", + "nested_mapgen_id": "fbmh_wood_shack_west", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -172,19 +172,19 @@ "w....w", "wwww+w" ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_wood_west", + "update_mapgen_id": "fbmh_shack4_wood_west", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wood_shack_west" ], "x": 3, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wood_shack_west" ], "x": 3, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_wood_room_west", + "nested_mapgen_id": "fbmh_wood_room_west", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -195,34 +195,34 @@ "w....w", "wwww+w" ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_wood_west", + "update_mapgen_id": "fbmh_room4_wood_west", "method": "json", "object": { - "place_nested": [ { "chunks": [ "fbmf_wood_room_west" ], "x": 3, "y": 9 } ], + "place_nested": [ { "chunks": [ "fbmh_wood_room_west" ], "x": 3, "y": 9 } ], "set": [ { "point": "terrain", "id": "t_wall_wood", "x": 8, "y": 8 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_shack4_wood_southwest", + "update_mapgen_id": "fbmh_shack4_wood_southwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wood_shack_west" ], "x": 3, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wood_shack_west" ], "x": 3, "y": 15 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_room4_wood_southwest", + "update_mapgen_id": "fbmh_room4_wood_southwest", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_wood_room_west" ], "x": 3, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_wood_room_west" ], "x": 3, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_ne_wood_center", + "nested_mapgen_id": "fbmh_core_shack_ne_wood_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -233,19 +233,19 @@ " ..w", " ..w" ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_ne_wood_center", + "update_mapgen_id": "fbmh_core_shack_ne_wood_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_ne_wood_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_ne_wood_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_ne_wood_center", + "nested_mapgen_id": "fbmh_core_ne_wood_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -256,19 +256,19 @@ " ...", " ..." ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_ne_wood_center", + "update_mapgen_id": "fbmh_core_ne_wood_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_ne_wood_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_ne_wood_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_nw_wood_center", + "nested_mapgen_id": "fbmh_core_shack_nw_wood_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -279,19 +279,19 @@ "w.. ", "w.. " ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_nw_wood_center", + "update_mapgen_id": "fbmh_core_shack_nw_wood_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_nw_wood_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_nw_wood_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_nw_wood_center", + "nested_mapgen_id": "fbmh_core_nw_wood_center", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -302,30 +302,30 @@ "... ", "... " ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_nw_wood_center", + "update_mapgen_id": "fbmh_core_nw_wood_center", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_nw_wood_center" ], "x": 9, "y": 9 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_nw_wood_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_wood_center", + "update_mapgen_id": "fbmh_core_wood_center", "method": "json", "object": { "place_nested": [ - { "chunks": [ "fbmf_core_nw_wood_center" ], "x": 9, "y": 9 }, - { "chunks": [ "fbmf_core_ne_wood_center" ], "x": 9, "y": 9 } + { "chunks": [ "fbmh_core_nw_wood_center" ], "x": 9, "y": 9 }, + { "chunks": [ "fbmh_core_ne_wood_center" ], "x": 9, "y": 9 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_se_wood_south", + "nested_mapgen_id": "fbmh_core_shack_se_wood_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -336,19 +336,19 @@ " ..w", " +ww" ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_se_wood_south", + "update_mapgen_id": "fbmh_core_shack_se_wood_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_se_wood_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_se_wood_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_se_wood_south", + "nested_mapgen_id": "fbmh_core_se_wood_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -359,19 +359,19 @@ " ...", " +ww" ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_se_wood_south", + "update_mapgen_id": "fbmh_core_se_wood_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_se_wood_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_se_wood_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_shack_sw_wood_south", + "nested_mapgen_id": "fbmh_core_shack_sw_wood_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -382,19 +382,19 @@ "w.. ", "www " ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_shack_sw_wood_south", + "update_mapgen_id": "fbmh_core_shack_sw_wood_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_shack_sw_wood_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_shack_sw_wood_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmf_core_sw_wood_south", + "nested_mapgen_id": "fbmh_core_sw_wood_south", "object": { "mapgensize": [ 6, 6 ], "rows": [ @@ -405,23 +405,23 @@ "... ", "www " ], - "palettes": [ "fbmf_wood_palette" ] + "palettes": [ "fbmh_wood_palette" ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_sw_wood_south", + "update_mapgen_id": "fbmh_core_sw_wood_south", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmf_core_sw_wood_south" ], "x": 9, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmh_core_sw_wood_south" ], "x": 9, "y": 15 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmf_core_wood_south", + "update_mapgen_id": "fbmh_core_wood_south", "method": "json", "object": { "place_nested": [ - { "chunks": [ "fbmf_core_sw_wood_south" ], "x": 9, "y": 15 }, - { "chunks": [ "fbmf_core_se_wood_south" ], "x": 9, "y": 15 } + { "chunks": [ "fbmh_core_sw_wood_south" ], "x": 9, "y": 15 }, + { "chunks": [ "fbmh_core_se_wood_south" ], "x": 9, "y": 15 } ] } } diff --git a/data/json/recipes/basecamps/recipe_groups.json b/data/json/recipes/basecamps/recipe_groups.json index 957cc81ed16d0..b710806cff393 100644 --- a/data/json/recipes/basecamps/recipe_groups.json +++ b/data/json/recipes/basecamps/recipe_groups.json @@ -4,7 +4,7 @@ "name": "all_faction_base_types", "building_type": "NONE", "recipes": [ - { "id": "faction_base_modular_field_0", "description": "Field Camp", "om_terrains": [ "field" ] }, + { "id": "faction_base_modular_hub_field_0", "description": "Field Camp", "om_terrains": [ "field" ] }, { "id": "faction_base_camp_0", "description": "Old Camp", "om_terrains": [ "field" ] } ] }, diff --git a/data/json/recipes/basecamps/recipe_modular_field_common.json b/data/json/recipes/basecamps/recipe_modular_field_common.json index 511374176bb60..a6572897b9fc8 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_common.json +++ b/data/json/recipes/basecamps/recipe_modular_field_common.json @@ -1,7 +1,7 @@ [ { "type": "recipe", - "result": "faction_base_modular_field_0", + "result": "faction_base_modular_hub_field_0", "description": "We should survey the base site and set up a bulletin board.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", @@ -9,10 +9,11 @@ "autolearn": false, "never_learn": true, "time": "1 h", - "construction_blueprint": "fbmf_0", + "construction_blueprint": "fbmh_0", "blueprint_provides": [ { "id": "gathering" }, { "id": "primitive_camp_recipes_1" }, + { "id": "fbmh_0" }, { "id": "firewood" }, { "id": "foraging" }, { "id": "sorting" }, @@ -23,22 +24,46 @@ }, { "type": "recipe", - "result": "faction_base_modular_field_fireplace_northeast", + "result": "faction_base_modular_hub_mallroof_0", + "description": "We should survey the roof top and set up a bulletin board.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "time": "1 h", + "construction_blueprint": "fbmh_0", + "blueprint_provides": [ + { "id": "gathering" }, + { "id": "primitive_camp_recipes_1" }, + { "id": "fbmh_0" }, + { "id": "firewood" }, + { "id": "foraging" }, + { "id": "sorting" }, + { "id": "logging" }, + { "id": "fbm_no_dig" } + ], + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_name": "basic survey" + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_fireplace_northeast", "description": "Now that we have some cover, we should build a fireplace in the northeast shack.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_fireplace_northeast", + "construction_blueprint": "fbmh_fireplace_northeast", "blueprint_name": "northeast fireplace", - "blueprint_requires": [ { "id": "fbmf_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_fire_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_fire_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_fire_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_fire_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_brazier_northeast", + "result": "faction_base_modular_hub_brazier_northeast", "description": "Now that we have some cover, we should set up a brazier in the northeast shack.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", @@ -46,476 +71,476 @@ "autolearn": false, "never_learn": true, "time": "5 m", - "construction_blueprint": "fbmf_brazier_northeast", + "construction_blueprint": "fbmh_brazier_northeast", "blueprint_name": "northeast brazier", - "blueprint_requires": [ { "id": "fbmf_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_fire_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_fire_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_fire_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_fire_northeast" } ], "components": [ [ [ "brazier", 1 ] ] ] }, { "type": "recipe", - "result": "faction_base_modular_field_stove_northeast", + "result": "faction_base_modular_hub_stove_northeast", "description": "Now that we have some cover, we should build a stove in the northeast shack.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "skill_used": "fabrication", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_stove_northeast", + "construction_blueprint": "fbmh_stove_northeast", "blueprint_name": "northeast stove", - "blueprint_requires": [ { "id": "fbmf_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_fire_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_fire_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_fire_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_fire_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_strawbed1_northeast", + "result": "faction_base_modular_hub_strawbed1_northeast", "description": "A straw bed in the northeast shack will make sleeping easier.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_strawbed1_northeast", + "construction_blueprint": "fbmh_strawbed1_northeast", "blueprint_name": "northeast straw bed", - "blueprint_requires": [ { "id": "fbmf_northeast" } ], - "blueprint_provides": [ { "id": "bed" }, { "id": "fbmf_bed1_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast" } ], + "blueprint_provides": [ { "id": "bed" }, { "id": "fbmh_bed1_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_bed1_northeast", + "result": "faction_base_modular_hub_bed1_northeast", "description": "A proper bed in the northeast shack will give one of us a place to sleep soundly.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_bed1_northeast", + "construction_blueprint": "fbmh_bed1_northeast", "blueprint_name": "northeast bed", - "blueprint_requires": [ { "id": "fbmf_northeast" } ], - "blueprint_provides": [ { "id": "bed" }, { "id": "fbmf_bed1_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast" } ], + "blueprint_provides": [ { "id": "bed" }, { "id": "fbmh_bed1_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_strawbed2_northeast", + "result": "faction_base_modular_hub_strawbed2_northeast", "description": "Another straw bed in the northeast shack will make sleeping easier.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_strawbed2_northeast", + "construction_blueprint": "fbmh_strawbed2_northeast", "blueprint_name": "northeast straw bed", - "blueprint_requires": [ { "id": "fbmf_bed1_northeast" }, { "id": "fbmf_northeast", "amount": 2 } ], - "blueprint_provides": [ { "id": "bed" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_bed2_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_bed1_northeast" }, { "id": "fbmh_northeast", "amount": 2 } ], + "blueprint_provides": [ { "id": "bed" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_bed2_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_bed2_northeast", + "result": "faction_base_modular_hub_bed2_northeast", "description": "Another proper bed in the northeast shack will give one of us a place to sleep soundly.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_bed2_northeast", + "construction_blueprint": "fbmh_bed2_northeast", "blueprint_name": "northeast bed", - "blueprint_requires": [ { "id": "fbmf_bed1_northeast" }, { "id": "fbmf_northeast", "amount": 2 } ], - "blueprint_provides": [ { "id": "bed" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_bed2_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_bed1_northeast" }, { "id": "fbmh_northeast", "amount": 2 } ], + "blueprint_provides": [ { "id": "bed" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_bed2_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_tent_strawbed3_east", + "result": "faction_base_modular_hub_tent_strawbed3_east", "description": "A pair of straw beds in the east tent will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_tent_strawbed3_east", + "construction_blueprint": "fbmh_tent_strawbed3_east", "blueprint_name": "east straw beds", - "blueprint_requires": [ { "id": "fbmf_tent_east" } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_east" }, { "id": "fbmf_bed2_east" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_east" }, { "id": "fbmf_bed2_east" } ], + "blueprint_requires": [ { "id": "fbmh_tent_east" } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_east" }, { "id": "fbmh_bed2_east" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_east" }, { "id": "fbmh_bed2_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_tent_bed3_east", + "result": "faction_base_modular_hub_tent_bed3_east", "description": "A pair of proper beds in the east tent will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_tent_bed3_east", + "construction_blueprint": "fbmh_tent_bed3_east", "blueprint_name": "east beds", - "blueprint_requires": [ { "id": "fbmf_tent_east" } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_east" }, { "id": "fbmf_bed2_east" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_east" }, { "id": "fbmf_bed2_east" } ], + "blueprint_requires": [ { "id": "fbmh_tent_east" } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_east" }, { "id": "fbmh_bed2_east" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_east" }, { "id": "fbmh_bed2_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_strawbed3_east", + "result": "faction_base_modular_hub_strawbed3_east", "description": "A pair of straw beds in the east room will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room_strawbed3_east", + "construction_blueprint": "fbmh_room_strawbed3_east", "blueprint_name": "east straw beds", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_east" }, { "id": "fbmf_bed2_east" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_east" }, { "id": "fbmf_bed2_east" }, { "id": "fbmf_tent_east" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_east" }, { "id": "fbmh_bed2_east" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_east" }, { "id": "fbmh_bed2_east" }, { "id": "fbmh_tent_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room_bed3_east", + "result": "faction_base_modular_hub_room_bed3_east", "description": "A pair of proper beds in the east room will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room_bed3_east", + "construction_blueprint": "fbmh_room_bed3_east", "blueprint_name": "east beds", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_east" }, { "id": "fbmf_bed2_east" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_east" }, { "id": "fbmf_bed2_east" }, { "id": "fbmf_tent_east" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_east" }, { "id": "fbmh_bed2_east" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_east" }, { "id": "fbmh_bed2_east" }, { "id": "fbmh_tent_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_tent_strawbed3_southeast", + "result": "faction_base_modular_hub_tent_strawbed3_southeast", "description": "A pair of straw beds in the southeast tent will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_tent_strawbed3_southeast", + "construction_blueprint": "fbmh_tent_strawbed3_southeast", "blueprint_name": "southeast straw beds", - "blueprint_requires": [ { "id": "fbmf_tent_southeast" } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_southeast" }, { "id": "fbmf_bed2_southeast" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_southeast" }, { "id": "fbmf_bed2_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_tent_southeast" } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_southeast" }, { "id": "fbmh_bed2_southeast" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_southeast" }, { "id": "fbmh_bed2_southeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_tent_bed3_southeast", + "result": "faction_base_modular_hub_tent_bed3_southeast", "description": "A pair of proper beds in the southeast tent will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_tent_bed3_southeast", + "construction_blueprint": "fbmh_tent_bed3_southeast", "blueprint_name": "southeast beds", - "blueprint_requires": [ { "id": "fbmf_tent_southeast" } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_southeast" }, { "id": "fbmf_bed2_southeast" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_southeast" }, { "id": "fbmf_bed2_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_tent_southeast" } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_southeast" }, { "id": "fbmh_bed2_southeast" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_southeast" }, { "id": "fbmh_bed2_southeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room_strawbed3_southeast", + "result": "faction_base_modular_hub_room_strawbed3_southeast", "description": "A pair of straw beds in the southeast room will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room_strawbed3_southeast", + "construction_blueprint": "fbmh_room_strawbed3_southeast", "blueprint_name": "southeast straw beds", - "blueprint_requires": [ { "id": "fbmf_southeast", "amount": 4 } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_southeast" }, { "id": "fbmf_bed2_southeast" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_southeast" }, { "id": "fbmf_bed2_southeast" }, { "id": "fbmf_tent_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_southeast", "amount": 4 } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_southeast" }, { "id": "fbmh_bed2_southeast" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_southeast" }, { "id": "fbmh_bed2_southeast" }, { "id": "fbmh_tent_southeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room_bed3_southeast", + "result": "faction_base_modular_hub_room_bed3_southeast", "description": "A pair of proper beds in the southeast room will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room_bed3_southeast", + "construction_blueprint": "fbmh_room_bed3_southeast", "blueprint_name": "southeast beds", - "blueprint_requires": [ { "id": "fbmf_southeast", "amount": 4 } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_southeast" }, { "id": "fbmf_bed2_southeast" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_southeast" }, { "id": "fbmf_bed2_southeast" }, { "id": "fbmf_tent_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_southeast", "amount": 4 } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_southeast" }, { "id": "fbmh_bed2_southeast" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_southeast" }, { "id": "fbmh_bed2_southeast" }, { "id": "fbmh_tent_southeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_strawbed3_northwest", + "result": "faction_base_modular_hub_strawbed3_northwest", "description": "A pair of straw beds in the northwest building will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_strawbed3_northwest", + "construction_blueprint": "fbmh_strawbed3_northwest", "blueprint_name": "northwest straw beds", - "blueprint_requires": [ { "id": "fbmf_northwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_northwest" }, { "id": "fbmf_bed2_northwest" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_northwest" }, { "id": "fbmf_bed2_northwest" } ], + "blueprint_requires": [ { "id": "fbmh_northwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_northwest" }, { "id": "fbmh_bed2_northwest" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_northwest" }, { "id": "fbmh_bed2_northwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_bed3_northwest", + "result": "faction_base_modular_hub_bed3_northwest", "description": "A pair of proper beds in the northwest building will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_bed3_northwest", + "construction_blueprint": "fbmh_bed3_northwest", "blueprint_name": "northwest beds", - "blueprint_requires": [ { "id": "fbmf_northwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_northwest" }, { "id": "fbmf_bed2_northwest" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_northwest" }, { "id": "fbmf_bed2_northwest" } ], + "blueprint_requires": [ { "id": "fbmh_northwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_northwest" }, { "id": "fbmh_bed2_northwest" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_northwest" }, { "id": "fbmh_bed2_northwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_tent_strawbed3_west", + "result": "faction_base_modular_hub_tent_strawbed3_west", "description": "A pair of straw beds in the west tent will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_tent_strawbed3_west", + "construction_blueprint": "fbmh_tent_strawbed3_west", "blueprint_name": "west straw beds", - "blueprint_requires": [ { "id": "fbmf_tent_west" } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_west" }, { "id": "fbmf_bed2_west" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_west" }, { "id": "fbmf_bed2_west" } ], + "blueprint_requires": [ { "id": "fbmh_tent_west" } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_west" }, { "id": "fbmh_bed2_west" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_west" }, { "id": "fbmh_bed2_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_tent_bed3_west", + "result": "faction_base_modular_hub_tent_bed3_west", "description": "A pair of proper beds in the west tent will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_tent_bed3_west", + "construction_blueprint": "fbmh_tent_bed3_west", "blueprint_name": "west beds", - "blueprint_requires": [ { "id": "fbmf_tent_west" } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_west" }, { "id": "fbmf_bed2_west" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_west" }, { "id": "fbmf_bed2_west" } ], + "blueprint_requires": [ { "id": "fbmh_tent_west" } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_west" }, { "id": "fbmh_bed2_west" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_west" }, { "id": "fbmh_bed2_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room_strawbed3_west", + "result": "faction_base_modular_hub_room_strawbed3_west", "description": "A pair of straw beds in the west room will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room_strawbed3_west", + "construction_blueprint": "fbmh_room_strawbed3_west", "blueprint_name": "west straw beds", - "blueprint_requires": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_west" }, { "id": "fbmf_bed2_west" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_west" }, { "id": "fbmf_bed2_west" }, { "id": "fbmf_tent_west" } ], + "blueprint_requires": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_west" }, { "id": "fbmh_bed2_west" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_west" }, { "id": "fbmh_bed2_west" }, { "id": "fbmh_tent_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room_bed3_west", + "result": "faction_base_modular_hub_room_bed3_west", "description": "A pair of proper beds in the west room will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room_bed3_west", + "construction_blueprint": "fbmh_room_bed3_west", "blueprint_name": "west beds", - "blueprint_requires": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_west" }, { "id": "fbmf_bed2_west" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_west" }, { "id": "fbmf_bed2_west" }, { "id": "fbmf_tent_west" } ], + "blueprint_requires": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_west" }, { "id": "fbmh_bed2_west" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_west" }, { "id": "fbmh_bed2_west" }, { "id": "fbmh_tent_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_tent_strawbed3_southwest", + "result": "faction_base_modular_hub_tent_strawbed3_southwest", "description": "A pair of straw beds in the southwest tent will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_tent_strawbed3_southwest", + "construction_blueprint": "fbmh_tent_strawbed3_southwest", "blueprint_name": "southwest straw beds", - "blueprint_requires": [ { "id": "fbmf_tent_southwest" } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_southwest" }, { "id": "fbmf_bed2_southwest" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_southwest" }, { "id": "fbmf_bed2_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_tent_southwest" } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_southwest" }, { "id": "fbmh_bed2_southwest" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_southwest" }, { "id": "fbmh_bed2_southwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_tent_bed3_southwest", + "result": "faction_base_modular_hub_tent_bed3_southwest", "description": "A pair of proper beds in the southwest tent will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_tent_bed3_southwest", + "construction_blueprint": "fbmh_tent_bed3_southwest", "blueprint_name": "southwest beds", - "blueprint_requires": [ { "id": "fbmf_tent_southwest" } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_southwest" }, { "id": "fbmf_bed2_southwest" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_southwest" }, { "id": "fbmf_bed2_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_tent_southwest" } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_southwest" }, { "id": "fbmh_bed2_southwest" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_southwest" }, { "id": "fbmh_bed2_southwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room_strawbed3_southwest", + "result": "faction_base_modular_hub_room_strawbed3_southwest", "description": "A pair of straw beds in the southwest room will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room_strawbed3_southwest", + "construction_blueprint": "fbmh_room_strawbed3_southwest", "blueprint_name": "southwest straw beds", - "blueprint_requires": [ { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_southwest" }, { "id": "fbmf_bed2_southwest" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_southwest" }, { "id": "fbmf_bed2_southwest" }, { "id": "fbmf_tent_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_southwest" }, { "id": "fbmh_bed2_southwest" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_southwest" }, { "id": "fbmh_bed2_southwest" }, { "id": "fbmh_tent_southwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room_bed3_southwest", + "result": "faction_base_modular_hub_room_bed3_southwest", "description": "A pair of proper beds in the southwest room will allow us to house two more people and expand the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room_bed3_southwest", + "construction_blueprint": "fbmh_room_bed3_southwest", "blueprint_name": "southwest beds", - "blueprint_requires": [ { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmf_bed1_southwest" }, { "id": "fbmf_bed2_southwest" } ], - "blueprint_excludes": [ { "id": "fbmf_bed1_southwest" }, { "id": "fbmf_bed2_southwest" }, { "id": "fbmf_tent_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "bed", "amount": 2 }, { "id": "fbmh_bed1_southwest" }, { "id": "fbmh_bed2_southwest" } ], + "blueprint_excludes": [ { "id": "fbmh_bed1_southwest" }, { "id": "fbmh_bed2_southwest" }, { "id": "fbmh_tent_southwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_kitchen_fireplace_center", + "result": "faction_base_modular_hub_core_kitchen_fireplace_center", "description": "A fireplace, counter, and some pots and pans in the central building will allow us to cook simple recipes and organize hunting expeditions.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_kitchen_fireplace_center", + "construction_blueprint": "fbmh_core_kitchen_fireplace_center", "blueprint_name": "central fireplace", - "blueprint_requires": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_ne_center" } ], + "blueprint_requires": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_ne_center" } ], "blueprint_provides": [ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, { "id": "kitchen_recipes_1" } ], "blueprint_resources": [ "fake_fireplace", "pot" ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_kitchen_butchery_center", + "result": "faction_base_modular_hub_core_kitchen_butchery_center", "description": "We need a butchery rack to maximize the harvest from our hunting and trapping efforts.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_kitchen_butchery_center", + "construction_blueprint": "fbmh_core_kitchen_butchery_center", "blueprint_name": "central butchery rack", - "blueprint_requires": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_ne_center" } ], + "blueprint_requires": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_ne_center" } ], "blueprint_provides": [ { "id": "trapping" }, { "id": "hunting" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_kitchen_toolrack_center", + "result": "faction_base_modular_hub_core_kitchen_toolrack_center", "description": "A tool rack in the central building will give us a place to store tools.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_kitchen_toolrack_center", + "construction_blueprint": "fbmh_core_kitchen_toolrack_center", "blueprint_name": "central tool rack", - "blueprint_requires": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_nw_center" } ], + "blueprint_requires": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_nw_center" } ], "blueprint_provides": [ { "id": "tool_storage" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_kitchen_table_center", + "result": "faction_base_modular_hub_core_kitchen_table_center", "description": "Setting up some tables and chairs will make the central building into a dining area, and we can also use them as a workspace to organize the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_kitchen_table_center", + "construction_blueprint": "fbmh_core_kitchen_table_center", "blueprint_name": "central dining hall", - "blueprint_requires": [ { "id": "fbmf_center", "amount": 4 }, { "id": "fbmf_ne_center" }, { "id": "fbmf_nw_center" } ], + "blueprint_requires": [ { "id": "fbmh_center", "amount": 4 }, { "id": "fbmh_ne_center" }, { "id": "fbmh_nw_center" } ], "blueprint_provides": [ { "id": "relaying" }, { "id": "walls" }, { "id": "recruiting" }, { "id": "scouting" }, { "id": "patrolling" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_kitchen_table_south", + "result": "faction_base_modular_hub_core_kitchen_table_south", "description": "Setting up some tables and chairs will make the central building into a dining area, and we can also use them as a workspace to organize the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "skill_used": "fabrication", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_kitchen_table_south", + "construction_blueprint": "fbmh_core_kitchen_table_south", "blueprint_name": "south dining hall", - "blueprint_requires": [ { "id": "fbmf_south", "amount": 4 }, { "id": "fbmf_se_south" }, { "id": "fbmf_sw_south" } ], + "blueprint_requires": [ { "id": "fbmh_south", "amount": 4 }, { "id": "fbmh_se_south" }, { "id": "fbmh_sw_south" } ], "blueprint_provides": [ { "id": "relaying" }, { "id": "walls" }, { "id": "recruiting" }, { "id": "scouting" }, { "id": "patrolling" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_kitchen_stove_south", + "result": "faction_base_modular_hub_core_kitchen_stove_south", "description": "A wood stove, counter, and some pots and pans in the south half of the central building will allow us to cook simple recipes and organize hunting expeditions. The stove will be more efficient than a fireplace.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_kitchen_stove_south", + "construction_blueprint": "fbmh_core_kitchen_stove_south", "blueprint_name": "south wood stove", "blueprint_resources": [ "fake_stove" ], - "blueprint_requires": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_sw_south" } ], + "blueprint_requires": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_sw_south" } ], "blueprint_provides": [ { "id": "trapping" }, { "id": "hunting" }, { "id": "kitchen" }, { "id": "kitchen_recipes_1" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_well_north", + "result": "faction_base_modular_hub_well_north", "description": "Digging a well will give us easy access to water.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_well_north", + "construction_blueprint": "fbmh_well_north", "blueprint_name": "north water well", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_root_cellar_north", + "result": "faction_base_modular_hub_root_cellar_north", "description": "Digging a root cellar will give us a way to preserve food.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_root_cellar_north", + "construction_blueprint": "fbmh_root_cellar_north", "blueprint_name": "north root cellar", "blueprint_provides": [ { "id": "pantry" } ], - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_radio_tower_north", + "result": "faction_base_modular_hub_radio_tower_north", "description": "We could build a radio tower to improve the range of our radios.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", @@ -524,10 +549,10 @@ "autolearn": false, "never_learn": true, "time": "24 h", - "construction_blueprint": "fbmf_radio_tower_north", + "construction_blueprint": "fbmh_radio_tower_north", "blueprint_name": "north radio tower", - "blueprint_provides": [ { "id": "fbmf_radio_tower_north" } ], - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_radio_tower_north" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, @@ -551,7 +576,7 @@ }, { "type": "recipe", - "result": "faction_base_modular_field_radio_console_north", + "result": "faction_base_modular_hub_radio_console_north", "description": "Adding a console to control the radio tower will help with recruiting more survivors.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", @@ -560,10 +585,10 @@ "autolearn": false, "never_learn": true, "time": "24 h", - "construction_blueprint": "fbmf_radio_console_north", + "construction_blueprint": "fbmh_radio_console_north", "blueprint_name": "north radio console", - "blueprint_provides": [ { "id": "fbmf_radio_console_north" }, { "id": "radio" } ], - "blueprint_requires": [ { "id": "fbmf_radio_tower_north" } ], + "blueprint_provides": [ { "id": "fbmh_radio_console_north" }, { "id": "radio" } ], + "blueprint_requires": [ { "id": "fbmh_radio_tower_north" } ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "processor", 2 ] ], @@ -588,7 +613,7 @@ "autolearn": false, "never_learn": true, "time": "1 m", - "construction_blueprint": "faction_base_modular_field_0", + "construction_blueprint": "faction_base_modular_hub_0", "blueprint_name": "basic survey", "blueprint_requires": [ { "id": "not_an_upgrade" } ] }, @@ -602,7 +627,7 @@ "autolearn": false, "never_learn": true, "time": "1 m", - "construction_blueprint": "faction_base_modular_field_0", + "construction_blueprint": "faction_base_modular_hub_0", "blueprint_name": "basic survey", "blueprint_requires": [ { "id": "not_an_upgrade" } ] }, @@ -616,7 +641,7 @@ "autolearn": false, "never_learn": true, "time": "1 m", - "construction_blueprint": "faction_base_modular_field_0", + "construction_blueprint": "faction_base_modular_hub_0", "blueprint_name": "basic survey", "blueprint_requires": [ { "id": "not_an_upgrade" } ] }, @@ -630,7 +655,7 @@ "autolearn": false, "never_learn": true, "time": "1 m", - "construction_blueprint": "faction_base_modular_field_0", + "construction_blueprint": "faction_base_modular_hub_0", "blueprint_name": "basic survey", "blueprint_requires": [ { "id": "not_an_upgrade" } ] } diff --git a/data/json/recipes/basecamps/recipe_modular_field_defenses.json b/data/json/recipes/basecamps/recipe_modular_field_defenses.json index 200aab48d7a08..e474d09f60d96 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_defenses.json +++ b/data/json/recipes/basecamps/recipe_modular_field_defenses.json @@ -1,120 +1,122 @@ [ { "type": "recipe", - "result": "faction_base_modular_field_trench_north", + "result": "faction_base_modular_hub_trench_north", "description": "Digging a trench along the north edge of the camp would provide some defense and generate building materials.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_trench_north", + "construction_blueprint": "fbmh_trench_north", "blueprint_name": "north trench", - "blueprint_provides": [ { "id": "fbmf_trench_north" } ], - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_trench_north" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_excludes": [ { "id": "fbm_no_dig" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_trench_south", + "result": "faction_base_modular_hub_trench_south", "description": "Digging a trench along the south edge of the camp would provide some defense and generate building materials.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_trench_south", + "construction_blueprint": "fbmh_trench_south", "blueprint_name": "south trench", - "blueprint_provides": [ { "id": "fbmf_trench_south" } ], - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_trench_south" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_excludes": [ { "id": "fbm_no_dig" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_trench_northeast", + "result": "faction_base_modular_hub_trench_northeast", "description": "Digging a trench along the northeast corner of the camp would provide some defense and generate building materials. If we have solid buildings all along the east side of the camp, we would only need to dig the trench long enough to reach the buildings.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "skill_used": "fabrication", "never_learn": true, - "construction_blueprint": "fbmf_trench_corner_northeast", + "construction_blueprint": "fbmh_trench_corner_northeast", "blueprint_name": "northeast trench", - "blueprint_provides": [ { "id": "fbmf_trench_northeast" } ], - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_trench_northeast" }, { "id": "fbmf_trench_east" } ], + "blueprint_provides": [ { "id": "fbmh_trench_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_excludes": [ { "id": "fbm_no_dig" }, { "id": "fbmh_trench_northeast" }, { "id": "fbmh_trench_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_trench_northwest", + "result": "faction_base_modular_hub_trench_northwest", "description": "Digging a trench along the northwest corner of the camp would provide some defense and generate building materials. If we have solid buildings all along the west side of the camp, we would only need to dig the trench long enough to reach the buildings.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_trench_corner_northwest", + "construction_blueprint": "fbmh_trench_corner_northwest", "blueprint_name": "northwest trench", - "blueprint_provides": [ { "id": "fbmf_trench_northwest" } ], - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_trench_northwest" }, { "id": "fbmf_trench_west" } ], + "blueprint_provides": [ { "id": "fbmh_trench_northwest" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_excludes": [ { "id": "fbm_no_dig" }, { "id": "fbmh_trench_northwest" }, { "id": "fbmh_trench_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_trench_southeast", + "result": "faction_base_modular_hub_trench_southeast", "description": "Digging a trench along the southeast corner of the camp would provide some defense and generate building materials. If we have solid buildings all along the east side of the camp, we would only need to dig the trench long enough to reach the buildings.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_trench_corner_southeast", + "construction_blueprint": "fbmh_trench_corner_southeast", "blueprint_name": "southeast trench", - "blueprint_provides": [ { "id": "fbmf_trench_southeast" } ], - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_trench_southeast" }, { "id": "fbmf_trench_east" } ], + "blueprint_provides": [ { "id": "fbmh_trench_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_excludes": [ { "id": "fbm_no_dig" }, { "id": "fbmh_trench_southeast" }, { "id": "fbmh_trench_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_trench_southwest", + "result": "faction_base_modular_hub_trench_southwest", "description": "Digging a trench along the southwest corner of the camp would provide some defense and generate building materials. If we have solid buildings all along the west side of the camp, we would only need to dig the trench long enough to reach the buildings.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_trench_corner_southwest", + "construction_blueprint": "fbmh_trench_corner_southwest", "blueprint_name": "southwest trench", - "blueprint_provides": [ { "id": "fbmf_trench_southwest" } ], - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_trench_southwest" }, { "id": "fbmf_trench_west" } ], + "blueprint_provides": [ { "id": "fbmh_trench_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_excludes": [ { "id": "fbm_no_dig" }, { "id": "fbmh_trench_southwest" }, { "id": "fbmh_trench_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_trench_east", + "result": "faction_base_modular_hub_trench_east", "description": "Digging a trench along the east edge of the camp would provide some defense and generate building materials. We'll need to run the trench the length of the camp if we don't have solid buildings all along the east side.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_trench_east", + "construction_blueprint": "fbmh_trench_east", "blueprint_name": "east trench", - "blueprint_provides": [ { "id": "fbmf_trench_east" } ], - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_trench_southeast" }, { "id": "fbmf_trench_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_trench_east" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_excludes": [ { "id": "fbm_no_dig" }, { "id": "fbmh_trench_southeast" }, { "id": "fbmh_trench_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_trench_west", + "result": "faction_base_modular_hub_trench_west", "description": "Digging a trench along the west edge of the camp would provide some defense and generate building materials. We'll need to run the trench the length of the camp if we don't have solid buildings all along the west side.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_trench_west", + "construction_blueprint": "fbmh_trench_west", "blueprint_name": "west trench", - "blueprint_provides": [ { "id": "fbmf_trench_west" } ], - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_trench_southwest" }, { "id": "fbmf_trench_northwest" } ], + "blueprint_provides": [ { "id": "fbmh_trench_west" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_excludes": [ { "id": "fbm_no_dig" }, { "id": "fbmh_trench_southwest" }, { "id": "fbmh_trench_northwest" } ], "blueprint_autocalc": true } ] diff --git a/data/json/recipes/basecamps/recipe_modular_field_metal.json b/data/json/recipes/basecamps/recipe_modular_field_metal.json index 2828f49324962..29dc1dc66254f 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_metal.json +++ b/data/json/recipes/basecamps/recipe_modular_field_metal.json @@ -1,336 +1,336 @@ [ { "type": "recipe", - "result": "faction_base_modular_field_room0_metal_northeast", + "result": "faction_base_modular_hub_room0_metal_northeast", "description": "We need some shelter, so build half of a metal shack with a metal roof on the northeast side of the camp", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room0_metal_northeast", + "construction_blueprint": "fbmh_room0_metal_northeast", "blueprint_name": "northeast shack", - "blueprint_requires": [ { "id": "faction_base_modular_field_0" } ], - "blueprint_provides": [ { "id": "fbmf_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_0" } ], + "blueprint_provides": [ { "id": "fbmh_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room1_metal_northeast", + "result": "faction_base_modular_hub_room1_metal_northeast", "description": "We should use metal to expand the shelter so we have space for another bed.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room1_metal_northeast", + "construction_blueprint": "fbmh_room1_metal_northeast", "blueprint_name": "expand northeast shack", - "blueprint_requires": [ { "id": "fbmf_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_northeast", "amount": 2 }, { "id": "fbmf_tent_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_northeast", "amount": 2 }, { "id": "fbmh_tent_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room2_metal_northeast", + "result": "faction_base_modular_hub_room2_metal_northeast", "description": "We should use metal to finish the northeast shack.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room2_metal_northeast", + "construction_blueprint": "fbmh_room2_metal_northeast", "blueprint_name": "finish northeast shack", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 2 } ], - "blueprint_provides": [ { "id": "fbmf_northeast", "amount": 2 } ], - "blueprint_excludes": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_tent_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 2 } ], + "blueprint_provides": [ { "id": "fbmh_northeast", "amount": 2 } ], + "blueprint_excludes": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_tent_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_metal_east", + "result": "faction_base_modular_hub_shack4_metal_east", "description": "We should expand our housing by putting up a metal building on the east side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_metal_east", + "construction_blueprint": "fbmh_shack4_metal_east", "blueprint_name": "east shack", - "blueprint_requires": [ { "id": "fbmf_tent_northeast" }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_east" } ], + "blueprint_requires": [ { "id": "fbmh_tent_northeast" }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_metal_east", + "result": "faction_base_modular_hub_room4_metal_east", "description": "We should expand our housing by adding a metal room on the east side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_metal_east", + "construction_blueprint": "fbmh_room4_metal_east", "blueprint_name": "east room", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_east" }, { "id": "fbmf_tent_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_east" }, { "id": "fbmh_tent_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_metal_southeast", + "result": "faction_base_modular_hub_shack4_metal_southeast", "description": "We should expand our housing by putting up a metal building on the southeast side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_metal_southeast", + "construction_blueprint": "fbmh_shack4_metal_southeast", "blueprint_name": "southeast shack", - "blueprint_requires": [ { "id": "fbmf_tent_east" } ], - "blueprint_provides": [ { "id": "fbmf_southeast", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_tent_east" } ], + "blueprint_provides": [ { "id": "fbmh_southeast", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_metal_southeast", + "result": "faction_base_modular_hub_room4_metal_southeast", "description": "We should expand our housing by adding a metal room on the southeast side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_metal_southeast", + "construction_blueprint": "fbmh_room4_metal_southeast", "blueprint_name": "southeast room", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_southeast", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southeast" }, { "id": "fbmf_tent_east" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_southeast", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southeast" }, { "id": "fbmh_tent_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_metal_northwest", + "result": "faction_base_modular_hub_room4_metal_northwest", "description": "We should expand our housing by putting up a metal building on the northwest side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_metal_northwest", + "construction_blueprint": "fbmh_room4_metal_northwest", "blueprint_name": "northwest shack", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_northwest", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_northwest" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_northwest", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_northwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_metal_west", + "result": "faction_base_modular_hub_shack4_metal_west", "description": "We should expand our housing by putting up a metal building on the west side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_metal_west", + "construction_blueprint": "fbmh_shack4_metal_west", "blueprint_name": "west shack", - "blueprint_requires": [ { "id": "fbmf_tent_northwest" } ], - "blueprint_provides": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_west" } ], + "blueprint_requires": [ { "id": "fbmh_tent_northwest" } ], + "blueprint_provides": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_metal_west", + "result": "faction_base_modular_hub_room4_metal_west", "description": "We should expand our housing by adding a metal room on the west side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_metal_west", + "construction_blueprint": "fbmh_room4_metal_west", "blueprint_name": "west room", - "blueprint_requires": [ { "id": "fbmf_northwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_west" }, { "id": "fbmf_tent_northwest" } ], + "blueprint_requires": [ { "id": "fbmh_northwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_west" }, { "id": "fbmh_tent_northwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_metal_soutwest", + "result": "faction_base_modular_hub_shack4_metal_soutwest", "description": "We should expand our housing by putting up a metal building on the southwest side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_metal_southwest", + "construction_blueprint": "fbmh_shack4_metal_southwest", "blueprint_name": "southwest shack", - "blueprint_requires": [ { "id": "fbmf_tent_west" } ], - "blueprint_provides": [ { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_tent_west" } ], + "blueprint_provides": [ { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_metal_southwest", + "result": "faction_base_modular_hub_room4_metal_southwest", "description": "We should expand our housing by adding a metal room on the southwest side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_metal_southwest", + "construction_blueprint": "fbmh_room4_metal_southwest", "blueprint_name": "southwest room", - "blueprint_requires": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southwest" }, { "id": "fbmf_tent_west" } ], + "blueprint_requires": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southwest" }, { "id": "fbmh_tent_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_shack_ne_metal_center", + "result": "faction_base_modular_hub_core_shack_ne_metal_center", "description": "A central building can act as a kitchen and dining hall. We should build the northeast quarter of one from metal.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_ne_metal_center", + "construction_blueprint": "fbmh_core_shack_ne_metal_center", "blueprint_name": "central building NE corner", - "blueprint_requires": [ { "id": "fbmf_tent_east" } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_ne_center" } ], - "blueprint_excludes": [ { "id": "fbmf_ne_center" } ], + "blueprint_requires": [ { "id": "fbmh_tent_east" } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_ne_center" } ], + "blueprint_excludes": [ { "id": "fbmh_ne_center" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_ne_metal_center", + "result": "faction_base_modular_hub_core_ne_metal_center", "description": "A central building can act as a core and dining hall. We should build out from the east room with metal.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_ne_metal_center", + "construction_blueprint": "fbmh_core_ne_metal_center", "blueprint_name": "central building NE corner", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_ne_center" } ], - "blueprint_excludes": [ { "id": "fbmf_ne_center" }, { "id": "fbmf_tent_east" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_ne_center" } ], + "blueprint_excludes": [ { "id": "fbmh_ne_center" }, { "id": "fbmh_tent_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_shack_nw_metal_center", + "result": "faction_base_modular_hub_core_shack_nw_metal_center", "description": "A central building can act as a core and dining hall. We should build the northwest quarter of one from metal.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_nw_metal_center", + "construction_blueprint": "fbmh_core_shack_nw_metal_center", "blueprint_name": "central building NW corner", - "blueprint_requires": [ { "id": "fbmf_tent_west" } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_nw_center" } ], - "blueprint_excludes": [ { "id": "fbmf_nw_center" } ], + "blueprint_requires": [ { "id": "fbmh_tent_west" } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_nw_center" } ], + "blueprint_excludes": [ { "id": "fbmh_nw_center" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_nw_metal_center", + "result": "faction_base_modular_hub_core_nw_metal_center", "description": "A central building can act as a core and dining hall. We should build out from the west room with metal.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_nw_metal_center", + "construction_blueprint": "fbmh_core_nw_metal_center", "blueprint_name": "central building NW corner", - "blueprint_requires": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_nw_center" } ], - "blueprint_excludes": [ { "id": "fbmf_nw_center" }, { "id": "fbmf_tent_west" } ], + "blueprint_requires": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_nw_center" } ], + "blueprint_excludes": [ { "id": "fbmh_nw_center" }, { "id": "fbmh_tent_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_metal_center", + "result": "faction_base_modular_hub_core_metal_center", "description": "A central building can act as a core and dining hall. We should build between the east and west rooms with metal.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_metal_center", + "construction_blueprint": "fbmh_core_metal_center", "blueprint_name": "central building north half", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 }, { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 4 }, { "id": "fbmf_ne_center" }, { "id": "fbmf_nw_center" } ], - "blueprint_excludes": [ { "id": "fbmf_ne_center" }, { "id": "fbmf_nw_center" }, { "id": "fbmf_tent_east" }, { "id": "fbmf_tent_west" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 }, { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 4 }, { "id": "fbmh_ne_center" }, { "id": "fbmh_nw_center" } ], + "blueprint_excludes": [ { "id": "fbmh_ne_center" }, { "id": "fbmh_nw_center" }, { "id": "fbmh_tent_east" }, { "id": "fbmh_tent_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_shack_se_metal_south", + "result": "faction_base_modular_hub_core_shack_se_metal_south", "description": "A central building can act as a core and dining hall. We should build the southeast quarter of one from metal.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_se_metal_south", + "construction_blueprint": "fbmh_core_shack_se_metal_south", "blueprint_name": "central building SE corner", - "blueprint_requires": [ { "id": "fbmf_tent_southeast" } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_se_south" } ], - "blueprint_excludes": [ { "id": "fbmf_se_south" } ], + "blueprint_requires": [ { "id": "fbmh_tent_southeast" } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_se_south" } ], + "blueprint_excludes": [ { "id": "fbmh_se_south" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_se_metal_south", + "result": "faction_base_modular_hub_core_se_metal_south", "description": "A central building can act as a core and dining hall. We should build out from the southeast room with metal.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_se_metal_south", + "construction_blueprint": "fbmh_core_se_metal_south", "blueprint_name": "central building SE corner", - "blueprint_requires": [ { "id": "fbmf_southeast", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_se_south" } ], - "blueprint_excludes": [ { "id": "fbmf_se_south" }, { "id": "fbmf_tent_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_southeast", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_se_south" } ], + "blueprint_excludes": [ { "id": "fbmh_se_south" }, { "id": "fbmh_tent_southeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_shack_sw_metal_south", + "result": "faction_base_modular_hub_core_shack_sw_metal_south", "description": "A central building can act as a core and dining hall. We should build the southwest quarter of one from metal.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_sw_metal_south", + "construction_blueprint": "fbmh_core_shack_sw_metal_south", "blueprint_name": "central building SW corner", - "blueprint_requires": [ { "id": "fbmf_tent_southwest" } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_sw_south" } ], - "blueprint_excludes": [ { "id": "fbmf_sw_south" } ], + "blueprint_requires": [ { "id": "fbmh_tent_southwest" } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_sw_south" } ], + "blueprint_excludes": [ { "id": "fbmh_sw_south" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_sw_metal_south", + "result": "faction_base_modular_hub_core_sw_metal_south", "description": "A central building can act as a core and dining hall. We should build out from the southwest room with metal.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_sw_metal_south", + "construction_blueprint": "fbmh_core_sw_metal_south", "blueprint_name": "central building SW corner", - "blueprint_requires": [ { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_sw_south" } ], - "blueprint_excludes": [ { "id": "fbmf_sw_south" }, { "id": "fbmf_tent_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_sw_south" } ], + "blueprint_excludes": [ { "id": "fbmh_sw_south" }, { "id": "fbmh_tent_southwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_metal_south", + "result": "faction_base_modular_hub_core_metal_south", "description": "A central building can act as a core and dining hall. We should build between the southeast and southwest rooms with metal.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_metal_south", + "construction_blueprint": "fbmh_core_metal_south", "blueprint_name": "central building south half", - "blueprint_requires": [ { "id": "fbmf_southeast", "amount": 4 }, { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 4 }, { "id": "fbmf_se_south" }, { "id": "fbmf_sw_south" } ], + "blueprint_requires": [ { "id": "fbmh_southeast", "amount": 4 }, { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 4 }, { "id": "fbmh_se_south" }, { "id": "fbmh_sw_south" } ], "blueprint_excludes": [ - { "id": "fbmf_se_south" }, - { "id": "fbmf_sw_south" }, - { "id": "fbmf_tent_southeast" }, - { "id": "fbmf_tent_southwest" } + { "id": "fbmh_se_south" }, + { "id": "fbmh_sw_south" }, + { "id": "fbmh_tent_southeast" }, + { "id": "fbmh_tent_southwest" } ], "blueprint_autocalc": true } diff --git a/data/json/recipes/basecamps/recipe_modular_field_tent.json b/data/json/recipes/basecamps/recipe_modular_field_tent.json index 708c4b8e8fec2..f81b2124d31f8 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_tent.json +++ b/data/json/recipes/basecamps/recipe_modular_field_tent.json @@ -1,7 +1,7 @@ [ { "type": "recipe", - "result": "faction_base_modular_field_tent_northeast", + "result": "faction_base_modular_hub_tent_northeast", "description": "We need some shelter, so set up a tent on the northeast side of the camp.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", @@ -9,16 +9,16 @@ "autolearn": false, "never_learn": true, "time": "3 h", - "construction_blueprint": "fbmf_tent_northeast", + "construction_blueprint": "fbmh_tent_northeast", "blueprint_name": "northeast tent", - "blueprint_requires": [ { "id": "faction_base_modular_field_0" } ], - "blueprint_provides": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_tent_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_0" } ], + "blueprint_provides": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_tent_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_northeast" } ], "components": [ [ [ "large_tent_kit", 1 ], [ "broketent", 4 ], [ "tent_kit", 3 ], [ "shelter_kit", 4 ] ] ] }, { "type": "recipe", - "result": "faction_base_modular_field_tent_east", + "result": "faction_base_modular_hub_tent_east", "description": "We should expand our housing by putting up a tent on the east side, though doing so will mean we will need more materials to build the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", @@ -26,16 +26,16 @@ "autolearn": false, "never_learn": true, "time": "3 h", - "construction_blueprint": "fbmf_tent_east", + "construction_blueprint": "fbmh_tent_east", "blueprint_name": "east tent", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_east", "amount": 4 }, { "id": "fbmf_tent_east" } ], - "blueprint_excludes": [ { "id": "fbmf_east" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_east", "amount": 4 }, { "id": "fbmh_tent_east" } ], + "blueprint_excludes": [ { "id": "fbmh_east" } ], "components": [ [ [ "large_tent_kit", 1 ], [ "broketent", 4 ], [ "tent_kit", 3 ], [ "shelter_kit", 4 ] ] ] }, { "type": "recipe", - "result": "faction_base_modular_field_tent_southeast", + "result": "faction_base_modular_hub_tent_southeast", "description": "We should expand our housing by putting up a tent on the southeast side, though doing so will mean we will need more materials to build the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", @@ -43,16 +43,16 @@ "autolearn": false, "never_learn": true, "time": "3 h", - "construction_blueprint": "fbmf_tent_southeast", + "construction_blueprint": "fbmh_tent_southeast", "blueprint_name": "southeast tent", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_southeast", "amount": 4 }, { "id": "fbmf_tent_southeast" } ], - "blueprint_excludes": [ { "id": "fbmf_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_southeast", "amount": 4 }, { "id": "fbmh_tent_southeast" } ], + "blueprint_excludes": [ { "id": "fbmh_southeast" } ], "components": [ [ [ "large_tent_kit", 1 ], [ "broketent", 4 ], [ "tent_kit", 3 ], [ "shelter_kit", 4 ] ] ] }, { "type": "recipe", - "result": "faction_base_modular_field_tent_northwest", + "result": "faction_base_modular_hub_tent_northwest", "description": "We should expand our housing by putting up a tent on the northwest side, though doing so will mean we will need more materials to build the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", @@ -60,16 +60,16 @@ "autolearn": false, "never_learn": true, "time": "3 h", - "construction_blueprint": "fbmf_tent_northwest", + "construction_blueprint": "fbmh_tent_northwest", "blueprint_name": "northwest tent", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_northwest", "amount": 4 }, { "id": "fbmf_tent_northwest" } ], - "blueprint_excludes": [ { "id": "fbmf_northwest" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_northwest", "amount": 4 }, { "id": "fbmh_tent_northwest" } ], + "blueprint_excludes": [ { "id": "fbmh_northwest" } ], "components": [ [ [ "large_tent_kit", 1 ], [ "broketent", 4 ], [ "tent_kit", 3 ], [ "shelter_kit", 4 ] ] ] }, { "type": "recipe", - "result": "faction_base_modular_field_tent_northwest", + "result": "faction_base_modular_hub_tent_northwest", "description": "We should expand our housing by putting up a tent on the west side, though doing so will mean we will need more materials to build the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", @@ -77,16 +77,16 @@ "autolearn": false, "never_learn": true, "time": "3 h", - "construction_blueprint": "fbmf_tent_west", + "construction_blueprint": "fbmh_tent_west", "blueprint_name": "west tent", - "blueprint_requires": [ { "id": "fbmf_northwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_west", "amount": 4 }, { "id": "fbmf_tent_west" } ], - "blueprint_excludes": [ { "id": "fbmf_west" } ], + "blueprint_requires": [ { "id": "fbmh_northwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_west", "amount": 4 }, { "id": "fbmh_tent_west" } ], + "blueprint_excludes": [ { "id": "fbmh_west" } ], "components": [ [ [ "large_tent_kit", 1 ], [ "broketent", 4 ], [ "tent_kit", 3 ], [ "shelter_kit", 4 ] ] ] }, { "type": "recipe", - "result": "faction_base_modular_field_tent_northwest", + "result": "faction_base_modular_hub_tent_northwest", "description": "We should expand our housing by putting up a tent on the southwest side, though doing so will mean we will need more materials to build the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", @@ -94,11 +94,11 @@ "autolearn": false, "never_learn": true, "time": "3 h", - "construction_blueprint": "fbmf_tent_southwest", + "construction_blueprint": "fbmh_tent_southwest", "blueprint_name": "southwest tent", - "blueprint_requires": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_southwest", "amount": 4 }, { "id": "fbmf_tent_southwest" } ], - "blueprint_excludes": [ { "id": "fbmf_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_southwest", "amount": 4 }, { "id": "fbmh_tent_southwest" } ], + "blueprint_excludes": [ { "id": "fbmh_southwest" } ], "components": [ [ [ "large_tent_kit", 1 ], [ "broketent", 4 ], [ "tent_kit", 3 ], [ "shelter_kit", 4 ] ] ] } ] diff --git a/data/json/recipes/basecamps/recipe_modular_field_wad.json b/data/json/recipes/basecamps/recipe_modular_field_wad.json index e5142bd3da24c..bff0bd28da8d3 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_wad.json +++ b/data/json/recipes/basecamps/recipe_modular_field_wad.json @@ -1,340 +1,340 @@ [ { "type": "recipe", - "result": "faction_base_modular_field_room0_wad_northeast", + "result": "faction_base_modular_hub_room0_wad_northeast", "description": "We need some shelter, so build half of a wattle-and-daub shack with a sod roof on the northeast side of the camp", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room0_wad_northeast", + "construction_blueprint": "fbmh_room0_wad_northeast", "blueprint_name": "northeast shack", - "blueprint_requires": [ { "id": "faction_base_modular_field_0" } ], - "blueprint_provides": [ { "id": "fbmf_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_0" } ], + "blueprint_provides": [ { "id": "fbmh_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room1_wad_northeast", + "result": "faction_base_modular_hub_room1_wad_northeast", "description": "We should use wattle-and-daub to expand the shelter so we have space for another bed.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room1_wad_northeast", + "construction_blueprint": "fbmh_room1_wad_northeast", "blueprint_name": "expand northeast shack", - "blueprint_requires": [ { "id": "fbmf_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_northeast", "amount": 2 }, { "id": "fbmf_tent_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_northeast", "amount": 2 }, { "id": "fbmh_tent_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room2_wad_northeast", + "result": "faction_base_modular_hub_room2_wad_northeast", "description": "We should use wattle-and-daub to finish the northeast shack.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "skill_used": "fabrication", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room2_wad_northeast", + "construction_blueprint": "fbmh_room2_wad_northeast", "blueprint_name": "finish northeast shack", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 2 } ], - "blueprint_provides": [ { "id": "fbmf_northeast", "amount": 2 } ], - "blueprint_excludes": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_tent_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 2 } ], + "blueprint_provides": [ { "id": "fbmh_northeast", "amount": 2 } ], + "blueprint_excludes": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_tent_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_wad_east", + "result": "faction_base_modular_hub_shack4_wad_east", "description": "We should expand our housing by putting up a wattle-and-daub building on the east side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_wad_east", + "construction_blueprint": "fbmh_shack4_wad_east", "blueprint_name": "east shack", - "blueprint_requires": [ { "id": "fbmf_tent_northeast" }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_east" } ], + "blueprint_requires": [ { "id": "fbmh_tent_northeast" }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_wad_east", + "result": "faction_base_modular_hub_room4_wad_east", "description": "We should expand our housing by adding a wattle-and-daub room on the east side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "skill_used": "fabrication", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_wad_east", + "construction_blueprint": "fbmh_room4_wad_east", "blueprint_name": "east room", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_east" }, { "id": "fbmf_tent_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_east" }, { "id": "fbmh_tent_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_wad_southeast", + "result": "faction_base_modular_hub_shack4_wad_southeast", "description": "We should expand our housing by putting up a wattle-and-daub building on the southeast side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_wad_southeast", + "construction_blueprint": "fbmh_shack4_wad_southeast", "blueprint_name": "southeast shack", - "blueprint_requires": [ { "id": "fbmf_tent_east" } ], - "blueprint_provides": [ { "id": "fbmf_southeast", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_tent_east" } ], + "blueprint_provides": [ { "id": "fbmh_southeast", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_wad_southeast", + "result": "faction_base_modular_hub_room4_wad_southeast", "description": "We should expand our housing by adding a wattle-and-daub room on the southeast side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "skills_required": [ [ "survival", 3 ], [ "tailor", 1 ] ], "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_wad_southeast", + "construction_blueprint": "fbmh_room4_wad_southeast", "blueprint_name": "southeast room", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_southeast", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southeast" }, { "id": "fbmf_tent_east" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_southeast", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southeast" }, { "id": "fbmh_tent_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_wad_northwest", + "result": "faction_base_modular_hub_room4_wad_northwest", "description": "We should expand our housing by putting up a wattle-and-daub building on the northwest side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_wad_northwest", + "construction_blueprint": "fbmh_room4_wad_northwest", "blueprint_name": "northwest shack", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_northwest", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_northwest" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_northwest", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_northwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_wad_west", + "result": "faction_base_modular_hub_shack4_wad_west", "description": "We should expand our housing by putting up a wattle-and-daub building on the west side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_wad_west", + "construction_blueprint": "fbmh_shack4_wad_west", "blueprint_name": "west shack", - "blueprint_requires": [ { "id": "fbmf_tent_northwest" } ], - "blueprint_provides": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_west" } ], + "blueprint_requires": [ { "id": "fbmh_tent_northwest" } ], + "blueprint_provides": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_wad_west", + "result": "faction_base_modular_hub_room4_wad_west", "description": "We should expand our housing by adding a wattle-and-daub room on the west side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_wad_west", + "construction_blueprint": "fbmh_room4_wad_west", "blueprint_name": "west room", - "blueprint_requires": [ { "id": "fbmf_northwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_west" }, { "id": "fbmf_tent_northwest" } ], + "blueprint_requires": [ { "id": "fbmh_northwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_west" }, { "id": "fbmh_tent_northwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_wad_southwest", + "result": "faction_base_modular_hub_shack4_wad_southwest", "description": "We should expand our housing by putting up a wattle-and-daub building on the southwest side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_wad_southwest", + "construction_blueprint": "fbmh_shack4_wad_southwest", "blueprint_name": "southwest shack", - "blueprint_requires": [ { "id": "fbmf_tent_west" } ], - "blueprint_provides": [ { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_tent_west" } ], + "blueprint_provides": [ { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_wad_southwest", + "result": "faction_base_modular_hub_room4_wad_southwest", "description": "We should expand our housing by adding a wattle-and-daub room on the southwest side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_wad_southwest", + "construction_blueprint": "fbmh_room4_wad_southwest", "blueprint_name": "southwest room", - "blueprint_requires": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southwest" }, { "id": "fbmf_tent_west" } ], + "blueprint_requires": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southwest" }, { "id": "fbmh_tent_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_shack_ne_wad_center", + "result": "faction_base_modular_hub_core_shack_ne_wad_center", "description": "A central building can act as a kitchen and dining hall. We should build the northeast quarter of one from wattle-and-daub.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_ne_wad_center", + "construction_blueprint": "fbmh_core_shack_ne_wad_center", "blueprint_name": "central building NE corner", - "blueprint_requires": [ { "id": "fbmf_tent_east" } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_ne_center" } ], - "blueprint_excludes": [ { "id": "fbmf_ne_center" } ], + "blueprint_requires": [ { "id": "fbmh_tent_east" } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_ne_center" } ], + "blueprint_excludes": [ { "id": "fbmh_ne_center" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_ne_wad_center", + "result": "faction_base_modular_hub_core_ne_wad_center", "description": "A central building can act as a core and dining hall. We should build out from the east room with wattle-and-daub.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_ne_wad_center", + "construction_blueprint": "fbmh_core_ne_wad_center", "blueprint_name": "central building NE corner", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_ne_center" } ], - "blueprint_excludes": [ { "id": "fbmf_ne_center" }, { "id": "fbmf_tent_east" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_ne_center" } ], + "blueprint_excludes": [ { "id": "fbmh_ne_center" }, { "id": "fbmh_tent_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_shack_nw_wad_center", + "result": "faction_base_modular_hub_core_shack_nw_wad_center", "description": "A central building can act as a core and dining hall. We should build the northwest quarter of one from wattle-and-daub.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_nw_wad_center", + "construction_blueprint": "fbmh_core_shack_nw_wad_center", "blueprint_name": "central building NW corner", - "blueprint_requires": [ { "id": "fbmf_tent_west" } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_nw_center" } ], - "blueprint_excludes": [ { "id": "fbmf_nw_center" } ], + "blueprint_requires": [ { "id": "fbmh_tent_west" } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_nw_center" } ], + "blueprint_excludes": [ { "id": "fbmh_nw_center" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_nw_wad_center", + "result": "faction_base_modular_hub_core_nw_wad_center", "description": "A central building can act as a core and dining hall. We should build out from the west room with wattle-and-daub.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_nw_wad_center", + "construction_blueprint": "fbmh_core_nw_wad_center", "blueprint_name": "central building NW corner", - "blueprint_requires": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_nw_center" } ], - "blueprint_excludes": [ { "id": "fbmf_nw_center" }, { "id": "fbmf_tent_west" } ], + "blueprint_requires": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_nw_center" } ], + "blueprint_excludes": [ { "id": "fbmh_nw_center" }, { "id": "fbmh_tent_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_wad_center", + "result": "faction_base_modular_hub_core_wad_center", "description": "A central building can act as a core and dining hall. We should build between the east and west rooms with wattle-and-daub.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_wad_center", + "construction_blueprint": "fbmh_core_wad_center", "blueprint_name": "central building north half", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 }, { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 4 }, { "id": "fbmf_ne_center" }, { "id": "fbmf_nw_center" } ], - "blueprint_excludes": [ { "id": "fbmf_ne_center" }, { "id": "fbmf_nw_center" }, { "id": "fbmf_tent_east" }, { "id": "fbmf_tent_west" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 }, { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 4 }, { "id": "fbmh_ne_center" }, { "id": "fbmh_nw_center" } ], + "blueprint_excludes": [ { "id": "fbmh_ne_center" }, { "id": "fbmh_nw_center" }, { "id": "fbmh_tent_east" }, { "id": "fbmh_tent_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_shack_se_wad_south", + "result": "faction_base_modular_hub_core_shack_se_wad_south", "description": "A central building can act as a core and dining hall. We should build the southeast quarter of one from wattle-and-daub.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_se_wad_south", + "construction_blueprint": "fbmh_core_shack_se_wad_south", "blueprint_name": "central building SE corner", - "blueprint_requires": [ { "id": "fbmf_tent_southeast" } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_se_south" } ], - "blueprint_excludes": [ { "id": "fbmf_se_south" } ], + "blueprint_requires": [ { "id": "fbmh_tent_southeast" } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_se_south" } ], + "blueprint_excludes": [ { "id": "fbmh_se_south" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_se_wad_south", + "result": "faction_base_modular_hub_core_se_wad_south", "description": "A central building can act as a core and dining hall. We should build out from the southeast room with wattle-and-daub.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "skill_used": "fabrication", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_se_wad_south", + "construction_blueprint": "fbmh_core_se_wad_south", "blueprint_name": "central building SE corner", - "blueprint_requires": [ { "id": "fbmf_southeast", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_se_south" } ], - "blueprint_excludes": [ { "id": "fbmf_se_south" }, { "id": "fbmf_tent_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_southeast", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_se_south" } ], + "blueprint_excludes": [ { "id": "fbmh_se_south" }, { "id": "fbmh_tent_southeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_shack_sw_wad_south", + "result": "faction_base_modular_hub_core_shack_sw_wad_south", "description": "A central building can act as a core and dining hall. We should build the southwest quarter of one from wattle-and-daub.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_sw_wad_south", + "construction_blueprint": "fbmh_core_shack_sw_wad_south", "blueprint_name": "central building SW corner", - "blueprint_requires": [ { "id": "fbmf_tent_southwest" } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_sw_south" } ], - "blueprint_excludes": [ { "id": "fbmf_sw_south" } ], + "blueprint_requires": [ { "id": "fbmh_tent_southwest" } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_sw_south" } ], + "blueprint_excludes": [ { "id": "fbmh_sw_south" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_sw_wad_south", + "result": "faction_base_modular_hub_core_sw_wad_south", "description": "A central building can act as a core and dining hall. We should build out from the southwest room with wattle-and-daub.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_sw_wad_south", + "construction_blueprint": "fbmh_core_sw_wad_south", "blueprint_name": "central building SW corner", - "blueprint_requires": [ { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_sw_south" } ], - "blueprint_excludes": [ { "id": "fbmf_sw_south" }, { "id": "fbmf_tent_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_sw_south" } ], + "blueprint_excludes": [ { "id": "fbmh_sw_south" }, { "id": "fbmh_tent_southwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_wad_south", + "result": "faction_base_modular_hub_core_wad_south", "description": "A central building can act as a core and dining hall. We should build between the southeast and southwest rooms with wattle-and-daub.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_wad_south", + "construction_blueprint": "fbmh_core_wad_south", "blueprint_name": "central building south half", - "blueprint_requires": [ { "id": "fbmf_southeast", "amount": 4 }, { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 4 }, { "id": "fbmf_se_south" }, { "id": "fbmf_sw_south" } ], + "blueprint_requires": [ { "id": "fbmh_southeast", "amount": 4 }, { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 4 }, { "id": "fbmh_se_south" }, { "id": "fbmh_sw_south" } ], "blueprint_excludes": [ - { "id": "fbmf_se_south" }, - { "id": "fbmf_sw_south" }, - { "id": "fbmf_tent_southeast" }, - { "id": "fbmf_tent_southwest" } + { "id": "fbmh_se_south" }, + { "id": "fbmh_sw_south" }, + { "id": "fbmh_tent_southeast" }, + { "id": "fbmh_tent_southwest" } ], "blueprint_autocalc": true } diff --git a/data/json/recipes/basecamps/recipe_modular_field_wood.json b/data/json/recipes/basecamps/recipe_modular_field_wood.json index 7c10c661bfddb..2b7ab9c43c927 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_wood.json +++ b/data/json/recipes/basecamps/recipe_modular_field_wood.json @@ -1,336 +1,336 @@ [ { "type": "recipe", - "result": "faction_base_modular_field_room0_wood_northeast", + "result": "faction_base_modular_hub_room0_wood_northeast", "description": "We need some shelter, so build half of a wood panel shack with a wooden roof on the northeast side of the camp", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room0_wood_northeast", + "construction_blueprint": "fbmh_room0_wood_northeast", "blueprint_name": "northeast shack", - "blueprint_requires": [ { "id": "faction_base_modular_field_0" } ], - "blueprint_provides": [ { "id": "fbmf_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_0" } ], + "blueprint_provides": [ { "id": "fbmh_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room1_wood_northeast", + "result": "faction_base_modular_hub_room1_wood_northeast", "description": "We should use wood panel to expand the shelter so we have space for another bed.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room1_wood_northeast", + "construction_blueprint": "fbmh_room1_wood_northeast", "blueprint_name": "expand northeast shack", - "blueprint_requires": [ { "id": "fbmf_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_northeast" } ], - "blueprint_excludes": [ { "id": "fbmf_northeast", "amount": 2 }, { "id": "fbmf_tent_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_northeast" } ], + "blueprint_excludes": [ { "id": "fbmh_northeast", "amount": 2 }, { "id": "fbmh_tent_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room2_wood_northeast", + "result": "faction_base_modular_hub_room2_wood_northeast", "description": "We should use wood panel to finish the northeast shack.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room2_wood_northeast", + "construction_blueprint": "fbmh_room2_wood_northeast", "blueprint_name": "finish northeast shack", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 2 } ], - "blueprint_provides": [ { "id": "fbmf_northeast", "amount": 2 } ], - "blueprint_excludes": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_tent_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 2 } ], + "blueprint_provides": [ { "id": "fbmh_northeast", "amount": 2 } ], + "blueprint_excludes": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_tent_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_wood_east", + "result": "faction_base_modular_hub_shack4_wood_east", "description": "We should expand our housing by putting up a wood panel building on the east side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_wood_east", + "construction_blueprint": "fbmh_shack4_wood_east", "blueprint_name": "east shack", - "blueprint_requires": [ { "id": "fbmf_tent_northeast" }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_east" } ], + "blueprint_requires": [ { "id": "fbmh_tent_northeast" }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_wood_east", + "result": "faction_base_modular_hub_room4_wood_east", "description": "We should expand our housing by adding a wood panel room on the east side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_wood_east", + "construction_blueprint": "fbmh_room4_wood_east", "blueprint_name": "east room", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_east" }, { "id": "fbmf_tent_northeast" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_east" }, { "id": "fbmh_tent_northeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_wood_southeast", + "result": "faction_base_modular_hub_shack4_wood_southeast", "description": "We should expand our housing by putting up a wood panel building on the southeast side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_wood_southeast", + "construction_blueprint": "fbmh_shack4_wood_southeast", "blueprint_name": "southeast shack", - "blueprint_requires": [ { "id": "fbmf_tent_east" } ], - "blueprint_provides": [ { "id": "fbmf_southeast", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_tent_east" } ], + "blueprint_provides": [ { "id": "fbmh_southeast", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_wood_southeast", + "result": "faction_base_modular_hub_room4_wood_southeast", "description": "We should expand our housing by adding a wood panel room on the southeast side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_wood_southeast", + "construction_blueprint": "fbmh_room4_wood_southeast", "blueprint_name": "southeast room", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_southeast", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southeast" }, { "id": "fbmf_tent_east" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_southeast", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southeast" }, { "id": "fbmh_tent_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_wood_northwest", + "result": "faction_base_modular_hub_room4_wood_northwest", "description": "We should expand our housing by putting up a wood panel building on the northwest side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_wood_northwest", + "construction_blueprint": "fbmh_room4_wood_northwest", "blueprint_name": "northwest shack", - "blueprint_requires": [ { "id": "fbmf_northeast", "amount": 4 }, { "id": "fbmf_fire_northeast" }, { "id": "fbmf_bed2_northeast" } ], - "blueprint_provides": [ { "id": "fbmf_northwest", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_northwest" } ], + "blueprint_requires": [ { "id": "fbmh_northeast", "amount": 4 }, { "id": "fbmh_fire_northeast" }, { "id": "fbmh_bed2_northeast" } ], + "blueprint_provides": [ { "id": "fbmh_northwest", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_northwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_wood_west", + "result": "faction_base_modular_hub_shack4_wood_west", "description": "We should expand our housing by putting up a wood panel building on the west side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_wood_west", + "construction_blueprint": "fbmh_shack4_wood_west", "blueprint_name": "west shack", - "blueprint_requires": [ { "id": "fbmf_tent_northwest" } ], - "blueprint_provides": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_west" } ], + "blueprint_requires": [ { "id": "fbmh_tent_northwest" } ], + "blueprint_provides": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_wood_west", + "result": "faction_base_modular_hub_room4_wood_west", "description": "We should expand our housing by adding a wood panel room on the west side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_wood_west", + "construction_blueprint": "fbmh_room4_wood_west", "blueprint_name": "west room", - "blueprint_requires": [ { "id": "fbmf_northwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_west" }, { "id": "fbmf_tent_northwest" } ], + "blueprint_requires": [ { "id": "fbmh_northwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_west" }, { "id": "fbmh_tent_northwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_shack4_wood_southwest", + "result": "faction_base_modular_hub_shack4_wood_southwest", "description": "We should expand our housing by putting up a wood panel building on the southwest side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_shack4_wood_southwest", + "construction_blueprint": "fbmh_shack4_wood_southwest", "blueprint_name": "southwest shack", - "blueprint_requires": [ { "id": "fbmf_tent_west" } ], - "blueprint_provides": [ { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_tent_west" } ], + "blueprint_provides": [ { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_room4_wood_southwest", + "result": "faction_base_modular_hub_room4_wood_southwest", "description": "We should expand our housing by adding a wood panel room on the southwest side, which we can also use as part of the central building.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_room4_wood_southwest", + "construction_blueprint": "fbmh_room4_wood_southwest", "blueprint_name": "southwest room", - "blueprint_requires": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmf_southwest" }, { "id": "fbmf_tent_west" } ], + "blueprint_requires": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_excludes": [ { "id": "fbmh_southwest" }, { "id": "fbmh_tent_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_shack_ne_wood_center", + "result": "faction_base_modular_hub_core_shack_ne_wood_center", "description": "A central building can act as a kitchen and dining hall. We should build the northeast quarter of one from wood panel.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_ne_wood_center", + "construction_blueprint": "fbmh_core_shack_ne_wood_center", "blueprint_name": "central building NE corner", - "blueprint_requires": [ { "id": "fbmf_tent_east" } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_ne_center" } ], - "blueprint_excludes": [ { "id": "fbmf_ne_center" } ], + "blueprint_requires": [ { "id": "fbmh_tent_east" } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_ne_center" } ], + "blueprint_excludes": [ { "id": "fbmh_ne_center" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_ne_wood_center", + "result": "faction_base_modular_hub_core_ne_wood_center", "description": "A central building can act as a core and dining hall. We should build out from the east room with wood panel.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_ne_wood_center", + "construction_blueprint": "fbmh_core_ne_wood_center", "blueprint_name": "central building NE corner", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_ne_center" } ], - "blueprint_excludes": [ { "id": "fbmf_ne_center" }, { "id": "fbmf_tent_east" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_ne_center" } ], + "blueprint_excludes": [ { "id": "fbmh_ne_center" }, { "id": "fbmh_tent_east" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_nw_wood_center", + "result": "faction_base_modular_hub_core_nw_wood_center", "description": "A central building can act as a core and dining hall. We should build the northwest quarter of one from wood panel.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_nw_wood_center", + "construction_blueprint": "fbmh_core_shack_nw_wood_center", "blueprint_name": "central building NW corner", - "blueprint_requires": [ { "id": "fbmf_tent_west" } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_nw_center" } ], - "blueprint_excludes": [ { "id": "fbmf_nw_center" } ], + "blueprint_requires": [ { "id": "fbmh_tent_west" } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_nw_center" } ], + "blueprint_excludes": [ { "id": "fbmh_nw_center" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_nw_wood_center", + "result": "faction_base_modular_hub_core_nw_wood_center", "description": "A central building can act as a core and dining hall. We should build out from the west room with wood panel.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_nw_wood_center", + "construction_blueprint": "fbmh_core_nw_wood_center", "blueprint_name": "central building NW corner", - "blueprint_requires": [ { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 2 }, { "id": "fbmf_nw_center" } ], - "blueprint_excludes": [ { "id": "fbmf_nw_center" }, { "id": "fbmf_tent_west" } ], + "blueprint_requires": [ { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 2 }, { "id": "fbmh_nw_center" } ], + "blueprint_excludes": [ { "id": "fbmh_nw_center" }, { "id": "fbmh_tent_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_wood_center", + "result": "faction_base_modular_hub_core_wood_center", "description": "A central building can act as a core and dining hall. We should build between the east and west rooms with wood panel.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_wood_center", + "construction_blueprint": "fbmh_core_wood_center", "blueprint_name": "central building north half", - "blueprint_requires": [ { "id": "fbmf_east", "amount": 4 }, { "id": "fbmf_west", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_center", "amount": 4 }, { "id": "fbmf_ne_center" }, { "id": "fbmf_nw_center" } ], - "blueprint_excludes": [ { "id": "fbmf_ne_center" }, { "id": "fbmf_nw_center" }, { "id": "fbmf_tent_east" }, { "id": "fbmf_tent_west" } ], + "blueprint_requires": [ { "id": "fbmh_east", "amount": 4 }, { "id": "fbmh_west", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_center", "amount": 4 }, { "id": "fbmh_ne_center" }, { "id": "fbmh_nw_center" } ], + "blueprint_excludes": [ { "id": "fbmh_ne_center" }, { "id": "fbmh_nw_center" }, { "id": "fbmh_tent_east" }, { "id": "fbmh_tent_west" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_shack_se_wood_south", + "result": "faction_base_modular_hub_core_shack_se_wood_south", "description": "A central building can act as a core and dining hall. We should build the southeast quarter of one from wood panel.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_se_wood_south", + "construction_blueprint": "fbmh_core_shack_se_wood_south", "blueprint_name": "central building SE corner", - "blueprint_requires": [ { "id": "fbmf_tent_southeast" } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_se_south" } ], - "blueprint_excludes": [ { "id": "fbmf_se_south" } ], + "blueprint_requires": [ { "id": "fbmh_tent_southeast" } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_se_south" } ], + "blueprint_excludes": [ { "id": "fbmh_se_south" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_se_wood_south", + "result": "faction_base_modular_hub_core_se_wood_south", "description": "A central building can act as a core and dining hall. We should build out from the southeast room with wood panel.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_se_wood_south", + "construction_blueprint": "fbmh_core_se_wood_south", "blueprint_name": "central building SE corner", - "blueprint_requires": [ { "id": "fbmf_southeast", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_se_south" } ], - "blueprint_excludes": [ { "id": "fbmf_se_south" }, { "id": "fbmf_tent_southeast" } ], + "blueprint_requires": [ { "id": "fbmh_southeast", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_se_south" } ], + "blueprint_excludes": [ { "id": "fbmh_se_south" }, { "id": "fbmh_tent_southeast" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_shack_sw_wood_south", + "result": "faction_base_modular_hub_core_shack_sw_wood_south", "description": "A central building can act as a core and dining hall. We should build the southwest quarter of one from wood panel.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_shack_sw_wood_south", + "construction_blueprint": "fbmh_core_shack_sw_wood_south", "blueprint_name": "central building SW corner", - "blueprint_requires": [ { "id": "fbmf_tent_southwest" } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_sw_south" } ], - "blueprint_excludes": [ { "id": "fbmf_sw_south" } ], + "blueprint_requires": [ { "id": "fbmh_tent_southwest" } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_sw_south" } ], + "blueprint_excludes": [ { "id": "fbmh_sw_south" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_sw_wood_south", + "result": "faction_base_modular_hub_core_sw_wood_south", "description": "A central building can act as a core and dining hall. We should build out from the southwest room with wood panel.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_sw_wood_south", + "construction_blueprint": "fbmh_core_sw_wood_south", "blueprint_name": "central building SW corner", - "blueprint_requires": [ { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 2 }, { "id": "fbmf_sw_south" } ], - "blueprint_excludes": [ { "id": "fbmf_sw_south" }, { "id": "fbmf_tent_southwest" } ], + "blueprint_requires": [ { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 2 }, { "id": "fbmh_sw_south" } ], + "blueprint_excludes": [ { "id": "fbmh_sw_south" }, { "id": "fbmh_tent_southwest" } ], "blueprint_autocalc": true }, { "type": "recipe", - "result": "faction_base_modular_field_core_wood_south", + "result": "faction_base_modular_hub_core_wood_south", "description": "A central building can act as a core and dining hall. We should build between the southeast and southwest rooms with wood panel.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmf_core_wood_south", + "construction_blueprint": "fbmh_core_wood_south", "blueprint_name": "central building south half", - "blueprint_requires": [ { "id": "fbmf_southeast", "amount": 4 }, { "id": "fbmf_southwest", "amount": 4 } ], - "blueprint_provides": [ { "id": "fbmf_south", "amount": 4 }, { "id": "fbmf_se_south" }, { "id": "fbmf_sw_south" } ], + "blueprint_requires": [ { "id": "fbmh_southeast", "amount": 4 }, { "id": "fbmh_southwest", "amount": 4 } ], + "blueprint_provides": [ { "id": "fbmh_south", "amount": 4 }, { "id": "fbmh_se_south" }, { "id": "fbmh_sw_south" } ], "blueprint_excludes": [ - { "id": "fbmf_se_south" }, - { "id": "fbmf_sw_south" }, - { "id": "fbmf_tent_southeast" }, - { "id": "fbmf_tent_southwest" } + { "id": "fbmh_se_south" }, + { "id": "fbmh_sw_south" }, + { "id": "fbmh_tent_southeast" }, + { "id": "fbmh_tent_southwest" } ], "blueprint_autocalc": true } From d0b490ffb7df4eeb3d24ee7874fb35efa76ef262 Mon Sep 17 00:00:00 2001 From: Mark Langsdorf Date: Thu, 13 Jun 2019 17:18:17 -0500 Subject: [PATCH 4/4] factions: don't duplicate factions loaded from templates and from gsav When reloading factions from master.gsav after they've already been loaded from the templates by loading NPCs, find the existing factions instead of making multiple copies. --- src/savegame.cpp | 14 +++++++++++++- src/savegame_json.cpp | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/savegame.cpp b/src/savegame.cpp index b063bc4496d4d..507cadf1a24b8 100644 --- a/src/savegame.cpp +++ b/src/savegame.cpp @@ -1585,7 +1585,19 @@ void faction_manager::serialize( JsonOut &jsout ) const void faction_manager::deserialize( JsonIn &jsin ) { - jsin.read( factions ); + jsin.start_array(); + while( !jsin.end_array() ) { + faction add_fac; + jsin.read( add_fac ); + faction *old_fac = get( add_fac.id ); + if( old_fac ) { + *old_fac = add_fac; + // force a revalidation of add_fac + get( add_fac.id ); + } else { + factions.emplace_back( add_fac ); + } + } } void Creature_tracker::deserialize( JsonIn &jsin ) diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp index a3981409556d4..1d4445a0d0a8c 100644 --- a/src/savegame_json.cpp +++ b/src/savegame_json.cpp @@ -1527,7 +1527,7 @@ void npc::store( JsonOut &json ) const json.member( "previous_mission", previous_mission ); json.member( "faction_api_ver", faction_api_version ); if( !fac_id.str().empty() ) { // set in constructor - json.member( "my_fac", my_fac->id.c_str() ); + json.member( "my_fac", fac_id.c_str() ); } json.member( "attitude", static_cast( attitude ) ); json.member( "previous_attitude", static_cast( attitude ) );