From b896b696caf1e0b65af2ffec2bb8ba89e991aa57 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 30 Dec 2019 15:53:01 -0800 Subject: [PATCH 1/3] initial layout --- .../lab/lab_surface/lab_surface_tiny_z1.json | 124 ++++++++++++++++++ .../mapgen_palettes/lab_surface_palette.json | 26 ++-- 2 files changed, 132 insertions(+), 18 deletions(-) create mode 100644 data/json/mapgen/lab/lab_surface/lab_surface_tiny_z1.json diff --git a/data/json/mapgen/lab/lab_surface/lab_surface_tiny_z1.json b/data/json/mapgen/lab/lab_surface/lab_surface_tiny_z1.json new file mode 100644 index 0000000000000..b64b071228ed7 --- /dev/null +++ b/data/json/mapgen/lab/lab_surface/lab_surface_tiny_z1.json @@ -0,0 +1,124 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "lab_surface_CDC_blockA0", "lab_surface_CDC_blockB0", "lab_surface_CDC_blockC0" ], [ "lab_surface_CDC_blockA1", "lab_surface_CDC_blockB1", "lab_surface_CDC_blockC1" ] ], + "object": { + "fill_ter": "t_strconc_floor", + "rows": [ + "012345678901234567890123012345678901234567890123012345678901234567890123", + "1%%|,_____,_____,_____,_____,_____,_____]]]|%%%|....________,,_______...", + "2%%|,_____,_____,_____,_____,_____,_____]]]|%%%|....________,,_______...", + "3|||,_____,_____,_____,_____,_____,_____]|M|%%%|....________,,_______...", + "4]]],_____,_____,_____,_____,_____,_____]|%%%%%:..._________,,_______...", + "5]?],_____,_____,_____,_____,_____,_____]|%%%%%:..__________,,_______...", + "6]]],_____,_____,_____,_____,_____,_____!|}}||||____________,,_______...", + "7,,____________________________________________!____________,,_______...", + "8_,____________________________________________!___________,,________...", + "9,,____________________________________________!__________,,_________...", + "0_,____________________________________________!_________,,-_________...", + "1,,____________________________________________!________,,__________....", + "2_,____________________________________|///|///|,,,,,,,,,__________.....", + "3,,____________________________________________!__________________......", + "4_,,,,,,,,_____________________________________!_________________.......", + "5,,__,__,,_____________________________________!________________........", + "6_,_,__,_,|____________________________________!_______________.........", + "7,,,__,__,|____________________________________!______________..........", + "8_,__,__,,|],_____,_____,_____,_____,]]]]]]]]]]|........................", + "9,,_,__,_,|],_____,_____,_____,_____,]?]?]?]?]?||||||||||||||||||||||...", + "0_,,__,__,|],_____,_____,_____,_____,]]]]]]]]]]]]]]]]]]]]]..........|...", + "1,,__,__,,|],_____,_____,_____,_____,]|:::|||||]?]]]]]]]]]..........|...", + "2_,_,__,_,|],_____,_____,_____,_____,]- dc &|]]]|||||||||||||||||||...", + "3,,,__,__,|],_____,_____,_____,_____,]- d1 |]]]| |...", + "0||MMMMMMM|]]]]]]]]]]]]]]]]]]]]]]]]]]]:1 dc |]]]| |...", + "1 ||::||::||::||::||::||::|||||:--||m||]]]| |...", + "2 m |l x|]]]| |...", + "3 m |l c|]]]| |...", + "4 ||:|--||:|--||:|--||:|--||m@| 1 |l l|]]]| |...", + "5 | | | | |ee| % ||M||]]]| |...", + "6 | | | | |ee| 1 M]]]M |...", + "7 | | | | |||| % |||||...| |...", + "8 | | | | |< - 1 |t|t|...| |...", + "9 | | | | |> - % |+|+|...| |...", + "0 |||||||||||m||||||||||||||||| + :...| |...", + "1 m m |S&S|...| |...", + "2 m |+||||--|||--|||--|| ||||||...| |...", + "3||||||||||||MM||||| &s| | | | - |...| |...", + "4|eee@<<>>|cd |l s| | | | | | |...| |...", + "5|eeeM M |l d|+|+| | | | | |...| |...", + "6|eeeM M m s|h|t| | | | | |...|||||||||||||||||||...", + "7||||||||||||||||||||||||::|||::|||::||mm||::||.?.| |...", + "8.......................*************]]]]]]****...| |...", + "9................................?...|]]]]|....?..| |...", + "0.............................?............?......|||||||||||||||||||...", + "1...............................?..?.........?......................|...", + "2......................................?............................|...", + "3||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||..." + ], + "palettes": [ "lab_surface_palette" ], + "&": [ { "item": "tools_science", "chance": 10 }, { "item": "trash", "chance": 50, "repeat": [ 1, 2 ] } ], + "place_nested": [ + { "chunks": [ "surface_sub_f_crate" ], "x": [ 1, 3 ], "y": [ 25, 36 ], "chance": 75, "repeat": 10 }, + { "chunks": [ "surface_sub_f_crate" ], "x": [ 4, 5 ], "y": [ 34, 36 ], "chance": 75, "repeat": 5 } + ] + } + }, + { + "type": "overmap_terrain", + "id": "lab_surface_CDC_blockA0", + "name": "parking lot", + "sym": "_", + "color": "dark_gray", + "spawns": { "group": "GROUP_LAB_SURFACE", "population": [ 5, 20 ], "chance": 50 }, + "see_cost": 5, + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "lab_surface_CDC_blockB0", + "copy-from": "lab_surface_CDC_blockA0" + }, + { + "type": "overmap_terrain", + "id": "lab_surface_CDC_blockC0", + "copy-from": "lab_surface_CDC_blockA0" + }, + { + "type": "overmap_terrain", + "id": "lab_surface_CDC_blockA1", + "name": "research facility", + "sym": "l", + "color": "light_gray", + "spawns": { "group": "GROUP_LAB_SURFACE", "population": [ 10, 25 ], "chance": 60 }, + "see_cost": 5, + "mondensity": 2 + }, + { + "type": "overmap_terrain", + "id": "lab_surface_CDC_blockB1", + "copy-from": "lab_surface_CDC_blockA1" + }, + { + "type": "overmap_terrain", + "id": "lab_surface_CDC_blockC1", + "copy-from": "lab_surface_CDC_blockA1" + }, + { + "type": "overmap_special", + "id": "lab_surface_CDC", + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "lab_surface_CDC_blockA0_north" }, + { "point": [ 1, 0, 0 ], "overmap": "lab_surface_CDC_blockB0_north" }, + { "point": [ 2, 0, 0 ], "overmap": "lab_surface_CDC_blockC0_north" }, + { "point": [ 0, 1, 0 ], "overmap": "lab_surface_CDC_blockA1_north" }, + { "point": [ 1, 1, 0 ], "overmap": "lab_surface_CDC_blockB1_north" }, + { "point": [ 2, 1, 0 ], "overmap": "lab_surface_CDC_blockC1_north" } + ], + "connections": [ { "point": [ 2, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 2, 0, 0 ] } ], + "locations": [ "land" ], + "city_distance": [ 0, 120 ], + "city_sizes": [ 1, 12 ], + "occurrences": [ 1, 1 ], + "flags": [ "UNIQUE" ] + } +] diff --git a/data/json/mapgen_palettes/lab_surface_palette.json b/data/json/mapgen_palettes/lab_surface_palette.json index 6bdb70eae669b..85974f003ecbc 100644 --- a/data/json/mapgen_palettes/lab_surface_palette.json +++ b/data/json/mapgen_palettes/lab_surface_palette.json @@ -3,7 +3,7 @@ "type": "palette", "id": "lab_surface_palette", "terrain": { - ".": "t_grass", + ".": "t_region_groundcover_urban", "#": "t_brick_wall", "|": "t_strconc_wall", " ": "t_strconc_floor", @@ -27,25 +27,14 @@ "x": "t_console_broken", "]": "t_sidewalk", "*": [ - "t_shrub", - "t_shrub_rose", - "t_shrub_lilac", - "t_tree_young", - "t_tree", - "t_grass_tall", - "t_underbrush", - "t_moss", - "t_shrub_hydrangea" + [ "t_region_shrub_decorative", 4 ], + [ "t_region_tree_shade", 3 ], + [ "t_region_groundcover_forest", 3 ], ], "?": [ - "t_shrub", - "t_shrub_rose", - "t_shrub_lilac", - "t_tree_young", - "t_tree", - "t_tree_maple", - "t_tree_walnut", - "t_tree_blackjack" + [ "t_region_shrub_decorative", 3 ], + [ "t_region_tree_shade", 3 ], + "t_region_tree_nut" ], "A": "t_atm", "<": "t_stairs_up", @@ -64,6 +53,7 @@ "d": "f_desk", "f": "f_fridge", "H": "f_sofa", + "h": "f_shower", "l": "f_locker", "L": "f_locker", "o": "f_oven", From fa96df13e54d24075581d6c64981546808d9fc02 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 30 Dec 2019 16:11:09 -0800 Subject: [PATCH 2/3] Update lab_surface_tiny_z1.json --- .../lab/lab_surface/lab_surface_tiny_z1.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/data/json/mapgen/lab/lab_surface/lab_surface_tiny_z1.json b/data/json/mapgen/lab/lab_surface/lab_surface_tiny_z1.json index b64b071228ed7..c4dff95b9539e 100644 --- a/data/json/mapgen/lab/lab_surface/lab_surface_tiny_z1.json +++ b/data/json/mapgen/lab/lab_surface/lab_surface_tiny_z1.json @@ -12,18 +12,18 @@ "3|||,_____,_____,_____,_____,_____,_____]|M|%%%|....________,,_______...", "4]]],_____,_____,_____,_____,_____,_____]|%%%%%:..._________,,_______...", "5]?],_____,_____,_____,_____,_____,_____]|%%%%%:..__________,,_______...", - "6]]],_____,_____,_____,_____,_____,_____!|}}||||____________,,_______...", - "7,,____________________________________________!____________,,_______...", - "8_,____________________________________________!___________,,________...", - "9,,____________________________________________!__________,,_________...", - "0_,____________________________________________!_________,,-_________...", - "1,,____________________________________________!________,,__________....", + "6]]],_____,_____,_____,_____,_____,_____||}}||||____________,,_______...", + "7,,____________________________________,!,__________________,,_______...", + "8_,____________________________________,!,_________________,,________...", + "9,,____________________________________,!,________________,,_________...", + "0_,____________________________________,!,_______________,,-_________...", + "1,,____________________________________,!,______________,,__________....", "2_,____________________________________|///|///|,,,,,,,,,__________.....", - "3,,____________________________________________!__________________......", - "4_,,,,,,,,_____________________________________!_________________.......", - "5,,__,__,,_____________________________________!________________........", - "6_,_,__,_,|____________________________________!_______________.........", - "7,,,__,__,|____________________________________!______________..........", + "3,,___________________________________________,!,_________________......", + "4_,,,,,,,,____________________________________,!,________________.......", + "5,,__,__,,____________________________________,!,_______________........", + "6_,_,__,_,|___________________________________,!,______________.........", + "7,,,__,__,|___________________________________,!,_____________..........", "8_,__,__,,|],_____,_____,_____,_____,]]]]]]]]]]|........................", "9,,_,__,_,|],_____,_____,_____,_____,]?]?]?]?]?||||||||||||||||||||||...", "0_,,__,__,|],_____,_____,_____,_____,]]]]]]]]]]]]]]]]]]]]]..........|...", @@ -35,9 +35,9 @@ "2 m |l x|]]]| |...", "3 m |l c|]]]| |...", "4 ||:|--||:|--||:|--||:|--||m@| 1 |l l|]]]| |...", - "5 | | | | |ee| % ||M||]]]| |...", - "6 | | | | |ee| 1 M]]]M |...", - "7 | | | | |||| % |||||...| |...", + "5 | | | | |ee| % ||M||:::| |...", + "6 | | | | |ee| 1 - - |...", + "7 | | | | |||| % |||||:::| |...", "8 | | | | |< - 1 |t|t|...| |...", "9 | | | | |> - % |+|+|...| |...", "0 |||||||||||m||||||||||||||||| + :...| |...", From 436ec4ccaf655f7b009d97262e1e7cc307b554d9 Mon Sep 17 00:00:00 2001 From: i-am-erk <45136638+I-am-Erk@users.noreply.github.com> Date: Sun, 12 Jan 2020 09:51:47 -0800 Subject: [PATCH 3/3] rename map, add nests --- ...e_tiny_z1.json => lab_surface_cdc_z1.json} | 65 ++++++++++--------- 1 file changed, 34 insertions(+), 31 deletions(-) rename data/json/mapgen/lab/lab_surface/{lab_surface_tiny_z1.json => lab_surface_cdc_z1.json} (68%) diff --git a/data/json/mapgen/lab/lab_surface/lab_surface_tiny_z1.json b/data/json/mapgen/lab/lab_surface/lab_surface_cdc_z1.json similarity index 68% rename from data/json/mapgen/lab/lab_surface/lab_surface_tiny_z1.json rename to data/json/mapgen/lab/lab_surface/lab_surface_cdc_z1.json index c4dff95b9539e..b3785dd6be2da 100644 --- a/data/json/mapgen/lab/lab_surface/lab_surface_tiny_z1.json +++ b/data/json/mapgen/lab/lab_surface/lab_surface_cdc_z1.json @@ -7,11 +7,11 @@ "fill_ter": "t_strconc_floor", "rows": [ "012345678901234567890123012345678901234567890123012345678901234567890123", - "1%%|,_____,_____,_____,_____,_____,_____]]]|%%%|....________,,_______...", - "2%%|,_____,_____,_____,_____,_____,_____]]]|%%%|....________,,_______...", - "3|||,_____,_____,_____,_____,_____,_____]|M|%%%|....________,,_______...", - "4]]],_____,_____,_____,_____,_____,_____]|%%%%%:..._________,,_______...", - "5]?],_____,_____,_____,_____,_____,_____]|%%%%%:..__________,,_______...", + "1..],_____,_____,_____,_____,_____,_____]]]|%%%|....________,,_______...", + "2..],_____,_____,_____,_____,_____,_____]]]|%%%|....________,,_______...", + "3..],_____,_____,_____,_____,_____,_____]|M|%%%|....________,,_______...", + "4..],_____,_____,_____,_____,_____,_____]|%%%%%:..._________,,_______...", + "5..],_____,_____,_____,_____,_____,_____]|%%%%%:..__________,,_______...", "6]]],_____,_____,_____,_____,_____,_____||}}||||____________,,_______...", "7,,____________________________________,!,__________________,,_______...", "8_,____________________________________,!,_________________,,________...", @@ -26,37 +26,40 @@ "7,,,__,__,|___________________________________,!,_____________..........", "8_,__,__,,|],_____,_____,_____,_____,]]]]]]]]]]|........................", "9,,_,__,_,|],_____,_____,_____,_____,]?]?]?]?]?||||||||||||||||||||||...", - "0_,,__,__,|],_____,_____,_____,_____,]]]]]]]]]]]]]]]]]]]]]..........|...", - "1,,__,__,,|],_____,_____,_____,_____,]|:::|||||]?]]]]]]]]]..........|...", - "2_,_,__,_,|],_____,_____,_____,_____,]- dc &|]]]|||||||||||||||||||...", - "3,,,__,__,|],_____,_____,_____,_____,]- d1 |]]]| |...", - "0||MMMMMMM|]]]]]]]]]]]]]]]]]]]]]]]]]]]:1 dc |]]]| |...", - "1 ||::||::||::||::||::||::|||||:--||m||]]]| |...", - "2 m |l x|]]]| |...", - "3 m |l c|]]]| |...", - "4 ||:|--||:|--||:|--||:|--||m@| 1 |l l|]]]| |...", - "5 | | | | |ee| % ||M||:::| |...", - "6 | | | | |ee| 1 - - |...", - "7 | | | | |||| % |||||:::| |...", - "8 | | | | |< - 1 |t|t|...| |...", - "9 | | | | |> - % |+|+|...| |...", - "0 |||||||||||m||||||||||||||||| + :...| |...", - "1 m m |S&S|...| |...", - "2 m |+||||--|||--|||--|| ||||||...| |...", - "3||||||||||||MM||||| &s| | | | - |...| |...", - "4|eee@<<>>|cd |l s| | | | | | |...| |...", - "5|eeeM M |l d|+|+| | | | | |...| |...", - "6|eeeM M m s|h|t| | | | | |...|||||||||||||||||||...", - "7||||||||||||||||||||||||::|||::|||::||mm||::||.?.| |...", - "8.......................*************]]]]]]****...| |...", - "9................................?...|]]]]|....?..| |...", - "0.............................?............?......|||||||||||||||||||...", - "1...............................?..?.........?......................|...", + "0_,,__,__,|],_____,_____,_____,_____,]]]]]]]]]]]]]..................|...", + "1,,__,__,,|],_____,_____,_____,_____,]|:::|||||]?]..................|...", + "2_,_,__,_,|],_____,_____,_____,_____,]- dc &|]]]||:::::::::||||||||...", + "3,,,__,__,|],_____,_____,_____,_____,]- d1 |]]]|f S|t|t|t|...", + "0||MMMMMMM|]]]]]]]]]]]]]]]]]]]]]]]]]]]:1 dc |]]]|C bbb bbb C|+ +|+|...", + "1 ||::||::||::||::||::||::|||||:--||m||]]]|C ttt ttt C| |...", + "2 m |l x|]]]|C ttt ttt C| |S&S|...", + "3 m |l c|]]]|o bbb bbb &|+|||||...", + "4 ||:|-|:|:|-|:|:|-|:|:|-|:|m@| % |l l|]]]|& | mee|...", + "5 |2 |2 |2 |2 |ee| % ||M||:::|::--:::--::| @ee|...", + "6 | | | | |ee| % - - ||||...", + "7 | | | | |||| % |||||:::| +>|...", + "8 | | | | |< - % |t|t|...| +<|...", + "9 | | | | |> - % |+|+|...|:|-|:|:|-|:|:|-|||...", + "0 ||||||||||||||||||||||||||||| + :...|2 |2 |2 |...", + "1 m m |S&S|...| | | |...", + "2 m |+||||--|||--|||--|| ||||||...| | | |...", + "3||||||||||||MM||||| &S| | | | - |...| | | |...", + "4|eee@<<>>|cd |l s| | | | | | |...| | | |...", + "5|eeeM M |l d|+|+| | | | | |...|||||||||||||||||||...", + "6|eeeM M m s|h|t| | | | | |...| | | |...", + "7||||||||||||||||||||||||::|||::|||::||mm||::||.?.| | | |...", + "8.......................*************]]]]]]****...| | | |...", + "9................................?...|]]]]|....?..| | | |...", + "0.............................?............?......| | | |...", + "1...............................?..?.........?....|||||||||||||||||||...", "2......................................?............................|...", "3||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||..." ], "palettes": [ "lab_surface_palette" ], "&": [ { "item": "tools_science", "chance": 10 }, { "item": "trash", "chance": 50, "repeat": [ 1, 2 ] } ], + "nested": [ + "2": { "chunks": [ "lab_surface_2partworkspace_front_5x5" ] } + ], "place_nested": [ { "chunks": [ "surface_sub_f_crate" ], "x": [ 1, 3 ], "y": [ 25, 36 ], "chance": 75, "repeat": 10 }, { "chunks": [ "surface_sub_f_crate" ], "x": [ 4, 5 ], "y": [ 34, 36 ], "chance": 75, "repeat": 5 }