From 300c3dee64c318ca57e1ce6ebe9878f3b1454615 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Thu, 6 Jun 2019 23:54:53 +0200 Subject: [PATCH] Rural Content: 4 New Farms (#31188) * Farm terrains * New farm specials * Create farm_tiles.json * Create farm_nested.json * Create farm_lots.json palette --- data/json/mapgen/farm_tiles.json | 1236 +++++++++++++++++++ data/json/mapgen/nested/farm_nested.json | 16 + data/json/mapgen_palettes/farm_lots.json | 115 ++ data/json/overmap/specials.json | 102 ++ data/json/overmap_terrain_agricultural.json | 250 ++++ 5 files changed, 1719 insertions(+) create mode 100644 data/json/mapgen/farm_tiles.json create mode 100644 data/json/mapgen/nested/farm_nested.json create mode 100644 data/json/mapgen_palettes/farm_lots.json diff --git a/data/json/mapgen/farm_tiles.json b/data/json/mapgen/farm_tiles.json new file mode 100644 index 0000000000000..66f47eb8968ef --- /dev/null +++ b/data/json/mapgen/farm_tiles.json @@ -0,0 +1,1236 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "farm_lot_wire_straight_h" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "%%%%%%%%%%%%%%%%%%%%%%%%", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "farm_lot_wire_straight_v" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + " ", + "%%%%%%%%%%%%%%%%%%%%%%%%" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "farm_lot_wire_straight_v_open" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + "# ## ## ## ## ## ## ## #", + " //////// ", + "%%%%%%%%////////%%%%%%%%" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "farm_lot_wire_straight_h_open" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "%%%%%%%%////////%%%%%%%%", + " //////// ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "farm_lot_wire_turn_h_open" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% //////// ", + "%%%%%%%%////////%%%%%%%%" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "farm_lot_wire_turn_v_open" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% //////// ", + "%%%%%%%%////////%%%%%%%%" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "farm_lot_M" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "farm_lot_M1" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " ", + "########################", + "########################", + " " + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "farm_lot_wire_turn_h" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "% ######################", + "% ######################", + "% ", + "%%%%%%%%%%%%%%%%%%%%%%%%" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "farm_lot_wire_turn_uni" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## ", + "% ## ## ## ## ## ## ####", + "% ## ## ## ## ## ## ####", + "% ## ## ## ## ## ## ", + "% ## ## ## ## ## #######", + "% ## ## ## ## ## #######", + "% ## ## ## ## ## ", + "% ## ## ## ## ##########", + "% ## ## ## ## ##########", + "% ## ## ## ## ", + "% ## ## ## #############", + "% ## ## ## #############", + "% ## ## ## ", + "% ## ## ################", + "% ## ## ################", + "% ## ## ", + "% ## ###################", + "% ## ###################", + "% ## ", + "% ######################", + "% ######################", + "% ", + "%%%%%%%%%%%%%%%%%%%%%%%%" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "farm_lot_wire_turn_v" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ## ## ## ## ## ## ## #", + "% ", + "%%%%%%%%%%%%%%%%%%%%%%%%" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "field", + "rows": [ + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "......./////////........", + "......./////////........", + ".......////////.........", + ".......////////.........", + ".......////////.........", + ".......////////.........", + ".......////////.........", + ".......////////.........", + ".......////////.........", + "......./////////........", + "......./////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........" + ], + "palettes": [ "farm_lots" ], + "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 4, 18 ], "y": [ 0, 22 ] } ], + "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "field", + "rows": [ + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + ".........////////.......", + ".........////////.......", + ".........////////.......", + ".........////////.......", + ".........////////.......", + ".........////////.......", + "..........////////......", + "..........////////......", + "..........////////......", + "..........////////......", + ".........////////.......", + ".........////////.......", + ".........////////.......", + ".........////////.......", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........" + ], + "palettes": [ "farm_lots" ], + "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 4, 18 ], "y": [ 0, 22 ] } ], + "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road" ], + "weight": 75, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "field", + "rows": [ + "........////////........", + "........////////........", + "........////////........", + ".......V////////........", + ".......V////////........", + ".......V.////////.......", + ".......V.////////.......", + ".......V.////////.......", + ".......V.////////.......", + ".......V.////////.......", + ".......V.////////.......", + ".......V..////////......", + ".......V..////////......", + ".......V..////////......", + ".......V..////////......", + ".......V.////////.......", + ".......V.////////.......", + ".......V.////////.......", + ".......V.////////.......", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........" + ], + "palettes": [ "farm_lots" ], + "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 8, 18 ], "y": [ 0, 22 ] } ], + "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road_3way" ], + "weight": 25, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "field", + "rotation": [ 1, 1 ], + "rows": [ + "........////////........", + "........////////........", + "........////////........", + "........////////........", + ".......V.////////.......", + ".......V.////////.......", + ".......V.////////.......", + ".......V.////////.......", + ".......V.///////////////", + ".......V.///////////////", + ".......V.///////////////", + ".......V.///////////////", + ".......V.///////////////", + ".......V.///////////////", + ".......V////////////////", + ".......V////////////////", + ".......V////////........", + ".......V////////........", + ".......V////////........", + ".......V///////.........", + ".......////////.........", + ".......////////.........", + ".......////////.........", + ".......////////........." + ], + "palettes": [ "farm_lots" ], + "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 4, 10 ], "y": [ 0, 22 ] } ], + "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road_3way" ], + "weight": 33, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "field", + "rotation": [ 1, 1 ], + "rows": [ + "........////////........", + "........////////........", + "........////////V.......", + "........////////V.......", + "........////////V.......", + "........////////V.......", + "........////////VVV.....", + "......./////////........", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////........", + "......./////////VVV.....", + "........////////V.......", + "........////////V.......", + "........////////V.......", + "........////////V.......", + "........////////........", + "........////////........" + ], + "palettes": [ "farm_lots" ], + "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 4, 10 ], "y": [ 0, 22 ] } ], + "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road_3way" ], + "weight": 33, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "field", + "rotation": [ 1, 1 ], + "rows": [ + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "......./////////........", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////////////", + "......./////////........", + "......./////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........" + ], + "palettes": [ "farm_lots" ], + "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 10, 20 ], "y": [ 0, 22 ] } ], + "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road_turn" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "field", + "rows": [ + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "/////////...............", + "/////////////...........", + "//////////////..........", + "///////////////.........", + "///////////////.........", + "///////////////.........", + "///////////////.........", + "///////////////.........", + "......./////////........", + "......./////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road_turn1" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "field", + "rows": [ + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + ".............../////////", + ".........../////////////", + "..........//////////////", + ".........///////////////", + ".........///////////////", + ".........///////////////", + ".........///////////////", + ".........///////////////", + "........./////////......", + "......../////////.......", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road_forest" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "forest", + "rows": [ + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "......./////////........", + "......./////////........", + ".......////////.........", + ".......////////.........", + ".......////////.........", + ".......////////.........", + ".......////////.........", + ".......////////.........", + ".......////////.........", + "......./////////........", + "......./////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road_forest" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "forest", + "rows": [ + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + ".........////////.......", + ".........////////.......", + ".........////////.......", + ".........////////.......", + ".........////////.......", + ".........////////.......", + "..........////////......", + "..........////////......", + "..........////////......", + "..........////////......", + ".........////////.......", + ".........////////.......", + ".........////////.......", + ".........////////.......", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road_turn_forest" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "forest", + "rows": [ + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "/////////...............", + "/////////////...........", + "//////////////..........", + "///////////////.........", + "///////////////.........", + "///////////////.........", + "///////////////.........", + "///////////////.........", + "......./////////........", + "......./////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "dirt_road_turn1_forest" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "forest", + "rows": [ + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + ".............../////////", + ".........../////////////", + "..........//////////////", + ".........///////////////", + ".........///////////////", + ".........///////////////", + ".........///////////////", + ".........///////////////", + "........./////////......", + "......../////////.......", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........", + "........////////........" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "2silos" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "iiiiii////////////iiiiii", + "iiii////////////////iiii", + "ii////////////////////ii", + "ii////////////////////ii", + "i///222//////////222///i", + "i/222:222//////222:222/i", + "//2:::::2//////2:::::2//", + "/22:::::22////22:::::22/", + "/2:::::::2////2:::::::2/", + "/22:::::22**>22OOOOO22*", + "**2OOOOO2******2OOOOO2**", + "**222O222******222O222**", + "****222**********222****", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "2silos_2" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "************************", + "************************", + "************************", + "************************", + "****222**********222****", + "**222O222******222O222**", + "**2OOOOO2******2OOOOO2**", + "*22OOOOO22>**>22OOOOO22*", + "*2OOOOOOO2----2OOOOOOO2*", + "*22OOOOO22<**<22OOOOO22*", + "**2OOOOO2******2OOOOO2**", + "**222O222******222O222**", + "****222**********222****", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "2silos_roof" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + "************************", + "************************", + "************************", + "************************", + "****zzz**********zzz****", + "**zzzzzzz******zzzzzzz**", + "**zzzzzzz******zzzzzzz**", + "*zzzzzzzzz-**-zzzzzzzzz*", + "*zzzzzzzzz-**-zzzzzzzzz*", + "*zzzzzzzzz>**>zzzzzzzzz*", + "**zzzzzzz******zzzzzzz**", + "**zzzzzzz******zzzzzzz**", + "****zzz**********zzz****", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************" + ], + "palettes": [ "farm_lots" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "coop_chicken" ], + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "predecessor_mapgen": "field", + "rows": [ + "ccccccccccccccccccc.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "C.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "c.................c.....", + "ccccccccccccccccccc....." + ], + "palettes": [ "farm_lots" ], + "place_monster": [ { "monster": "mon_chicken", "x": [ 3, 23 ], "y": [ 3, 23 ], "repeat": [ 4, 6 ] } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "house_farm" ], + "weight": 100, + "object": { + "fill_ter": "t_floor", + "rotation": [ 3, 3 ], + "rows": [ + "..%%%%%%%%%%%%%%........", + "..%.............b.......", + "..%.....................", + "..%..|---|vvv|---+-v-|..", + "..%..|uufc 8888 y|..", + "..%..|o |..", + "..%..vS c hnnh v..", + "..%..vu c hnnh v..", + "..%..|u c D v..", + "..%..|-+-|-+-|n Y|..", + "..%..|r r|t B|n Y|..", + "..%..|r r| B|n Y|,,", + "..%..|rrr|S D|n +,,", + "..%..|-----+-- a|,,", + "..%..vn y|--+-||.", + "..%..|---+------|@@ kv.", + "..%..|888 @@|dd|@@ hkv.", + "..%..vn @@| | kv.", + "..%..|1 h + + g||.", + "..%..|--kkk-------vv--..", + "..%....-vvv-............", + "..%.....................", + "..%%%%%%%%%%%%%%........", + "........................" + ], + "palettes": [ "farm_house" ], + "place_loot": [ { "item": "television", "x": 14, "y": [ 9, 12 ], "chance": 100 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "house_farm" ], + "weight": 100, + "object": { + "fill_ter": "t_floor", + "rotation": [ 3, 3 ], + "rows": [ + "%%%%%%%%%%%%%%%%%%%%%%..", + "%...............b....%..", + "%....................H..", + "%....|--------| |####|..", + "%....|rrr|fouu| #..", + "%....vr + S| #..", + "%....|rrr|cc u|+||| #..", + "%....||||||| 1n|7 #..", + "%....|k d@@|n v7 #..", + "%....|kh @@|n hnhv7 #..", + "%....vk |n hnh| #..", + "%....|y g|n hnhv |,,", + "%....|---+-|n v ,,", + "%....+ | ,,", + "%....|---+-|D y ||+||.", + "%....|@@ 8||+|| 7v.", + "%....v@@ 8|t D|8 7v.", + "%....|d 8| |8 7v.", + "%....|D 1 |BBS|8YYYa||.", + "%....|-|kkk|----------..", + "%......|vvv|.........%..", + "%....................%..", + "%%%%%%%%%%%%%%%%%%%%%%..", + "........................" + ], + "palettes": [ "farm_house" ], + "place_loot": [ { "item": "television", "x": 12, "y": [ 9, 12 ], "chance": 100 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_farm_roof", + "object": { + "fill_ter": "t_floor", + "rotation": [ 3, 3 ], + "rows": [ + " ", + " ", + " ", + " |2222222222222223 ", + " |_______________3 ", + " |_______________3 ", + " |_______________3 ", + " |_______________3 ", + " |_______________3 ", + " |_______________3 ", + " |_______________3 ", + " |_______________3 ", + " |_______________3 ", + " |_______________3 ", + " |_______________33 ", + " |________________3 ", + " |________________3 ", + " |________________3 ", + " |_______________33 ", + " |--___----------- ", + " ----- ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { "_": "t_shingle_flat_roof" } + } + } +] diff --git a/data/json/mapgen/nested/farm_nested.json b/data/json/mapgen/nested/farm_nested.json new file mode 100644 index 0000000000000..94b7d9aabd033 --- /dev/null +++ b/data/json/mapgen/nested/farm_nested.json @@ -0,0 +1,16 @@ +[ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "2x2_haybale", + "object": { + "mapgensize": [ 2, 2 ], + "rotation": [ 0, 3 ], + "rows": [ + "@@", + "@@" + ], + "palettes": [ "farm_lots" ] + } + } +] diff --git a/data/json/mapgen_palettes/farm_lots.json b/data/json/mapgen_palettes/farm_lots.json new file mode 100644 index 0000000000000..e5f302c8399b9 --- /dev/null +++ b/data/json/mapgen_palettes/farm_lots.json @@ -0,0 +1,115 @@ +[ + { + "type": "palette", + "id": "farm_lots", + "terrain": { + ",": "t_dirtfloor", + ":": "t_metal_floor", + "#": [ [ "t_dirtmound", 98 ], [ "t_dirt", 2 ] ], + "%": "t_fence_wire", + "+": "t_door_c", + "|": "t_wall_r", + " ": [ [ "t_dirt", 280 ], [ "t_grass_long", 100 ], [ "t_underbrush", 2 ], [ "t_grass", 280 ], [ "t_dirtmound", 2 ] ], + "i": [ [ "t_dirt", 5 ], [ "t_grass_long", 5 ], [ "t_grass", 16 ] ], + ".": "t_null", + "/": [ [ "t_dirt", 200 ], [ "t_railroad_rubble", 25 ], [ "t_grass_long", 30 ], [ "t_underbrush", 3 ], [ "t_grass", 15 ] ], + "5": "t_barndoor", + "6": "t_palisade_pulley", + "T": [ + [ "t_dirt", 20 ], + [ "t_tree", 20 ], + [ "t_tree_willow", 2 ], + [ "t_tree_pine", 2 ], + [ "t_tree_maple", 2 ], + [ "t_tree_birch", 2 ], + [ "t_tree_elm", 2 ] + ], + "V": "t_splitrail_fence", + "c": "t_chickenwire_fence", + "C": "t_chickenwire_gate_c", + "W": "t_wall_log", + "=": "t_door_metal_locked", + "A": "t_door_bar_locked", + "G": "t_palisade_gate", + "v": "t_window", + "w": "t_window_boarded", + "y": "t_palisade", + "3": "t_splitrail_fencegate_c", + "2": "t_wall_metal", + "<": "t_ladder_up", + ">": "t_ladder_down", + "-": "t_grate", + "*": "t_open_air", + "O": "t_open_air_rooved", + "z": "t_metal_flat_roof", + "f": "t_chainfence", + "g": "t_chaingate_l" + }, + "furniture": { + "r": "f_rack", + "B": "f_bench", + "x": "f_crate_c", + "@": "f_hay", + " ": [ [ "f_null", 198 ], [ "f_hay", 2 ] ], + "/": "f_null" + }, + "item": { "#": { "item": "wheat", "chance": 5, "repeat": [ 1, 2 ] }, ":": { "item": "wheat", "repeat": [ 1, 20 ] } } + }, + { + "type": "palette", + "id": "farm_house", + "terrain": { + " ": "t_floor", + "#": "t_railing", + "%": "t_splitrail_fence", + "H": "t_splitrail_fencegate_c", + "+": "t_door_c", + ",": [ [ "t_railroad_rubble", 20 ], [ "t_grass", 2 ], [ "t_dirt", 5 ] ], + "-": "t_wall_log", + ".": [ [ "t_grass", 16 ], [ "t_grass_long", 5 ], [ "t_dirt", 5 ] ], + "/": "t_dirt", + "W": "t_wall_wood", + "b": "t_dirt", + "v": [ "t_window_domestic", "t_curtains" ], + "|": "t_wall_log", + "4": "t_gutter_downspout", + "<": "t_stairs_up", + ">": "t_stairs_down" + }, + "furniture": { + "@": "f_bed", + "B": "f_bathtub", + "D": "f_trashcan", + "L": "f_locker", + "o": "f_oven", + "S": "f_sink", + "Y": "f_sofa", + "c": "f_counter", + "u": "f_cupboard", + "d": "f_dresser", + "f": "f_fridge", + "h": "f_chair", + "k": "f_desk", + "n": "f_table", + "r": "f_rack", + "t": "f_toilet", + "1": "f_armchair", + "8": "f_bookcase", + "7": "f_bench", + "a": "f_rack_coat", + "g": "f_floor_lamp", + "y": [ "f_indoor_plant_y", "f_indoor_plant" ], + "b": "f_rotary_clothesline" + }, + "items": { + "k": { "item": "office", "chance": 25 }, + "f": { "item": "fridge", "chance": 45, "repeat": [ 1, 4 ] }, + "o": { "item": "oven", "chance": 40 }, + "8": { "item": "homebooks", "chance": 35, "repeat": [ 1, 3 ] }, + "r": { "item": "restaur_kitchen", "chance": 45, "repeat": [ 1, 3 ] }, + "c": { "item": "kitchen_counters", "chance": 30 }, + "u": [ { "item": "kitchen_counters", "chance": 30 }, { "item": "restaur_kitchen", "chance": 50, "repeat": [ 2, 4 ] } ], + "D": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] } + } + } +] diff --git a/data/json/overmap/specials.json b/data/json/overmap/specials.json index f50b95acc7426..345356fcba1de 100644 --- a/data/json/overmap/specials.json +++ b/data/json/overmap/specials.json @@ -336,6 +336,108 @@ "city_sizes": [ 1, 20 ], "occurrences": [ 0, 5 ] }, + { + "type": "overmap_special", + "id": "farm_lot_wired_2x3", + "overmaps": [ + { "point": [ -3, -2, 0 ], "overmap": "farm_lot_wire_turn_v_east" }, + { "point": [ -2, -2, 0 ], "overmap": "farm_lot_wire_straight_h_north" }, + { "point": [ -1, -2, 0 ], "overmap": "farm_lot_wire_turn_h_south" }, + { "point": [ 0, -2, 0 ], "overmap": "2silos_north" }, + { "point": [ 0, -2, 1 ], "overmap": "2silos_1_north" }, + { "point": [ 0, -2, 2 ], "overmap": "2silos_2_north" }, + { "point": [ 0, -2, 3 ], "overmap": "2silos_roof_north" }, + { "point": [ -3, -1, 0 ], "overmap": "farm_lot_wire_turn_h_north" }, + { "point": [ -2, -1, 0 ], "overmap": "farm_lot_wire_straight_h_south" }, + { "point": [ -1, -1, 0 ], "overmap": "farm_lot_wire_turn_v_open_west" }, + { "point": [ 0, -1, 0 ], "overmap": "dirt_road_3way_east" } + ], + "connections": [ { "point": [ 0, 0, 0 ], "terrain": "road", "existing": true } ], + "locations": [ "wilderness" ], + "city_distance": [ 5, -1 ], + "city_sizes": [ 1, 20 ], + "occurrences": [ 0, 15 ] + }, + { + "type": "overmap_special", + "id": "farm_lot_empty_3x2", + "overmaps": [ + { "point": [ -2, -3, 0 ], "overmap": "farm_lot_M1_east" }, + { "point": [ -1, -3, 0 ], "overmap": "farm_lot_M1_east" }, + { "point": [ -2, -2, 0 ], "overmap": "farm_lot_M1_east" }, + { "point": [ -1, -2, 0 ], "overmap": "farm_lot_M1_east" }, + { "point": [ 0, -2, 0 ], "overmap": "2silos_north" }, + { "point": [ 0, -2, 1 ], "overmap": "2silos_1_north" }, + { "point": [ 0, -2, 2 ], "overmap": "2silos_2_north" }, + { "point": [ 0, -2, 3 ], "overmap": "2silos_roof_north" }, + { "point": [ -2, -1, 0 ], "overmap": "farm_lot_M1_east" }, + { "point": [ -1, -1, 0 ], "overmap": "farm_lot_M1_east" }, + { "point": [ 0, -1, 0 ], "overmap": "dirt_road_3way_east" } + ], + "connections": [ { "point": [ 0, 0, 0 ], "terrain": "road", "existing": true } ], + "locations": [ "wilderness" ], + "city_distance": [ 5, -1 ], + "city_sizes": [ 1, 20 ], + "occurrences": [ 0, 15 ] + }, + { + "type": "overmap_special", + "id": "farm_lot_forest", + "overmaps": [ + { "point": [ 0, -5, 0 ], "overmap": "2silos_east" }, + { "point": [ 0, -5, 1 ], "overmap": "2silos_1_east" }, + { "point": [ 0, -5, 2 ], "overmap": "2silos_2_east" }, + { "point": [ 0, -5, 3 ], "overmap": "2silos_roof_east" }, + { "point": [ -1, -5, 0 ], "overmap": "dirt_road_3way_west" }, + { "point": [ -2, -5, 0 ], "overmap": "farm_lot_wire_turn_h_south" }, + { "point": [ -3, -5, 0 ], "overmap": "farm_lot_wire_turn_v_east" }, + { "point": [ -1, -4, 0 ], "overmap": "dirt_road_3way_east" }, + { "point": [ -2, -4, 0 ], "overmap": "farm_lot_wire_straight_v_open_west" }, + { "point": [ -3, -4, 0 ], "overmap": "farm_lot_wire_straight_v_east" }, + { "point": [ 0, -3, 0 ], "overmap": "house_farm_west" }, + { "point": [ 0, -3, 1 ], "overmap": "house_farm_roof_west" }, + { "point": [ -1, -3, 0 ], "overmap": "dirt_road_3way_west" }, + { "point": [ -2, -3, 0 ], "overmap": "farm_lot_wire_straight_v_west" }, + { "point": [ -3, -3, 0 ], "overmap": "farm_lot_wire_straight_v_east" }, + { "point": [ -1, -2, 0 ], "overmap": "dirt_road_turn1_forest_west" }, + { "point": [ -2, -2, 0 ], "overmap": "farm_lot_wire_turn_v_west" }, + { "point": [ -3, -2, 0 ], "overmap": "farm_lot_wire_turn_h_north" }, + { "point": [ 0, -2, 0 ], "overmap": "dirt_road_turn_forest_north" }, + { "point": [ 0, -1, 0 ], "overmap": "dirt_road_forest_north" } + ], + "connections": [ { "point": [ 0, 0, 0 ], "terrain": "road", "existing": true } ], + "locations": [ "wilderness" ], + "city_distance": [ 5, -1 ], + "city_sizes": [ 1, 20 ], + "occurrences": [ 0, 15 ] + }, + { + "type": "overmap_special", + "id": "farm_lot_2x4", + "overmaps": [ + { "point": [ 0, 1, 0 ], "overmap": "dirt_road_north" }, + { "point": [ 2, 1, 0 ], "overmap": "farm_lot_wire_turn_h_south" }, + { "point": [ 1, 1, 0 ], "overmap": "farm_lot_wire_turn_v_east" }, + { "point": [ 0, 2, 0 ], "overmap": "dirt_road_3way_west" }, + { "point": [ 2, 2, 0 ], "overmap": "farm_lot_wire_straight_v_west" }, + { "point": [ 1, 2, 0 ], "overmap": "farm_lot_wire_straight_v_open_east" }, + { "point": [ 0, 3, 0 ], "overmap": "dirt_road_3way_east" }, + { "point": [ -1, 3, 0 ], "overmap": "2silos_west" }, + { "point": [ -1, 3, 1 ], "overmap": "2silos_1_west" }, + { "point": [ -1, 3, 2 ], "overmap": "2silos_2_west" }, + { "point": [ -1, 3, 3 ], "overmap": "2silos_roof_west" }, + { "point": [ 2, 3, 0 ], "overmap": "farm_lot_wire_straight_v_west" }, + { "point": [ 1, 3, 0 ], "overmap": "farm_lot_wire_straight_v_east" }, + { "point": [ 0, 4, 0 ], "overmap": "dirt_road_north" }, + { "point": [ 2, 4, 0 ], "overmap": "farm_lot_wire_turn_v_west" }, + { "point": [ 1, 4, 0 ], "overmap": "farm_lot_wire_turn_h_north" } + ], + "connections": [ { "point": [ 0, 0, 0 ], "terrain": "road", "existing": true } ], + "locations": [ "wilderness" ], + "city_distance": [ 5, -1 ], + "city_sizes": [ 1, 20 ], + "occurrences": [ 0, 15 ] + }, { "type": "overmap_special", "id": "Strangle Temple", diff --git a/data/json/overmap_terrain_agricultural.json b/data/json/overmap_terrain_agricultural.json index 428ba6bd97bfb..a703a1626604b 100644 --- a/data/json/overmap_terrain_agricultural.json +++ b/data/json/overmap_terrain_agricultural.json @@ -709,5 +709,255 @@ "see_cost": 5, "extras": "field", "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "farm_lot_wire_straight_h", + "name": "farm field", + "sym": "#", + "color": "i_brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "farm_lot_wire_turn_h", + "name": "farm field", + "sym": "#", + "color": "i_brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "farm_lot_wire_straight_v", + "name": "farm field", + "sym": "#", + "color": "i_brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "farm_lot_wire_turn_v", + "name": "farm field", + "sym": "#", + "color": "i_brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "farm_lot_wire_turn_uni", + "name": "farm field", + "sym": "#", + "color": "i_brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "farm_lot_wire_straight_v_open", + "name": "farm field", + "sym": "#", + "color": "i_brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "farm_lot_wire_straight_h_open", + "name": "farm field", + "sym": "#", + "color": "i_brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "farm_lot_wire_turn_v_open", + "name": "farm field", + "sym": "#", + "color": "i_brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "farm_lot_wire_turn_h_open", + "name": "farm field", + "sym": "#", + "color": "i_brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "farm_lot_M", + "name": "farm field", + "sym": "#", + "color": "i_brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "farm_lot_M1", + "name": "farm field", + "sym": "#", + "color": "i_brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "dirt_road", + "name": "dirt road", + "sym": "│", + "color": "brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "dirt_road_3way", + "name": "dirt road", + "sym": "┬", + "color": "brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "dirt_road_turn", + "name": "dirt road", + "sym": "┐", + "color": "brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "dirt_road_turn1", + "name": "dirt road", + "sym": "┌", + "color": "brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "dirt_road_forest", + "name": "dirt road", + "sym": "│", + "color": "brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "dirt_road_turn_forest", + "name": "dirt road", + "sym": "┐", + "color": "brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "dirt_road_turn1_forest", + "name": "dirt road", + "sym": "┌", + "color": "brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "2silos", + "name": "silos", + "sym": "O", + "color": "brown", + "see_cost": 5, + "extras": "build", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "2silos_1", + "name": "silos", + "sym": "O", + "color": "brown", + "see_cost": 5, + "extras": "build", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "2silos_2", + "name": "silos", + "sym": "O", + "color": "brown", + "see_cost": 5, + "extras": "build", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "2silos_roof", + "name": "silos", + "sym": "O", + "color": "brown", + "see_cost": 5, + "extras": "build", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "coop_chicken", + "name": "chicken coop", + "sym": "#", + "color": "brown", + "see_cost": 5, + "extras": "field", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "house_farm", + "name": "farm house", + "sym": "^", + "color": "i_brown", + "see_cost": 5, + "extras": "build", + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "house_farm_roof", + "name": "farm house roof", + "sym": "^", + "color": "i_brown", + "see_cost": 5, + "extras": "build", + "mondensity": 2 } ]