From b73403fb18e0617b013f651f05c045cabe9dc63d Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 24 Jul 2021 08:52:10 -0400 Subject: [PATCH 1/4] lab modular residential areas --- .../lab/lab_modular/lab_1x1x2_RES_8.json | 207 +++++++++++ .../lab_1x1x2_RES_8_apartments.json | 76 ++++ .../lab_modular/lab_2x2x2_RES_8_bedrooms.json | 201 ++++++++++ .../lab_modular/lab_2x2x2_RES_8_commons.json | 349 ++++++++++++++++++ .../lab_nested_residential.json | 153 ++++++++ .../lab_nests_modular/lab_shared_traps.json | 100 +++++ .../lab/lab_modular_palette.json | 17 +- .../lab_modular/lab_mini_specials.json | 58 +++ .../overmap_terrain/overmap_terrain_lab.json | 23 ++ 9 files changed, 1177 insertions(+), 7 deletions(-) create mode 100644 data/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8.json create mode 100644 data/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8_apartments.json create mode 100644 data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_bedrooms.json create mode 100644 data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_commons.json diff --git a/data/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8.json b/data/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8.json new file mode 100644 index 0000000000000..1f494c7ac1058 --- /dev/null +++ b/data/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8.json @@ -0,0 +1,207 @@ +[ + { + "method": "json", + "om_terrain": "lab_1x1_RES_8_bedrooms_maintenance", + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + "||||||||||||||||||||||||", + "|@@___D|________|D___@@|", + "|s__h__+___jj___+_h___s|", + "|T__IIy|__%%%%__|YII__T|", + "||||||||__%!!%__||||||||", + "|@@___D|_h%!!%h_|D___@@|", + "|s__h__+_f%!!%f_+_h___s|", + "|T__IIy|_h%!!%h_|YII__T|", + "||||||||__%!!%__||||||||", + "|@@___D|_h%!!%h_|D___@@|", + "|s__h__+_f%!!%f_+_h___s|", + "|T__IIy|_h%!!%h_|YII__T|", + "||||||||__%!!%__||||||||", + "|@@___D|__%!!%__|D___@@|", + "|s__h__+__%!!%__+_h___s|", + "|T__IIy|__%!!%__|YII__T|", + "||||||||__%%%%__||||||||", + "|t|t|8S|________|@@I__D|", + "|+|+|,,|__|>>|__|@@___d|", + "|,,,,,,|__||||__|___||||", + "|,,,,,,+__|UU|__+___|8t|", + "|+|+|,,|__+,,+__|_h_+,,|", + "|9|9|8S|__|UU|__|IIy|S9|", + "|||||||||||±||||||||||||" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "terrain": { "!": "t_open_air_rooved", "U": "t_linoleum_gray" } + } + }, + { + "method": "json", + "om_terrain": "lab_1x1_RES_8_bedrooms_security", + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + "||||||||||||||||||||||||", + "|@@;;;L|;;;;;;;;|L;;;@@|", + "|≠;;h;;+;;;jj;;;+;h;;;≠|", + "|T;;IIy|;;%%%%;;|YII;;T|", + "||||||||;;%!!%;;||||||||", + "|@@;;;L|;h%!!%h;|L;;;@@|", + "|≠;;h;;+;f%!!%f;+;h;;;≠|", + "|T;;IIy|;h%!!%h;|YII;;T|", + "||||||||;;%!!%;;||||||||", + "|@@;;;L|;h%!!%h;|L;;;@@|", + "|≠;;h;;+;f%!!%f;+;h;;;≠|", + "|T;;IIy|;h%!!%h;|YII;;T|", + "||||||||;;%!!%;;||||||||", + "|@@;;;L|;;%!!%;;|L;;;@@|", + "|≠;;h;;+;;%!!%;;+;h;;;≠|", + "|T;;IIy|;;%!!%;;|YII;;T|", + "||||||||;;%%%%;;||||||||", + "|t|t|8S|;;;;;;;;|@@I;;L|", + "|+|+|,,|;;|>>|;;|@@;;;≠|", + "|,,,,,,|;;||||;;|;;;||||", + "|,,,,,,+;;|UU|;;+;;;|8t|", + "|+|+|,,|;;+,,+;;|;h;+,,|", + "|9|9|8S|;;|UU|;;|IIy|S9|", + "|||||||||||±||||||||||||" + ], + "palettes": [ "lab_common_palette", "lab_security_palette", "standard_domestic_lino_bathroom" ], + "terrain": { "!": "t_open_air_rooved", "U": "t_linoleum_gray" }, + "items": { + "f": { "item": "snacks", "chance": 5 }, + "I": [ { "item": "SUS_desks_bedroom_unisex", "chance": 5 }, { "item": "office", "chance": 25 } ], + "U": { "item": "cleaning", "chance": 30 }, + "≠": [ + { "item": "prison_weapons", "chance": 30 }, + { "item": "swat_gear", "chance": 5 }, + { "item": "prison_armor", "chance": 20 } + ], + "L": [ { "item": "SUS_dresser_mens", "chance": 50 }, { "item": "SUS_dresser_womens", "chance": 50 } ] + } + } + }, + { + "method": "json", + "om_terrain": "lab_1x1_RES_8_commons", + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + "|||||||||||++|||||||||||", + "|_ÿÿÿÿÿÿ___!!____!!!!!!|", + "|_ÿÿÿÿÿÿ___!!____!!!!!!|", + "|_ÿÿÿÿÿÿ___!!____!!!!!!|", + "|_ÿÿÿÿÿÿ___!!____!!!!!!|", + "|_ÿÿÿÿÿÿ___!!____!!!!!!|", + "|_ÿÿÿÿÿÿ___!!____!!!!!!|", + "||||JJJ____!!____!!!!!!|", + "|y____JA___!!____!!!!!!|", + "|3____J_A__!!____!!!!!!|", + "|4____JA___!!____!!!!!!|", + "|O____J_A__!!____!!!!!!|", + "|2_________!!___||||||||", + "|157F3____!!!!__|ÿÿÿÿÿÿ|", + "||||||_||_!!!!__|ÿÿÿÿÿÿ|", + "|6______+_!!!!__|ÿÿÿÿÿÿ|", + "|66JJJ66|_!!!!__+ÿÿÿÿÿÿ|", + "|||||||||__!!___|ÿÿÿÿÿÿ|", + "|_________|<<|__|ÿÿÿÿÿÿ|", + "|_____||+|||||__||||||||", + "|_____|___|UU|__|YS,,+t|", + "|_____|___|,,+__+,,,,|||", + "|_____|___|UU|__|YS,,+t|", + "|||||||||||±||||||||||||" + ], + "parameters": { + "carpet_type": { + "type": "ter_str_id", + "default": { + "distribution": [ + [ "t_carpet_concrete_yellow", 2 ], + [ "t_carpet_concrete_green", 2 ], + [ "t_carpet_concrete_purple", 1 ], + [ "t_carpet_concrete_red", 1 ], + [ "t_thconc_floor", 2 ] + ] + } + }, + "floor_type": { + "type": "ter_str_id", + "default": { + "distribution": [ + [ "t_carpet_concrete_yellow", 2 ], + [ "t_carpet_concrete_green", 2 ], + [ "t_carpet_concrete_purple", 1 ], + [ "t_carpet_concrete_red", 1 ], + [ "t_floor", 1 ], + [ "t_thconc_floor", 2 ] + ] + } + } + }, + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "terrain": { "U": "t_linoleum_gray", "Y": "t_linoleum_gray", "!": { "param": "carpet_type" }, "ÿ": { "param": "floor_type" } }, + "place_nested": [ + { + "chunks": [ + [ "diningroom_6x6_E_W_1", 20 ], + [ "diningroom_6x6_E_W_2", 20 ], + [ "diningroom_6x6_N_S_2", 20 ], + [ "diningroom_6x6_N_S_1B", 20 ], + [ "diningroom_6x6_N_S_1A", 20 ] + ], + "x": 2, + "y": 1 + }, + { + "chunks": [ + [ "bonus_room_3x3_1", 20 ], + [ "bonus_room_3x3_3", 20 ], + [ "bonus_room_3x3_E_5", 20 ], + [ "bonus_room_3x3_E_6", 20 ], + [ "bonus_room_3x3_W_6", 20 ], + [ "bonus_room_3x3_E_8", 20 ], + [ "bonus_room_3x3_S_8", 20 ], + [ "bonus_room_3x3_W_8", 20 ], + [ "bonus_room_3x3_S_6", 20 ] + ], + "x": 7, + "y": 20 + }, + { "chunks": [ [ "lab_residential_6x6_W", 100 ] ], "x": 17, "y": 6 }, + { "chunks": [ [ "lab_residential_6x6_W", 100 ] ], "x": 17, "y": 13 }, + { + "chunks": [ + [ "livingroom_5x5_N_2", 30 ], + [ "livingroom_5x5_S_2", 20 ], + [ "livingroom_5x5_W_2", 30 ], + [ "5x5_pool", 10 ], + [ "5x5_gym_S", 20 ], + [ "5x5_dojo", 20 ], + [ "5x5_gym_W", 20 ] + ], + "x": 1, + "y": 18 + }, + { + "chunks": [ + [ "livingroom_5x5_N_1", 10 ], + [ "livingroom_5x5_S_1", 10 ], + [ "livingroom_5x5_W_1", 10 ], + [ "livingroom_5x5_N_2", 10 ], + [ "livingroom_5x5_S_2", 10 ], + [ "livingroom_5x5_E_2", 10 ], + [ "livingroom_5x5_W_2", 10 ] + ], + "x": 18, + "y": 1 + } + ] + } + } +] diff --git a/data/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8_apartments.json b/data/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8_apartments.json new file mode 100644 index 0000000000000..af87a6c5339d1 --- /dev/null +++ b/data/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8_apartments.json @@ -0,0 +1,76 @@ +[ + { + "method": "json", + "om_terrain": "lab_1x1x2_RES_8_apartments_upper", + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + "||||||||||||||||||||||||", + "|9Yt|d.T@@|__|@@T.d|tY9|", + "|8,S|D..@@|__|@@..D|S,8|", + "||+||||..R|__|R..||||+||", + "|H..xx||+||__||+||xx..H|", + "|H.......h|__|h.......H|", + "|sHHH....f|__|f....HHHs|", + "|........h|__|h........|", + "|:+||3....+__+....3|:+:|", + "|...:5...7|__|7...5:...|", + "|..h|42OF1|__|1FO24|h..|", + "|..f|||||||__|||||||f..|", + "|..h|42OF1|__|1FO24|h..|", + "|...:5...7|__|7...5:...|", + "|:+:|3....+__+....3|:+:|", + "|.........|__|.........|", + "|........h|__|h........|", + "|sHHH....f|__|f....HHHs|", + "|H.......h|##|h.......H|", + "|H..xx||+||>>||+|||xx.H|", + "||+||||..R||+|R...|||+||", + "|8,S|D..@@|__|@@..D|S,8|", + "|9Yt|d.T@@|UU|@@T.d|tY9|", + "|||||||||||±||||||||||||" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "terrain": { ":": "t_window_domestic", "Y": "t_linoleum_gray" } + } + }, + { + "method": "json", + "om_terrain": "lab_1x1x2_RES_8_apartments_lower", + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + "|||||||||||__|||||||||||", + "|9Yt|d.T@@|__|@@T.d|tY9|", + "|8,S|D..@@|__|@@..D|S,8|", + "||+||||..R|__|R..||||+||", + "|H..xx||+||__||+||xx..H|", + "|H.......h|__|h.......H|", + "|sHHH....f|__|f....HHHs|", + "|........h|__|h........|", + "|:+:|3....+__+....3|:+:|", + "|...:5...7|__|7...5:...|", + "|..h|42OF1|__|1FO24|h..|", + "|..f|||||||__|||||||f..|", + "|..h|42OF1|__|1FO24|h..|", + "|...:5...7|__|7...5:...|", + "|:+:|3....+__+....3|:+:|", + "|.........|__|.........|", + "|........h|__|h........|", + "|sHHH....f|__|f....HHHs|", + "|H.......h|##|h.......H|", + "|H..xx||+||<<||+|||xx.H|", + "||+||||..R||+|R...|||+||", + "|8,S|D..@@|__|@@..D|S,8|", + "|9Yt|d.T@@|UU|@@T.d|tY9|", + "|||||||||||±||||||||||||" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "terrain": { ":": "t_window_domestic", "Y": "t_linoleum_gray" } + } + } +] diff --git a/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_bedrooms.json b/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_bedrooms.json new file mode 100644 index 0000000000000..5e83e33b2f2dd --- /dev/null +++ b/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_bedrooms.json @@ -0,0 +1,201 @@ +[ + { + "method": "json", + "om_terrain": [ "lab_res_8_NW" ], + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + "||||||||¥==||||||||||||-", + "|.....|;;;;;;;;;;;;;||..", + "|.....|;;;;;;;;;;;;;$...", + "|.....|;;;;;;;;;;;;;$...", + "|.....|;;;;;;;;;;;;||...", + "|..ë..|;;;;;;|||||||....", + "|.....|;;;;;||Trr|||....", + "|.....|;;;;||R.h..|.....", + "|.....|;;;;|s.....+..%%%", + "|.....|;;;;|@@∞..D|.h%~~", + "|||+||||;;;||||||||.f%~~", + "|......|;;;|@@∞..D|.h%~~", + "|......|;;;|s.....+..%~~", + "|......|;;;|RY.h..|..%~~", + "|......|;;;|||Trr|||.%~~", + "|......|;;;$;|||||^$.%~~", + "|......|;;;$;|||||^$.%~~", + "||||||||;;;|||Trr|||.%~~", + "|;;;;;;|;;;|RY.h..|..%~~", + "|;;;;;;|;;;|s.....+.h%~~", + "|;;^;;;|&;;|@@∞..D|.f%~~", + "|;;;;;;=;;;||||||||.h%%%", + "|;;;;;;|;;;|@@∞..D|.....", + "|;;;;;;|;;;|s.....+....." + ], + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "terrain": { "¥": "t_card_science_security_magenta" }, + "place_traps": [ + { "trap": "tr_light_on_res_8_NW", "x": [ 8, 10 ], "y": [ 1, 23 ], "repeat": [ 1, 2 ] }, + { "trap": "tr_concrete_wall_door_lab_res_8_NW", "x": [ 8, 10 ], "y": [ 1, 23 ], "repeat": [ 2, 3 ] } + ], + "place_nested": [ + { "chunks": [ [ "lab_cargo_5x5", 100 ] ], "x": 1, "y": 18 }, + { "chunks": [ [ "lab_6x6_shop_backroom", 100 ] ], "x": 1, "y": 11 }, + { "chunks": [ [ "lab_maintenance_9x9_E", 100 ] ], "x": 1, "y": 1 } + ], + "place_monster": [ + { "monster": "mon_skitterbot", "x": 12, "y": 15, "chance": 100 }, + { "monster": "mon_skitterbot", "x": 12, "y": 16, "chance": 100 } + ] + } + }, + { + "method": "json", + "om_terrain": [ "lab_res_8_NE" ], + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + "-||||||||||||==¥||||||||", + "..||;;;;;;;;;;;;;|.....|", + "...$;;;;;;;;;;;;;|.....|", + "...$;;;;;;;;;;;;;|.....|", + "...||;;;;;;;;;;;;|.....|", + "....|;|||||;;;;;;|..ë..|", + "....|||rrT||;;;;;|.....|", + ".....|..h.R||;;;;|.....|", + "%%%..+.....s|;;;;|.....+", + "~~%h.|D..∞@@|;;;;|.....|", + "~~%f.||||||||;;;|||+||||", + "~~%h.|D..∞@@|;;;|......|", + "~~%..+.....s|;;;|......|", + "~~%..|..h.YR|;;;|......|", + "~~%.|||Trr|||;;;|......|", + "~~%.$^|||||;$;;;|......|", + "~~%.$^|||||;$;;;|......|", + "~~%.|||Trr|||;;;||||||||", + "~~%..|..h.YR|;;;|;;;;;;|", + "~~%h.+.....s|;;;|;;;;;;|", + "~~%f.|D..∞@@|;;&|;;;^;;|", + "%%%h.||||||||;;;=;;;;;;|", + ".....|D..∞@@|;;;|;;;;;;|", + ".....+.....s|;;;|;;;;;;|" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "terrain": { "¥": "t_card_science_maintenance_yellow" }, + "place_traps": [ + { "trap": "tr_light_on_res_8_NE", "x": [ 13, 15 ], "y": [ 1, 23 ], "repeat": [ 2, 3 ] }, + { "trap": "tr_concrete_wall_door_lab_res_8_NE", "x": [ 13, 15 ], "y": [ 1, 23 ], "repeat": [ 1, 2 ] } + ], + "place_nested": [ + { "chunks": [ [ "lab_cargo_5x5", 100 ] ], "x": 18, "y": 18 }, + { "chunks": [ [ "lab_6x6_shop_backroom", 100 ] ], "x": 17, "y": 11 }, + { "chunks": [ [ "lab_maintenance_9x9_W", 100 ] ], "x": 14, "y": 1 } + ], + "place_monster": [ + { "monster": "mon_skitterbot", "x": 11, "y": 15, "chance": 100 }, + { "monster": "mon_skitterbot", "x": 11, "y": 16, "chance": 100 } + ] + } + }, + { + "method": "json", + "om_terrain": [ "lab_res_8_SW" ], + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + "||||||||;;;||R.h..|.....", + "|;;;;;|;;;;;||Trry|>....", + "|;;;;;|&;;;;;||||||||||+", + "|;;^;;=;;;;;;¥£££^||i|L,", + "|;;;;;|;;;;;;=;;♣♦|9,+,,", + "|;;;;;|;;;;;;=;;♣♦||||,i", + "||||||||;;;;;=;;♣♦|9,+,i", + "|;;;;;;|;;;;;|£££^||i|L,", + "|;;;;;;|&;;;;|||||||||LL", + "|;;;;;;=;;;;;;;;;;;;||||", + "|;;;;;;|;;;;;;;;;;;;;;;;", + "|;;;;;;||;;;;;;;;;;;;;;;", + "|;;;;;;||;;;;;;;;;;;;;;;", + "|||||||||||⁹⁹|||||||||||", + "|||???????|UU|??????????", + "__||||????|±||??????????", + "_____||||||¢||||||||||||", + "||_|__________________ȣ_", + "?|_||||||_||||||||||||||", + "?|_||||||_||_|||????????", + "?|____ȣ___||___|????????", + "|||_|||||_||_|||||||||||", + "____|???|____ȣ________Г|", + "|||||???||||||||||||||||" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "terrain": { + "L": "t_linoleum_gray", + "U": "t_thconc_floor", + "Q": "t_thconc_floor", + "Г": "t_ladder_down", + "¥": "t_card_science_maintenance_yellow" + }, + "place_nested": [ + { "chunks": [ [ "lab_cargo_5x5", 100 ] ], "x": 1, "y": 1 }, + { "chunks": [ [ "lab_cargo_5x5", 100 ] ], "x": 2, "y": 7 } + ], + "place_traps": [ { "trap": "tr_light_on_res_8_SW", "x": [ 8, 23 ], "y": [ 10, 12 ], "repeat": [ 1, 2 ] } ] + } + }, + { + "method": "json", + "om_terrain": [ "lab_res_8_SE" ], + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + ".....|.h..R||;;;||||||||", + "....>|yrrT||;;;;;|;;;;;|", + "+||||||||||;;;;;&|;;;;;|", + ",L|S||^£££¥;;;;;;=;;^;;|", + ",,+,t|♠♥;;=;;;;;;|;;;;;|", + "i,||||♠♥;;=;;;;;;|;;;;;|", + "i,+,t|♠♥;;=;;;;;||||||||", + ",L|S||^£££|;;;;;|;;;;;;|", + "LL|||||||||;;;;&|;;;;;;|", + "||||;;;;;;;;;;;;=;;;;;;|", + ";;;;;;;;;;;;;;;;|;;;;;;|", + ";;;;;;;;;;;;;;;|||||||||", + ";;;;;;;;;;;;;;;||_⁸⁴⁴|||", + "|||||||||||⁹⁹||||_-⁴⁴|||", + "??????????|UU|____-⁴⁴|||", + "??????????|±||Q___||||||", + "|||||||||||¢||U___|<>,00", + "____________¢±UU__#,,,,,", + "|||||||_|||||||||||$||||", + "??????|_|?????????|,,|??", + "??????|_|||||||||||,,|??", + "??????|__________||ƶ=|||", + "??????||||||||||________", + "???????????????|||||||||" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "terrain": { + "L": "t_linoleum_gray", + "U": "t_thconc_floor", + "Q": "t_thconc_floor", + "⁸": "t_elevator_control_off", + "0": "t_sewage_pipe", + "⁴": "t_elevator", + "¥": "t_card_science_maintenance_yellow", + "ƶ": "t_card_science_maintenance_blue" + }, + "place_nested": [ + { "chunks": [ [ "lab_maintenance_5x5_room_NE", 100 ], [ "null", 0 ] ], "x": 2, "y": 18 }, + { "chunks": [ [ "lab_cargo_5x5", 100 ] ], "x": 18, "y": 1 } + ], + "place_traps": [ { "trap": "tr_light_on_res_8_SE", "x": [ 2, 23 ], "y": [ 10, 12 ], "repeat": [ 3, 4 ] } ] + } + } +] diff --git a/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_commons.json b/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_commons.json new file mode 100644 index 0000000000000..926f5633359ab --- /dev/null +++ b/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_commons.json @@ -0,0 +1,349 @@ +[ + { + "method": "json", + "om_terrain": [ "lab_res_8_NWD" ], + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + "|.....||¥==||||||||||||-", + "|.....|;;;;;;;;;;;;;||..", + "|.....|;;;;;;;;;;;;;|...", + "|.....|;;;;;;;;;;;;;|...", + "|.....|;;;;;;;;;;;;||...", + "|.....|;;;;;;|||||;|....", + "|.....|;;;;|||666|||....", + "|.....|;;;;|n.....y.....", + "|.....|;;;;|3..JA......h", + "|.....|;;;;|5..J..A...hf", + "|||+||||;;;|4..JA.....hf", + "|......|;;;|O..JA.....hf", + "|......|;;;|2..JA......h", + "|......|;;;|1...........", + "|......|;;;|||F7F|||....", + "|......|;;;|;|||||^$....", + "|......|;;;|;|||||^$....", + "||||||||;;;|||bbb|||....", + "|;;;;;;|;;;|......:.....", + "|;;;;;;|;;;|.(.(..:...եե", + "|;;^;;;|&;;|......)...եƨ", + "|;;;;;;=;;;|..!.!.:...եƨ", + "|;;;;;;|;;;|......)...եƨ", + "|;;;;;;|;;;|.}.}..:...եե" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "traps": { "(": "tr_rollmat" }, + "terrain": { "¥": "t_card_science_maintenance_yellow" }, + "furniture": { "!": "f_exercise", "}": [ "f_ergometer", "f_ergometer_mechanical" ], "{": "f_punching_bag" }, + "place_traps": [ + { "trap": "tr_light_on_res_8_NW", "x": [ 8, 10 ], "y": [ 1, 23 ], "repeat": [ 1, 2 ] }, + { "trap": "tr_concrete_wall_door_lab_res_8_NW", "x": [ 8, 10 ], "y": [ 1, 23 ], "repeat": [ 2, 3 ] } + ], + "place_nested": [ { "chunks": [ "lab_17x17_shop" ], "x": 1, "y": 0 }, { "chunks": [ "lab_maintenance_6x6_open" ], "x": 1, "y": 18 } ], + "place_monster": [ + { "monster": "mon_skitterbot", "x": 12, "y": 15, "chance": 100 }, + { "monster": "mon_skitterbot", "x": 12, "y": 16, "chance": 100 }, + { "monster": "mon_skitterbot", "x": 18, "y": 15, "chance": 100 }, + { "monster": "mon_skitterbot", "x": 18, "y": 16, "chance": 100 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines 2 5x5 convenience shop areas and a 6x6 back room.", + "nested_mapgen_id": "lab_17x17_shop", + "object": { + "mapgensize": [ 17, 17 ], + "place_nested": [ + { "chunks": [ "lab_5x5_convenience_shop_front_A" ], "x": 0, "y": 0 }, + { "chunks": [ "lab_5x5_convenience_shop_front_B" ], "x": 0, "y": 5 }, + { "chunks": [ "lab_6x6_shop_backroom" ], "x": 0, "y": 11 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines 2 5x5 convenience shop areas and a 6x6 back room.", + "nested_mapgen_id": "lab_17x17_shop_2", + "object": { + "mapgensize": [ 17, 17 ], + "place_nested": [ + { "chunks": [ "lab_5x5_convenience_shop_front_A" ], "x": 1, "y": 0 }, + { "chunks": [ "lab_5x5_convenience_shop_front_B" ], "x": 1, "y": 5 }, + { "chunks": [ "lab_6x6_shop_backroom" ], "x": 0, "y": 11 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines 2 5x5 pizza shop areas and a 6x6 back room.", + "nested_mapgen_id": "lab_17x17_shop", + "object": { + "mapgensize": [ 17, 17 ], + "place_nested": [ + { "chunks": [ "lab_5x5_pizza_shop_front_A" ], "x": 0, "y": 0 }, + { "chunks": [ "lab_5x5_pizza_shop_front_B" ], "x": 0, "y": 5 }, + { "chunks": [ "lab_6x6_pizza_kitchen" ], "x": 0, "y": 11 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines 2 5x5 pizza shop areas and a 6x6 back room.", + "nested_mapgen_id": "lab_17x17_shop_2", + "object": { + "mapgensize": [ 17, 17 ], + "place_nested": [ + { "chunks": [ "lab_5x5_pizza_shop_front_A" ], "x": 1, "y": 0 }, + { "chunks": [ "lab_5x5_pizza_shop_front_B" ], "x": 1, "y": 5 }, + { "chunks": [ "lab_6x6_pizza_kitchen" ], "x": 0, "y": 11 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines 2 5x5 mexican restaurant areas and a 6x6 kitchen.", + "nested_mapgen_id": "lab_17x17_shop", + "object": { + "mapgensize": [ 17, 17 ], + "place_nested": [ + { "chunks": [ "lab_5x5_restaurant_mexican_front_A" ], "x": 0, "y": 0 }, + { "chunks": [ "lab_5x5_restaurant_mexican_front_B" ], "x": 0, "y": 5 }, + { "chunks": [ "lab_6x6_restaurant_mexican_kitchen" ], "x": 0, "y": 11 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines 2 5x5 mexican restaurant areas and a 6x6 kitchen.", + "nested_mapgen_id": "lab_17x17_shop_2", + "object": { + "mapgensize": [ 17, 17 ], + "place_nested": [ + { "chunks": [ "lab_5x5_restaurant_mexican_front_A" ], "x": 1, "y": 0 }, + { "chunks": [ "lab_5x5_restaurant_mexican_front_B" ], "x": 1, "y": 5 }, + { "chunks": [ "lab_6x6_restaurant_mexican_kitchen" ], "x": 0, "y": 11 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines 2 5x5 coffee shop areas and a 6x6 back room.", + "nested_mapgen_id": "lab_17x17_shop", + "object": { + "mapgensize": [ 17, 17 ], + "place_nested": [ + { "chunks": [ "lab_5x5_coffee_shop_front_A" ], "x": 0, "y": 0 }, + { "chunks": [ "lab_5x5_coffee_shop_front_B" ], "x": 0, "y": 5 }, + { "chunks": [ "lab_6x6_shop_backroom" ], "x": 0, "y": 11 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines 2 5x5 coffee shop areas and a 6x6 back room.", + "nested_mapgen_id": "lab_17x17_shop_2", + "object": { + "mapgensize": [ 17, 17 ], + "place_nested": [ + { "chunks": [ "lab_5x5_coffee_shop_front_A" ], "x": 1, "y": 0 }, + { "chunks": [ "lab_5x5_coffee_shop_front_B" ], "x": 1, "y": 5 }, + { "chunks": [ "lab_6x6_shop_backroom" ], "x": 0, "y": 11 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines 2 5x5 bar areas and a 6x6 kitchen.", + "nested_mapgen_id": "lab_17x17_shop", + "object": { + "mapgensize": [ 17, 17 ], + "place_nested": [ + { "chunks": [ "lab_5x5_bar_front_A" ], "x": 0, "y": 0 }, + { "chunks": [ "lab_5x5_bar_front_B" ], "x": 0, "y": 5 }, + { "chunks": [ "lab_6x6_bar_kitchen" ], "x": 0, "y": 11 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines 2 5x5 bar areas and a 6x6 kitchen.", + "nested_mapgen_id": "lab_17x17_shop_2", + "object": { + "mapgensize": [ 17, 17 ], + "place_nested": [ + { "chunks": [ "lab_5x5_bar_front_A" ], "x": 1, "y": 0 }, + { "chunks": [ "lab_5x5_bar_front_B" ], "x": 1, "y": 5 }, + { "chunks": [ "lab_6x6_bar_kitchen" ], "x": 0, "y": 11 } + ] + } + }, + { + "method": "json", + "om_terrain": [ "lab_res_8_NED" ], + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + "-||||||||||||==¥||.....|", + "..||;;;;;;;;;;;;;|.....|", + "...|;;;;;;;;;;;;;|.....|", + "...|;;;;;;;;;;;;;|.....|", + "...||;;;;;;;;;;;;|.....|", + "....|;|||||;;;;;;|.....|", + "....|||xxx|||;;;;|.....|", + "......¶¶¶¶HT|;;;;|.....|", + "h.....¶ll¶H.|;;;;|.....|", + "fh....¶HHH¶.|;;;;|.....|", + "fh....¶¶¶¶¶.|;;;||||+|||", + "fh.....EsE..|;;;|......|", + "h..........E|;;;|......|", + "....yRY....T|;;;|......|", + "....|||;a;|||;;;|......|", + "....=>|||||;|;;;|......|", + "....ƶ>|||||;|;;;|......|", + "....|||PPP|||;;;||||||||", + ".....:.....R|;;;|;;;;;;|", + "եե...:.ErE.R|;;;|;;;;;;|", + "ƨե...).ErE.R|;;&|;;;^;;|", + "ƨե...:.....R|;;;=;;;;;;|", + "ƨե...).ErE.R|;;;|;;;;;;|", + "եե...:.ErE.R|;;;|;;;;;;|" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "terrain": { + "¥": "t_card_science_maintenance_yellow", + "ƶ": "t_card_science_mutagen_green", + "H": "t_carpet_concrete_yellow", + "l": "t_carpet_concrete_yellow" + }, + "place_traps": [ + { "trap": "tr_light_on_res_8_NE", "x": [ 13, 15 ], "y": [ 1, 23 ], "repeat": [ 2, 3 ] }, + { "trap": "tr_concrete_wall_door_lab_res_8_NE", "x": [ 13, 15 ], "y": [ 1, 23 ], "repeat": [ 1, 2 ] } + ], + "place_nested": [ + { "chunks": [ "lab_17x17_shop_2" ], "x": 17, "y": 0 }, + { "chunks": [ "lab_maintenance_6x6_open" ], "x": 17, "y": 18 } + ], + "place_monster": [ + { "monster": "mon_skitterbot", "x": 11, "y": 15, "chance": 100 }, + { "monster": "mon_skitterbot", "x": 11, "y": 16, "chance": 100 } + ] + } + }, + { + "method": "json", + "om_terrain": [ "lab_res_8_SWD" ], + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + "||||||||;;;||.....:.....", + "|;;;;;|;;;;;||.{..|<....", + "|;;;;;|&;;;;;|||||||||||", + "|;;^;;=;;;;;;¥£££^|^££££", + "|;;;;;|;;;;;;=;;♥♠|£;;;;", + "|;;;;;|;;;;;;=;;♥♠|£;;;;", + "|||||||;;;;;;=;;♥♠|£;;;;", + "|;;;;;|;;;;;;|£££^|£££££", + "|;;;;;|&;;;;;|||||||===¥", + "|;;^;;=;;;;;;;;;;;;;;;;;", + "|;;;;;|;;;;;;;;;;;;;;;;;", + "|;;;;;|;;;;;;;;;;;;;;;;;", + "|||||||;;;;;;;;;;;;;;;;;", + "|||||||||||⁹⁹|||||||||||", + "|||???????|UU|??????????", + "__||||????|±||??????????", + "_____||||||¢||||||||||||", + "||_|__________________ȣ_", + "?|_||||||_||||||||||||||", + "?|_||||||_||_|||????????", + "?|________||___|????????", + "|||_||ȣ||_||_|||||||||||", + "____||Г||____ȣ________ւ|", + "||||||||||||||||||||||||" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "terrain": { + "L": "t_linoleum_gray", + "¥": "t_card_science_maintenance_yellow", + "U": "t_thconc_floor", + "Q": "t_thconc_floor", + "Г": "t_ladder_down", + "ւ": "t_ladder_up" + }, + "furniture": { "{": "f_punching_bag" }, + "place_nested": [ + { "chunks": [ [ "lab_cargo_5x5", 100 ] ], "x": 1, "y": 1 }, + { "chunks": [ [ "lab_cargo_5x5", 100 ] ], "x": 1, "y": 7 }, + { "chunks": [ [ "lab_wall_chain_5x5", 50 ], [ "lab_wall_door_5x5", 50 ], [ "null", 50 ] ], "x": 1, "y": 0 }, + { "chunks": [ [ "lab_wall_chain_5x5", 50 ], [ "lab_wall_door_5x5", 50 ], [ "null", 50 ] ], "x": 1, "y": 6 } + ], + "place_traps": [ { "trap": "tr_light_on_res_8_SW", "x": [ 8, 23 ], "y": [ 10, 12 ], "repeat": [ 1, 2 ] } ] + } + }, + { + "method": "json", + "om_terrain": [ "lab_res_8_SED" ], + "type": "mapgen", + "weight": 200, + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + ".....:.....||;;;||||||||", + "....<|PPPP||;;;;;|;;;;;|", + "|||||||||||;;;;;&|;;;;;|", + "££££££^£££|;;;;;;=;;^;;|", + ";;;;;;♦♣;;|;;;;;;|;;;;;|", + ";;;;;;♦♣;;|;;;;;;|;;;;;|", + ";;;;;;♦♣;;|;;;;;;|||||||", + "££££££^£££|;;;;;;|;;;;;|", + "===||||||||;;;;;&|;;;;;|", + ";;;;;;;;;;;;;;;;;=;;^;;|", + ";;;;;;;;;;;;;;;;;|;;;;;|", + ";;;;;;;;;;;;;;;|||||||||", + ";;;;;;;;;;;;;;;||_⁸⁴⁴|||", + "|||||||||||⁹⁹||||_-⁴⁴|||", + "??????????|UU|____-⁴⁴|||", + "??????????|±||Q___||||||", + "|||||||||||¢||U___|,<,00", + "____________¢±UU__#,,,,,", + "|||||||_|||||||||||_||||", + "??????|_|?????????|UU|??", + "??????|_||||||||||||||??", + "??????|______________|||", + "??????||||||||||||||____", + "???????????????????|||||" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ], + "terrain": { + "L": "t_linoleum_gray", + "U": "t_thconc_floor", + "Q": "t_thconc_floor", + "⁸": "t_elevator_control_off", + "0": "t_sewage_pipe", + "⁴": "t_elevator" + }, + "place_nested": [ + { "chunks": [ [ "lab_maintenance_5x5_room_NE", 100 ], [ "null", 0 ] ], "x": 2, "y": 18 }, + { "chunks": [ [ "lab_cargo_5x5", 100 ] ], "x": 18, "y": 1 }, + { "chunks": [ [ "lab_wall_chain_5x5", 50 ], [ "lab_wall_door_5x5", 50 ], [ "null", 50 ] ], "x": 18, "y": 0 }, + { "chunks": [ [ "lab_wall_chain_5x5", 50 ], [ "lab_wall_door_5x5", 50 ], [ "null", 50 ] ], "x": 18, "y": 6 } + ], + "place_traps": [ { "trap": "tr_light_on_res_8_SE", "x": [ 2, 23 ], "y": [ 10, 12 ], "repeat": [ 3, 4 ] } ] + } + } +] diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_residential.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_residential.json index 481db7559d67b..98d9e64f17846 100644 --- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_residential.json +++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_residential.json @@ -165,5 +165,158 @@ ], "palettes": [ "lab_common_palette", "lab_residential_palette" ] } + }, + { + "type": "mapgen", + "method": "json", + "//": "A nested map for small residential areas. Door orientation to the west.", + "nested_mapgen_id": "lab_residential_6x6_W", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + " RRRR ", + " ", + " hsh R", + " hsh R", + " hsh R", + " h " + ], + "palettes": [ "lab_common_palette", "lab_residential_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "A nested map for small residential areas. Door orientation to the west.", + "nested_mapgen_id": "lab_residential_6x6_W", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + " ssssT", + " ", + " ee AJ", + " ee J", + " ee AJ", + "A " + ], + "palettes": [ "lab_common_palette", "lab_residential_palette" ], + "items": { "J": { "item": "wetbar_stack", "chance": 30 }, "s": { "item": "office_paper", "chance": 30 } } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "A nested map for small residential areas. Door orientation to the west.", + "nested_mapgen_id": "lab_residential_6x6_W", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + " ssssT", + " ", + " ee AJ", + " ee J", + " ee AJ", + "A " + ], + "palettes": [ "lab_common_palette", "lab_residential_palette" ], + "items": { + "s": { "item": "wetbar_stack", "chance": 30 }, + "S": { "item": "office_paper", "chance": 30 }, + "Y": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] } + } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "lab_residential_6x6_W", + "//": "A nested map for small residential areas. Door orientation to the west.", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + " ÆsØ ", + "A ", + " !", + " x", + "Hl !", + "HHH " + ], + "palettes": [ "lab_common_palette", "lab_residential_palette" ], + "furniture": { "!": "f_speaker_cabinet" }, + "place_loot": [ { "item": "stereo", "x": 5, "y": 3, "chance": 100 }, { "item": "laptop", "x": 1, "y": 4, "chance": 60 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "lab_residential_6x6_W", + "//": "A nested map for small residential areas. Door orientation to the west.", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + " EsE R", + " R", + " _", + " a", + "Hll _", + "HHH R" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette" ], + "furniture": { "!": "f_speaker_cabinet" }, + "place_loot": [ { "group": "games", "x": 2, "y": 0, "chance": 100 }, { "item": "laptop", "x": 1, "y": 4, "chance": 60 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "lab_residential_6x6_W", + "//": "A nested map for small residential areas. Door orientation to the west.", + "object": { + "mapgensize": [ 6, 6 ], + "rotation": [ 0, 3 ], + "rows": [ + " EsE R", + " R", + " eee _", + " eee a", + " _", + " EsE R" + ], + "palettes": [ "lab_common_palette", "lab_residential_palette" ], + "furniture": { "!": "f_speaker_cabinet" }, + "place_loot": [ + { "group": "games", "x": 2, "y": 0, "chance": 100 }, + { "group": "games", "x": 2, "y": 5, "chance": 100 }, + { "item": "laptop", "x": 1, "y": 4, "chance": 60 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "5x5_dojo", + "//": "A nested map for small recreational/fitness areas.", + "object": { + "mapgensize": [ 5, 5 ], + "rotation": [ 0, 3 ], + "rows": [ + "!!!!!", + "!!!!!", + "!!!!!", + "!!!!!", + "yyÿyy" + ], + "palettes": [ "lab_common_palette" ], + "furniture": { "!": "f_tatami", "ÿ": "f_coffee_table" }, + "place_loot": [ + { "group": "dojo_manuals", "x": 2, "y": 4, "chance": 100 }, + { "item": "candle", "x": 2, "y": 4, "chance": 100, "repeat": [ 1, 2 ] } + ] + } } ] diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json index b07e593bb8586..9774faf389a84 100644 --- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json +++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json @@ -36,5 +36,105 @@ "update_mapgen_id": "concrete_wall_o_lab_res_8_NE", "method": "json", "object": { "place_terrain": [ { "ter": "t_thconc_floor", "x": 12, "y": 15 }, { "ter": "t_thconc_floor", "x": 12, "y": 16 } ] } + }, + { + "type": "trap", + "id": "tr_light_on_res_8_NW", + "name": "overhead light", + "color": "white", + "symbol": ".", + "visibility": 99, + "avoidance": 99, + "difficulty": 99, + "action": "map_regen", + "map_regen": "light_on_res_8_NW", + "benign": false + }, + { + "type": "mapgen", + "update_mapgen_id": "light_on_res_8_NW", + "method": "json", + "object": { + "place_terrain": [ + { "ter": "t_thconc_floor_olight", "x": 9, "y": 3 }, + { "ter": "t_thconc_floor_olight", "x": 9, "y": 11 }, + { "ter": "t_thconc_floor_olight", "x": 9, "y": 19 } + ] + } + }, + { + "type": "trap", + "id": "tr_light_on_res_8_NE", + "name": "overhead light", + "color": "white", + "symbol": ".", + "visibility": 99, + "avoidance": 99, + "difficulty": 99, + "action": "map_regen", + "map_regen": "light_on_res_8_NE", + "benign": false + }, + { + "type": "mapgen", + "update_mapgen_id": "light_on_res_8_NE", + "method": "json", + "object": { + "place_terrain": [ + { "ter": "t_thconc_floor_olight", "x": 14, "y": 3 }, + { "ter": "t_thconc_floor_olight", "x": 14, "y": 11 }, + { "ter": "t_thconc_floor_olight", "x": 14, "y": 19 } + ] + } + }, + { + "type": "trap", + "id": "tr_light_on_res_8_SW", + "name": "overhead light", + "color": "white", + "symbol": ".", + "visibility": 99, + "avoidance": 99, + "difficulty": 99, + "action": "map_regen", + "map_regen": "light_on_res_8_SW", + "benign": false + }, + { + "type": "mapgen", + "update_mapgen_id": "light_on_res_8_SW", + "method": "json", + "object": { + "place_terrain": [ + { "ter": "t_thconc_floor_olight", "x": 9, "y": 3 }, + { "ter": "t_thconc_floor_olight", "x": 9, "y": 11 }, + { "ter": "t_thconc_floor_olight", "x": 20, "y": 11 } + ] + } + }, + { + "type": "trap", + "id": "tr_light_on_res_8_SE", + "name": "overhead light", + "color": "white", + "symbol": ".", + "visibility": 99, + "avoidance": 99, + "difficulty": 99, + "action": "map_regen", + "map_regen": "light_on_res_8_SE", + "benign": false + }, + { + "type": "mapgen", + "update_mapgen_id": "light_on_res_8_SE", + "method": "json", + "object": { + "place_terrain": [ + { "ter": "t_thconc_floor_olight", "x": 14, "y": 3 }, + { "ter": "t_thconc_floor_olight", "x": 14, "y": 11 }, + { "ter": "t_thconc_floor_olight", "x": 3, "y": 11 } + ] + } } ] diff --git a/data/json/mapgen_palettes/lab/lab_modular_palette.json b/data/json/mapgen_palettes/lab/lab_modular_palette.json index 2eceab97e6041..ccadc07d69341 100644 --- a/data/json/mapgen_palettes/lab/lab_modular_palette.json +++ b/data/json/mapgen_palettes/lab/lab_modular_palette.json @@ -110,7 +110,16 @@ "∞": "f_foot_locker", "ɤ": "f_counter_gate_c" }, - "items": { "Y": [ { "item": "trash", "chance": 20, "repeat": [ 1, 3 ] } ], "P": { "item": "file_room", "chance": 100 } } + "items": { + "Y": [ { "item": "trash", "chance": 20, "repeat": [ 1, 3 ] } ], + "P": { "item": "file_room", "chance": 100 }, + "8": [ + { "item": "SUS_hair_drawer", "chance": 10 }, + { "item": "SUS_bathroom_cabinet", "chance": 20 }, + { "item": "SUS_bathroom_medicine", "chance": 20 }, + { "item": "harddrugs", "chance": 2 } + ] + } }, { "type": "palette", @@ -228,12 +237,6 @@ "5": { "item": "SUS_kitchen_sink", "chance": 100 }, "6": [ { "item": "SUS_pantry", "chance": 25 }, { "item": "cannedfood", "chance": 20, "repeat": [ 1, 2 ] } ], "7": [ { "item": "SUS_breakfast_cupboard", "chance": 30 }, { "item": "SUS_coffee_cupboard", "chance": 50 } ], - "8": [ - { "item": "SUS_hair_drawer", "chance": 30 }, - { "item": "SUS_bathroom_cabinet", "chance": 30 }, - { "item": "SUS_bathroom_medicine", "chance": 40 }, - { "item": "harddrugs", "chance": 2 } - ], "9": { "item": "shower", "chance": 30, "repeat": [ 1, 2 ] }, "@": { "item": "bed", "chance": 50 }, "Z": { "item": "laundry", "chance": 100 }, diff --git a/data/json/overmap/overmap_special/lab_modular/lab_mini_specials.json b/data/json/overmap/overmap_special/lab_modular/lab_mini_specials.json index 1688fc9d6bbb5..1a61f7b297cd3 100644 --- a/data/json/overmap/overmap_special/lab_modular/lab_mini_specials.json +++ b/data/json/overmap/overmap_special/lab_modular/lab_mini_specials.json @@ -70,6 +70,64 @@ "city_sizes": [ 1, 16 ], "occurrences": [ 0, 0 ] }, + { + "type": "overmap_special", + "//": "A 2 z level residential area. This includes segments of cargo/maintenance and retail areas. This complements the mutagen lab.", + "id": "Lab_RES_2x2x2", + "overmaps": [ + { "point": [ 0, 0, -2 ], "overmap": "lab_res_8_NW_north" }, + { "point": [ 1, 0, -2 ], "overmap": "lab_res_8_NE_north" }, + { "point": [ 0, 1, -2 ], "overmap": "lab_res_8_SW_north" }, + { "point": [ 1, 1, -2 ], "overmap": "lab_res_8_SE_north" }, + { "point": [ 0, 0, -3 ], "overmap": "lab_res_8_NWD_north" }, + { "point": [ 1, 0, -3 ], "overmap": "lab_res_8_NED_north" }, + { "point": [ 0, 1, -3 ], "overmap": "lab_res_8_SWD_north" }, + { "point": [ 1, 1, -3 ], "overmap": "lab_res_8_SED_north" } + ], + "locations": [ "land" ], + "city_distance": [ 3, -1 ], + "city_sizes": [ 1, 16 ], + "occurrences": [ 0, 0 ] + }, + { + "type": "overmap_special", + "//": "A 2 z level residential area. This is self-contained and mimics the apartments in old labs. Includes possible maintenance access points.", + "id": "Lab_APARTMENTS_1x1x2", + "overmaps": [ + { "point": [ 2, -1, -2 ], "overmap": "lab_1x1x2_RES_8_apartments_upper_north" }, + { "point": [ 2, -1, -3 ], "overmap": "lab_1x1x2_RES_8_apartments_lower_north" } + ], + "locations": [ "land" ], + "city_distance": [ 3, -1 ], + "city_sizes": [ 1, 16 ], + "occurrences": [ 0, 0 ] + }, + { + "type": "overmap_special", + "//": "A 2 z level residential area. This is self-contained and has 9 bedrooms with a common area. Includes possible maintenance access points.", + "id": "Lab_RES_1x1x2_maintenance", + "overmaps": [ + { "point": [ 2, 1, -2 ], "overmap": "lab_1x1_RES_8_bedrooms_maintenance_north" }, + { "point": [ 2, 1, -3 ], "overmap": "lab_1x1_RES_8_commons_north" } + ], + "locations": [ "land" ], + "city_distance": [ 3, -1 ], + "city_sizes": [ 1, 16 ], + "occurrences": [ 0, 0 ] + }, + { + "type": "overmap_special", + "//": "A 2 z level residential area. This is self-contained and has 9 bedrooms with a common area. Includes possible maintenance access points.", + "id": "Lab_RES_1x1x2_security", + "overmaps": [ + { "point": [ 2, 1, -2 ], "overmap": "lab_1x1_RES_8_bedrooms_security_north" }, + { "point": [ 2, 1, -3 ], "overmap": "lab_1x1_RES_8_commons_north" } + ], + "locations": [ "land" ], + "city_distance": [ 3, -1 ], + "city_sizes": [ 1, 16 ], + "occurrences": [ 0, 0 ] + }, { "type": "overmap_special", "id": "Lab_SECURITY_1x1x6", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_lab.json b/data/json/overmap/overmap_terrain/overmap_terrain_lab.json index f1712d18e5d49..fa30c38060845 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_lab.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_lab.json @@ -564,6 +564,29 @@ "see_cost": 5, "flags": [ "RISK_HIGH" ] }, + { + "type": "overmap_terrain", + "id": [ + "lab_1x1_RES_8_bedrooms_maintenance", + "lab_1x1_RES_8_bedrooms_security", + "lab_1x1_RES_8_commons", + "lab_res_8_NW", + "lab_res_8_NE", + "lab_res_8_SW", + "lab_res_8_SE", + "lab_res_8_NWD", + "lab_res_8_NED", + "lab_res_8_SWD", + "lab_res_8_SED", + "lab_1x1x2_RES_8_apartments_upper", + "lab_1x1x2_RES_8_apartments_lower" + ], + "name": "Lab Residential Zone", + "sym": "R", + "color": "green", + "see_cost": 5, + "flags": [ "RISK_HIGH" ] + }, { "type": "overmap_terrain", "id": [ From bdea9eb5938b83c369c9f6dfb10ef133a6b5c418 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 24 Jul 2021 10:27:53 -0400 Subject: [PATCH 2/4] Update lab_nested_maintenance.json add missing nests. --- .../lab_nested_maintenance.json | 102 +++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json index 9afaa11ad7570..5e37d19f0b145 100644 --- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json +++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json @@ -72,7 +72,7 @@ " ", " " ], - "palettes": [ "lab_common_palette" ], + "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], "place_loot": [ { "group": "trash", "x": [ 1, 3 ], "y": [ 1, 3 ], "repeat": 3, "chance": 100 } ], "place_nested": [ { "chunks": [ [ "sub_fd_shock_vent", 30 ], [ "null", 70 ] ], "x": 1, "y": 1 } ] } @@ -504,5 +504,105 @@ ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ] } + }, + { + "type": "mapgen", + "method": "json", + "//": "A nested map for a 5x9 room, includes door on east wall.", + "nested_mapgen_id": "lab_maintenance_9x9_E", + "object": { + "mapgensize": [ 9, 9 ], + "rows": [ + "A Q| ", + "NN Q| ", + " | ", + "J # ", + "J A # ", + "J | ", + " Y| ", + "N A Q| ", + "NN Q| " + ], + "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], + "place_loot": [ + { "item": "broken_eyebot", "x": 0, "y": 2, "chance": 100 }, + { "item": "broken_secubot", "x": 0, "y": 6, "chance": 100 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "A nested map for a 5x9 room, includes door on west wall, possible door on south wall.", + "nested_mapgen_id": "lab_maintenance_9x9_W", + "object": { + "mapgensize": [ 9, 9 ], + "rows": [ + " |Q NN", + " |Q A ", + " | ", + " # J", + " # J", + " | J", + " |Y ", + " |Q NN", + " |Q A" + ], + "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], + "place_loot": [ + { "item": "broken_skitterbot", "x": 8, "y": 2, "chance": 100 }, + { "item": "broken_nursebot_defective", "x": 8, "y": 6, "chance": 100 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "A nested map for a 5x9 room, includes door on east wall.", + "nested_mapgen_id": "lab_maintenance_9x9_E", + "object": { + "mapgensize": [ 9, 9 ], + "rows": [ + "`WWW`| ", + " | ", + " s | ", + "₸ s # ", + "Z sA # ", + "₸ s | ", + " As | ", + " | ", + "QQ QQ| " + ], + "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], + "place_loot": [ + { "item": "broken_gasbomb_hack", "x": 0, "y": 0, "chance": 100 }, + { "item": "broken_EMP_hack", "x": 4, "y": 0, "chance": 100 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "A nested map for a 5x9 room, includes door on west wall.", + "nested_mapgen_id": "lab_maintenance_9x9_W", + "object": { + "mapgensize": [ 9, 9 ], + "rows": [ + " |`WWW`", + " | ", + " | s ", + " # sA₸", + " # s Z", + " | As ₸", + " | s ", + " | ", + " |QQ QQ" + ], + "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], + "place_loot": [ + { "item": "broken_science_bot", "x": 4, "y": 0, "chance": 100 }, + { "item": "broken_grenade_hack", "x": 8, "y": 0, "chance": 100 } + ] + } } ] From a921a2906b68169cca49b5110ae76101c3fd5f42 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 24 Jul 2021 14:31:23 -0400 Subject: [PATCH 3/4] Update lab_shared_traps.json benign true. --- .../lab_nests_modular/lab_shared_traps.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json index 9774faf389a84..974272cfd8018 100644 --- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json +++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json @@ -10,7 +10,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "concrete_wall_o_lab_res_8_NW", - "benign": false + "benign": true }, { "type": "mapgen", @@ -29,7 +29,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "concrete_wall_o_lab_res_8_NE", - "benign": false + "benign": true }, { "type": "mapgen", @@ -48,7 +48,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "light_on_res_8_NW", - "benign": false + "benign": true }, { "type": "mapgen", @@ -73,7 +73,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "light_on_res_8_NE", - "benign": false + "benign": true }, { "type": "mapgen", @@ -98,7 +98,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "light_on_res_8_SW", - "benign": false + "benign": true }, { "type": "mapgen", @@ -123,7 +123,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "light_on_res_8_SE", - "benign": false + "benign": true }, { "type": "mapgen", From ea89527d699ed791d8534577ad88fcde17c7dec2 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 24 Jul 2021 14:40:40 -0400 Subject: [PATCH 4/4] revert change to traps --- .../lab_nests_modular/lab_shared_traps.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json index 974272cfd8018..9774faf389a84 100644 --- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json +++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json @@ -10,7 +10,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "concrete_wall_o_lab_res_8_NW", - "benign": true + "benign": false }, { "type": "mapgen", @@ -29,7 +29,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "concrete_wall_o_lab_res_8_NE", - "benign": true + "benign": false }, { "type": "mapgen", @@ -48,7 +48,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "light_on_res_8_NW", - "benign": true + "benign": false }, { "type": "mapgen", @@ -73,7 +73,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "light_on_res_8_NE", - "benign": true + "benign": false }, { "type": "mapgen", @@ -98,7 +98,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "light_on_res_8_SW", - "benign": true + "benign": false }, { "type": "mapgen", @@ -123,7 +123,7 @@ "difficulty": 99, "action": "map_regen", "map_regen": "light_on_res_8_SE", - "benign": true + "benign": false }, { "type": "mapgen",