From e80891977312c50fccbe004a026061ab8c3b55fb Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:34:36 +0200 Subject: [PATCH 01/12] Update s_games.json cash register, concrete back alley --- data/json/mapgen/store/s_games.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/data/json/mapgen/store/s_games.json b/data/json/mapgen/store/s_games.json index fc22121425334..67d07ca40caf7 100644 --- a/data/json/mapgen/store/s_games.json +++ b/data/json/mapgen/store/s_games.json @@ -24,11 +24,11 @@ ".# hh hkk i #.", ".#hhhhh| Y||c|oo||||#.", ".##o#o###|c||D |;r#.", - ".______9#;;;| ll c;q#.", - "._______c;;;| lkkl |###.", - ".nn_____#;;m| lkkl c;q#.", - ".nn_____#mmm|F ll |;r#.", - ".nn_____######oooo#####.", + ".,,,,,,9#;;;| ll c;q#.", + ".,,,,,,,c;;;| lkkl |###.", + ".nn,,,,,#;;m| lkkl c;q#.", + ".nn,,,,,#mmm|F ll |;r#.", + ".nn,,,,,######oooo#####.", "........................" ], "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, @@ -41,7 +41,8 @@ ".": "t_region_groundcover_urban", "f": "t_sidewalk", "g": "t_pavement_y", - "n": "t_pavement", + "n": "t_concrete", + ",": "t_concrete", ";": "t_linoleum_gray", "q": "t_linoleum_gray", "r": "t_linoleum_gray", @@ -56,7 +57,7 @@ "k": "f_table", "A": "f_stool", "l": "f_chair", - "m": "f_crate_c", + "m": "f_cardboard_box", "n": "f_dumpster", "Y": "f_trashcan", "r": "f_sink", @@ -91,7 +92,8 @@ { "item": "dnd", "x": 15, "y": 20, "chance": 90 }, { "item": "character_sheet", "x": [ 15, 16 ], "y": [ 19, 20 ], "chance": 80, "repeat": [ 1, 6 ] }, { "item": "metal_RPG_die", "x": 16, "y": 19, "chance": 10 }, - { "item": "RPG_die", "x": 15, "y": 19, "chance": 90, "repeat": [ 1, 4 ] } + { "item": "RPG_die", "x": 15, "y": 19, "chance": 90, "repeat": [ 1, 4 ] }, + { "group": "cash_register_random", "x": 19, "y": [ 10, 12 ] } ] } }, From d67941d5cf2f4c28bfadcdc9f388ba9114c62df3 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:36:00 +0200 Subject: [PATCH 02/12] Update s_gunstore.json cash register, concrete back alley --- data/json/mapgen/store/s_gunstore.json | 37 +++++++++++++++----------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/data/json/mapgen/store/s_gunstore.json b/data/json/mapgen/store/s_gunstore.json index 0bc461f14bc31..54b414e66d419 100644 --- a/data/json/mapgen/store/s_gunstore.json +++ b/data/json/mapgen/store/s_gunstore.json @@ -6,7 +6,7 @@ "object": { "fill_ter": "t_thconc_floor", "rows": [ - ",,,,,,,,,,,,,,,,,,''',,,", + ",,,,,,,,,,,,,,,,,''''',,", ",###::##::##::###''''',,", ";#..............#''''',,", ",#..............+''''',,", @@ -23,16 +23,17 @@ ",#-D--D-------D-W.....W,", ",#r.-..-<-EEEO..D.....W,", ",#^.-l.-D-EA..rEWT.T.TW,", - ",#q&-l...-EA..AEWxxxxxW,", + ",#q&-l...-?A..AEWxxxxxW,", ",#---....----D-#WWWWWWW,", - ",#sss..........#;____ww,", - ",#......ss.ss..+_____ww,", - ",#ss....ss.ss..+_____ww,", - ",#ssss.........#_______,", - ",###############_______," + ",#sss..........#;''''ww,", + ",#......ss.ss..+'''''ww,", + ",#ss....ss.ss..+'''''ww,", + ",#ssss.........#''''''',", + ",###############'''''''," ], "palettes": [ "gun_store_palette" ], - "terrain": { "w": "t_pavement" } + "terrain": { "w": "t_sidewalk" }, + "place_loot": [ { "group": "cash_register_random", "x": 12, "y": 10 }, { "group": "cash_register_random", "x": 12, "y": 12 } ] } }, { @@ -147,7 +148,7 @@ "object": { "fill_ter": "t_thconc_floor", "rows": [ - ",,,,,,,,,,,,,,,,,,''',,,", + ",,,,,,,,,,,,,,,,,''''',,", ",###::##::##::###''''',,", ";#``````````````#''''',,", ",#``````````````+''''',,", @@ -166,14 +167,14 @@ ",#^`-M`-D-EA``rEWT.T.TW,", ",#q&-M```-EA``AEWxxxxxW,", ",#---````----D-#WWWWWWW,", - ",#SSS``````````#;____ww,", - ",#``````SS`SS``+_____ww,", - ",#SS````SS`SS``+_____ww,", - ",#SSSS`````````#_______,", - ",###############_______," + ",#SSS``````````#;''''ww,", + ",#``````SS`SS``+'''''ww,", + ",#SS````SS`SS``+'''''ww,", + ",#SSSS`````````#''''''',", + ",###############'''''''," ], "palettes": [ "gun_store_palette" ], - "terrain": { "w": "t_pavement" }, + "terrain": { "w": "t_sidewalk" }, "nested": { "#": { "chunks": [ [ "general_graffiti", 15 ], [ "null", 75 ] ] }, "m": { "chunks": [ [ "destroyed_furniture_gunstore", 40 ], [ "null", 80 ] ] }, @@ -197,7 +198,11 @@ "e": { "chunks": [ [ "looted_gunsafe_nested", 25 ], [ "jammed_gunsafe_nested", 75 ], [ "null", 95 ] ] }, "+": { "chunks": [ [ "destroyed_metal_door_nested", 90 ], [ "null", 100 ] ] }, "`": { "chunks": [ [ "corpse_blood_casings_1x1", 4 ], [ "null", 20 ] ] } - } + }, + "place_loot": [ + { "group": "cash_register_random_ransacked", "x": 12, "y": 10 }, + { "group": "cash_register_random_ransacked", "x": 12, "y": 12 } + ] } } ] From 0d93adbcc5a97eb683030b3c8cb0b8312f5e0a54 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:37:11 +0200 Subject: [PATCH 03/12] Update s_hunting.json cash register, sidewalk --- data/json/mapgen/store/s_hunting.json | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/data/json/mapgen/store/s_hunting.json b/data/json/mapgen/store/s_hunting.json index 72f9cb9133b41..c4b77ec9dee75 100644 --- a/data/json/mapgen/store/s_hunting.json +++ b/data/json/mapgen/store/s_hunting.json @@ -7,12 +7,12 @@ "object": { "fill_ter": "t_floor", "rows": [ - ".`''''`''''`''''`''''`..", - ".`''''`''''`''''`''''`..", - ".`''''`''''`''''`''''`..", - ".`''''`''''`''''`''''`..", - ".`''''`''''`''''`''''`..", - ".----------**-~~~~~~~--.", + ".`''''`''''ss''''`''''`.", + ".`''''`''''ss''''`''''`.", + ".`''''`''''ss''''`''''`.", + ".`''''`''''ss''''`''''`.", + ".`''''`''''ss''''`''''`.", + ".--~~~~~~~-**-~~~~~~~--.", ".| RRRRRRR^ ^RRRRRRR |.", ".| |.", ".| RRRRRRR RRRRRRR |.", @@ -21,9 +21,9 @@ ".|^ mm RRRRRRR |.", ".|#### RRRRRRR |.", ".|R # ^ |.", - ".|R cC B|-----------|.", + ".|R c# B|-----------|.", ".|R # B|FFFF LYIII|.", - ".|R + c |.", + ".|R C + c |.", ".|RxX#^ Y|f###Y ^FFF|.", ".|-----+--------------|.", ".|&,,|,,,,,,,,,|OOOOOO|.", @@ -35,10 +35,12 @@ "terrain": { ".": "t_region_groundcover", " ": "t_floor", + "s": "t_sidewalk", ",": "t_thconc_floor", "y": "t_thconc_floor", "&": "t_thconc_floor", "%": "t_thconc_floor", + "r": "t_thconc_floor", "O": "t_thconc_floor", "o": "t_thconc_floor", "'": "t_pavement", @@ -51,13 +53,13 @@ "4": "t_gutter_downspout" }, "furniture": { - "C": "f_console_broken", "#": "f_counter", + "C": "f_counter_gate_c", "%": "f_sink", "R": "f_rack", "r": "f_warehouse_shelf", - "O": [ [ "f_crate_c", 3 ], "f_crate_o" ], - "o": [ [ "f_crate_c", 3 ], "f_crate_o" ], + "O": [ [ "f_crate_c", 3 ], "f_cardboard_box", "f_crate_o" ], + "o": [ [ "f_crate_c", 3 ], "f_cardboard_box", "f_crate_o" ], "X": "f_safe_l", "x": "f_safe_l", "B": "f_bulletin", @@ -94,7 +96,8 @@ { "group": "clothing_hunting", "x": [ 3, 9 ], "y": [ 8, 9 ], "chance": 80, "repeat": [ 12, 14 ] }, { "group": "tools_hunting", "x": [ 14, 20 ], "y": 6, "chance": 70, "repeat": [ 6, 7 ] }, { "group": "tools_hunting", "x": [ 14, 20 ], "y": [ 8, 9 ], "chance": 70, "repeat": [ 12, 14 ] }, - { "group": "tools_hunting", "x": [ 14, 20 ], "y": [ 11, 12 ], "chance": 70, "repeat": [ 12, 14 ] } + { "group": "tools_hunting", "x": [ 14, 20 ], "y": [ 11, 12 ], "chance": 70, "repeat": [ 12, 14 ] }, + { "group": "cash_register_random", "x": 5, "y": [ 13, 15 ] } ], "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": 2, "chance": 2, "repeat": [ 2, 3 ] } ] } From ce3a88cc2ca394c6efbdcbd8ffa2acdb2eb3d47b Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:38:04 +0200 Subject: [PATCH 04/12] Update sports_store.json cash register, sidewalk, regional terrain, counter gate --- data/json/mapgen/sports_store.json | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/data/json/mapgen/sports_store.json b/data/json/mapgen/sports_store.json index ffaa665dc4d73..1e8778391b02a 100644 --- a/data/json/mapgen/sports_store.json +++ b/data/json/mapgen/sports_store.json @@ -5,13 +5,13 @@ "om_terrain": [ "s_sports" ], "weight": 300, "object": { - "fill_ter": "t_floor", + "fill_ter": "t_thconc_floor", "rows": [ - ".`''''`''''`''''`''''`..", - ".`''''`''''`''''`''''`..", - ".`''''`''''`''''`''''`..", - ".`''''`''''`''''`''''`..", - ".`''''`''''`''''`''''`..", + ".`''''`''''ss''''`''''`.", + ".`''''`''''ss''''`''''`.", + ".`''''`''''ss''''`''''`.", + ".`''''`''''ss''''`''''`.", + ".`''''`''''ss''''`''''`.", ".--~~~~~~--++--~~~~~~--.", ".| @@ @@ |.", ".| |.", @@ -24,7 +24,7 @@ ".| }}}} |.", ".|###### }}}} |/|/|/|.", ".| h # | | | |.", - ".| ttteee|^|^|^|.", + ".| C ttteee|^|^|^|.", ".|----+---------------|.", ".|& | }}}}}}}}} OOOO|.", ".| + O|.", @@ -33,9 +33,10 @@ "........4..............." ], "terrain": { - ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ], - " ": "t_floor", + ".": "t_region_groundcover_urban", + " ": "t_thconc_floor", "'": "t_pavement", + "s": "t_sidewalk", "`": "t_pavement_y", "+": "t_door_c", "*": "t_door_locked", @@ -47,6 +48,7 @@ }, "furniture": { "#": "f_counter", + "C": "f_counter_gate_c", "h": "f_stool", "t": [ "f_treadmill", "f_treadmill_mechanical" ], "e": [ "f_ergometer", "f_ergometer_mechanical" ], @@ -57,7 +59,7 @@ "^": [ "f_bigmirror", "f_bigmirror", "f_bigmirror", "f_bigmirror_b" ], "{": "f_rack", "}": "f_rack", - "O": [ "f_crate_c", "f_crate_c", "f_crate_c", "f_crate_o" ] + "O": [ "f_crate_c", "f_cardboard_box", "f_crate_o" ] }, "toilets": { "&": { } }, "items": { "O": { "item": "allsporting", "chance": 50 } }, @@ -73,7 +75,8 @@ { "group": "allsporting", "x": [ 10, 13 ], "y": 14, "chance": 90, "repeat": [ 1, 8 ] }, { "group": "allsporting", "x": [ 10, 13 ], "y": 15, "chance": 90, "repeat": [ 1, 8 ] }, { "group": "allsporting", "x": [ 8, 16 ], "y": 19, "chance": 80, "repeat": [ 1, 8 ] }, - { "group": "allsporting", "x": [ 8, 16 ], "y": 21, "chance": 80, "repeat": [ 1, 8 ] } + { "group": "allsporting", "x": [ 8, 16 ], "y": 21, "chance": 80, "repeat": [ 1, 8 ] }, + { "group": "cash_register_random", "x": [ 2, 7 ], "y": 15 } ], "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": 7, "chance": 2 } ] } From d6ad121c510364a6978c2c75e383e1e99843a00f Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:39:09 +0200 Subject: [PATCH 05/12] Update teashop.json cleanup, regional terrain, cash register, linoleum kitchen and toilet, fix incorrect terrain --- data/json/mapgen/teashop.json | 148 ++++++++++++++++------------------ 1 file changed, 69 insertions(+), 79 deletions(-) diff --git a/data/json/mapgen/teashop.json b/data/json/mapgen/teashop.json index 07ae57c544084..170282a3e7f76 100644 --- a/data/json/mapgen/teashop.json +++ b/data/json/mapgen/teashop.json @@ -7,96 +7,88 @@ "object": { "fill_ter": "t_floor", "rows": [ - "...S....................", - ".z.S.z..123123123123123.", - "...S....SSSSCTCSSSSSCSz.", - ".z.S.z..SCTCSSSSCTCSTSz.", - "...S....SSSSSCTCSSSSCSz.", - ".--+-ooo--OO-OO-OO-OO-..", - ".|,,,###|,ctc,,ctc,,t|..", - ".|{,,,,,|,,,,,,,,,,,c|..", - ".|{,tt,,,,,,c,,,,,,,,O..", - ".|{,tt,,,,,ctc,,c,,,,O..", - ".|,,,,,,|,,,c,,ctc,,c|..", - ".|6####,|c,,,,,,c,,,t|..", - ".|c,,,,,|t,,,,c,,,,,c|..", - ".|-+----|c,,,ctc,,,,,O..", - ".|#,F##K|,,,,,c,,,,c,O..", - ".|#,,,,,+,,,,,,,,,ctc|..", - ".|#,,vv,|,,ctc,,,,,c,|..", - ".|-+-----------+-----|..", - "...S&&|RRRR|Uv|,|vU|4...", - "...SSS+,,,R|,,+,+,,|....", - "......|------O-o-O--....", - "bbbbbbbbbbbbbbbbbbbbbbbb", - "bbbbbbbbbbbbbbbbbbbbbbbb", + "b..1S1.................b", + "b..1S1.................b", + "b..1S111SSSSCTCSSSSSCS.b", + "b..1SSSSSCTCSSSSCTCSTS.b", + "b..1S111SSSSSCTCSSSSCS.b", + "b.||+|o||||OO|OO|OO|||.b", + "b.|^,###|,ctc,,ctc,,^|.b", + "b.|{,,,,|,,,,,,,,,,,c|.b", + "b.|{,,,,,,,,c,,,,,,,tO.b", + "b.|{,,,,,,,ctc,,c,,,,O.b", + "b.|,,,,,|,,,c,,ctc,,c|.b", + "b.|#####|c,,,,,,c,,,t|.b", + "b.|,,c,,|t,,,,c,,,,,c|.b", + "b.|+|||||c,,,ctc,,,,,O.b", + "b.| F@@K|,,,,,c,,,,c,O.b", + "b.| +,,,,,,,,,ctc|.b", + "b.| @@@|^,ctc,,,,,c,|.b", + "b.|+|||||||||||+||||||.b", + "b.1S&&|RRRR|Uv|,|vU|4..b", + "b.1SSS+,,,,| +,+ |...b", + "b.1111|||||||O|o|O||...b", + "b......................b", + "b......................b", "bbbbbbbbbbbbbbbbbbbbbbbb" ], "terrain": { "#": "t_floor", - "&": "t_pavement", "+": "t_door_c", ",": "t_floor", + " ": "t_linoleum_white", + "v": "t_linoleum_white", + "U": "t_linoleum_white", + "F": "t_linoleum_white", + "@": "t_linoleum_white", + "K": "t_linoleum_white", "-": "t_wall_w", ".": "t_region_groundcover_urban", "1": "t_region_groundcover_urban", - "2": "t_region_groundcover_urban", - "3": "t_region_groundcover_urban", - "C": "t_sidewalk", "O": "t_window_domestic", "S": "t_sidewalk", + "&": "t_sidewalk", + "C": "t_sidewalk", "T": "t_sidewalk", - "_": "t_pavement", "o": "t_window", - "z": "t_region_shrub_decorative", "4": "t_gutter_downspout", - "|": "t_wall_w", - "b": [ "t_bamboo", "t_bamboo_long", "t_bamboo_tall" ] + "|": "t_wall_g", + "b": "t_bamboo_tall" }, "furniture": { - "6": "f_console_broken", + "1": "f_region_flower", + "^": [ "f_indoor_plant", "f_indoor_plant_y" ], "#": "f_counter", + "@": "f_cupboard", "&": "f_dumpster", - "1": "f_region_weed", - "2": "f_region_flower", - "3": [ "f_region_weed", "f_region_flower" ], "C": "f_chair", "F": "f_fridge", "K": "f_sink", "T": "f_table", - "c": "f_chair", - "t": "f_table", + "c": "f_armchair", "v": "f_sink", + "t": "f_table", "U": "f_toilet", - "R": "f_rack", + "R": "f_rack_wood", "{": "f_bookcase" }, "toilets": { "U": { } }, - "place_signs": [ { "signage": "The Red Dragon Tea Shop", "x": 4, "y": 4 } ], + "place_signs": [ { "signage": "The Red Dragon Tea Shop", "x": 2, "y": 4 } ], "place_items": [ - { "item": "tea_dishes", "x": 11, "y": 6, "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "tea_dishes", "x": 16, "y": 6, "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "tea_dishes", "x": 12, "y": 9, "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "tea_dishes", "x": 16, "y": 10, "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "tea_dishes", "x": 20, "y": 11, "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "tea_dishes", "x": 9, "y": 12, "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "tea_dishes", "x": 14, "y": 13, "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "tea_dishes", "x": 19, "y": 15, "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "tea_dishes", "x": 12, "y": 16, "chance": 30, "repeat": [ 1, 2 ] }, { "item": "corner_reader", "x": 20, "y": 6, "chance": 80, "repeat": [ 1, 2 ] }, + { "item": "teashop_bulk_teas", "x": [ 7, 10 ], "y": 18, "chance": 90, "repeat": [ 1, 20 ] }, { "item": "corner_weapon", "x": 20, "y": 6, "chance": 20 }, - { "item": "chair_extra", "x": 2, "y": 12, "chance": 80, "repeat": [ 1, 2 ] }, - { "item": "chair_torso", "x": 2, "y": 12, "chance": 80, "repeat": [ 1, 2 ] }, - { "item": "chair_hat", "x": 2, "y": 12, "chance": 30 }, - { "item": "chair_pants", "x": 2, "y": 12, "chance": 30 }, - { "item": "chair_feet", "x": 2, "y": 12, "chance": 30 }, - { "item": "displays", "x": 2, "y": [ 7, 9 ], "chance": 70, "repeat": [ 1, 8 ] }, + { "item": "displays", "x": 3, "y": [ 7, 9 ], "chance": 70, "repeat": [ 1, 8 ] }, { "item": "prepared_teas", "x": [ 5, 7 ], "y": 6, "chance": 70, "repeat": [ 1, 8 ] }, - { "item": "teashop_bulk_teas", "x": [ 4, 5 ], "y": [ 8, 9 ], "chance": 30, "repeat": [ 1, 8 ] }, - { "item": "teashop_kitchen_counter", "x": 2, "y": [ 14, 16 ], "chance": 80, "repeat": [ 1, 4 ] }, + { "item": "teashop_kitchen_counter", "x": [ 5, 7 ], "y": 16, "chance": 80, "repeat": [ 1, 4 ] }, { "item": "teashop_kitchen_counter", "x": [ 5, 6 ], "y": 14, "chance": 80, "repeat": [ 1, 3 ] }, - { "item": "teashop_fridge", "x": 4, "y": 14, "chance": 90, "repeat": [ 1, 8 ] } - ] + { "item": "teashop_fridge", "x": 4, "y": 14, "chance": 90, "repeat": [ 1, 8 ] }, + { "item": "cash_register_random", "x": [ 3, 7 ], "y": 11, "chance": 100 } + ], + "items": { + "t": { "item": "tea_dishes", "chance": 30, "repeat": [ 1, 2 ] }, + "T": { "item": "tea_dishes", "chance": 30, "repeat": [ 1, 2 ] } + } } }, { @@ -165,17 +157,17 @@ ".qqqqSSSqqqqqq|||OOO|||.", ".q...TSS.T..Tz|c,$$$&C|.", ".q.T..SSS@...zOtC,,,,t|T", - ".q...TSSS.3T.zOtC,,,,C|.", - "TqT...1SS4124z|c,,,,,Y|.", - ".q..T23SSSS1T||Y,C,C,,|.", - ".qT..3^1SSSSS+,,cttt,,|.", - ".q...4TSSSSSS+,,,tttc,|.", - ".q.T..SSSS134||Y,C,C,&|.", - ".q..@.SS.341.z|c,,,,,Y|.", - ".q...SSS1.2.TzOtC,,,,{|.", + ".q...TSSS.1T.zOtC,,,,C|.", + "TqT...1SS1111z|c,,,,,Y|.", + ".q..T11SSSS1T||Y,C,C,,|.", + ".qT..1^1SSSSS+,,cttt,,|.", + ".q...1TSSSSSS+,,,tttc,|.", + ".q.T..SSSS111||Y,C,C,&|.", + ".q..@.SS.111.z|c,,,,,Y|.", + ".q...SSS1.1.TzOtC,,,,{|.", ".q..TSS....T.zOtC,,,,{|T", ".q.T.SS.T....z|c,,,,,<|.", - ".q..SSS..T..|||||6##;||.", + ".q..SSS..T..|||||###-||.", ".wwW,,Www...|};;;;;;;|..", ".wc,,,c,w..T|};F|;;;;|..", ".Wt,,ctcW...|};F|K###|.T", @@ -191,18 +183,17 @@ "D": "t_door_locked", "+": "t_door_c", ";": "t_linoleum_gray", + "-": "t_linoleum_gray", ",": "t_floor", ".": "t_region_groundcover_urban", "T": [ [ "t_region_groundcover_urban", 3 ], [ "t_region_tree_shade", 2 ], "t_region_shrub_decorative" ], "z": "t_region_shrub_fruit", "@": "t_region_groundcover_urban", "1": "t_region_groundcover_urban", - "2": "t_region_groundcover_urban", - "3": "t_region_groundcover_urban", - "4": "t_region_groundcover_urban", "^": "t_region_groundcover_urban", "F": "t_linoleum_gray", "K": "t_linoleum_gray", + "}": "t_linoleum_gray", "O": "t_window_domestic", "S": "t_sidewalk", "_": "t_pavement", @@ -215,14 +206,11 @@ "q": "t_fence" }, "furniture": { - "6": "f_console_broken", "#": "f_counter", + "-": "f_counter_gate_c", "Y": "f_rack_coat", "&": "f_trashcan", - "1": "f_region_weed", - "2": "f_region_flower", - "3": "f_region_flower", - "4": "f_region_flower", + "1": "f_region_flower", "@": "f_statue", "F": "f_fridge", "K": "f_sink", @@ -243,7 +231,8 @@ "C": { "item": "chair_extra", "chance": 20, "repeat": [ 1, 2 ] }, "c": { "item": "chair_torso", "chance": 10, "repeat": [ 1, 3 ] } }, - "place_signs": [ { "signage": "The Green Leaf Tea Shop", "x": 4, "y": 0 } ] + "place_signs": [ { "signage": "The Green Leaf Tea Shop", "x": 4, "y": 0 } ], + "place_loot": [ { "group": "cash_register_random", "x": [ 17, 19 ], "y": 14 } ] } }, { @@ -260,7 +249,7 @@ " -.......- ", " -.||||||| ", " -.|SU|SU| ", - " --.|,,|,,| ", + " --.|__|__| ", " -t.|+|||+| ", " -C.O,,,,,| ", " --.||c,,c| ", @@ -286,8 +275,9 @@ ",": "t_floor", "c": "t_floor", "T": "t_floor", - "S": "t_floor", - "U": "t_floor", + "U": "t_linoleum_gray", + "S": "t_linoleum_gray", + "_": "t_linoleum_gray", "-": "t_railing", "+": "t_door_c", "O": "t_window_domestic", From e29c7be98bb1ebbff0306805c66e486a10005389 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:39:50 +0200 Subject: [PATCH 06/12] Update thrift.json concrete floor, cash register, cleanup, more used furniture --- data/json/mapgen/thrift.json | 92 ++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/data/json/mapgen/thrift.json b/data/json/mapgen/thrift.json index f49b99028735e..733e7cef7eab0 100644 --- a/data/json/mapgen/thrift.json +++ b/data/json/mapgen/thrift.json @@ -5,50 +5,43 @@ "om_terrain": [ "s_thrift" ], "weight": 500, "object": { - "fill_ter": "t_floor", + "fill_ter": "t_thconc_floor", "rows": [ - "rrrrrrrrrrrrrrrrrrrrrrrr", - "yrrryrrryrrryrrryrrryrrr", - "yrrryrrryrrryrrryrrryrrr", - "yrrryrrryrrryrrryrrryrrr", - "yrrryrrryrrryrrryrrryrrr", - "yrrryrrryrrryrrryrrryrrr", - "yyyyyyyyyyyyyyyyyyyyyyyy", + "rrrrrrrrrrrrrrrrrrrrr222", + "yrrryrrryrrryrrryrrry222", + "yrrryrrryrrryrrryrrry222", + "yrrryrrryrrryrrryrrry222", + "yrrryrrryrrryrrryrrry222", + "yrrryrrryrrryrrryrrry222", + "yyyyyyyyyyyyyyyyyyyyy222", "222222222222222222222222", - "................2222.222", - ".----66666666----gg-|222", - ".|I 7Voo |2<2", - ".|H A A A 7Woo |+-|", - ".|I A A A --gg-| L|", - ".|H A A oo |+-|", - ".|I A A oo | J|", - ".| C CCCC|FJ|", - ".|F F H C CF + K|", - ".|F F H oo ---|", - ".| H AAAAooAAA A|.", - ".|+-- oo A|.", - ".| B|AAAAAAAAooAAA A|.", + "222222222222222222222222", + ".----11111111----gg-|222", + ".|HH 1 ooV|2<2", + ".|HH A A A 1 ooW|+-|", + ".|HH A A A --gg-| L|", + ".|HH A A A oo |+-|", + ".|HH A A A oo | J|", + ".|HH A A A CCCC|FJ|", + ".|HH C F + K|", + ".|HH HH ---|", + ".| HH AAAAAAAAA a|.", + ".|+-- a|.", + ".| B|AAAAAAAAAAAAA a|.", ".|-----------------+--|.", - "...Z...........rUUrrU...", + "...Z...........2UU22U...", "........................" ], "terrain": { - " ": "t_floor", + " ": "t_thconc_floor", "+": "t_door_locked", "-": "t_wall_w", - ".": "t_grass", + ".": "t_region_groundcover_urban", "1": "t_window", - "2": "t_sidewalk", - "U": "t_pavement", - "3": "t_tree_young", - "4": "t_chaingate_l", - "5": "t_wall_wood", - "6": "t_wall_glass_h", - "7": "t_wall_glass_v", - "E": "t_dirtfloor", - "G": "t_dirtfloor", + "2": "t_concrete", + "U": "t_concrete", "g": "t_door_glass_c", - "o": "t_carpet_purple", + "o": "t_carpet_concrete_purple", "r": "t_pavement", "y": "t_pavement_y", "|": "t_wall_w", @@ -57,13 +50,27 @@ }, "furniture": { "A": "f_rack", + "a": "f_rack", "C": "f_counter", "D": "f_sink", "E": "f_sink", "F": "f_chair", "G": "f_locker", - "H": "f_table", - "I": "f_sofa", + "H": [ + "f_coffee_table", + "f_table", + "f_sofa", + "f_armchair", + "f_chair", + "f_desk", + "f_floor_lamp", + "f_rack_coat", + "f_exercise", + "f_treadmill", + "f_ergometer", + "f_wardrobe", + "f_bigmirror" + ], "J": "f_desk", "K": "f_filing_cabinet", "L": "f_locker", @@ -73,19 +80,12 @@ "toilets": { "B": { } }, "items": { "J": { "item": "office", "chance": 30, "repeat": [ 3, 4 ] }, + "A": { "item": "thrift_misc", "chance": 60, "repeat": [ 1, 6 ] }, + "a": { "item": "thrift_books", "chance": 60, "repeat": [ 1, 6 ] }, "K": { "item": "office_paper", "chance": 30 }, "L": { "item": "cleaning", "chance": 20, "repeat": [ 2, 4 ] } }, - "place_items": [ - { "item": "thrift_misc", "x": [ 9, 12 ], "y": 18, "chance": 75, "repeat": [ 1, 6 ] }, - { "item": "thrift_misc", "x": [ 15, 17 ], "y": 18, "chance": 75, "repeat": [ 1, 6 ] }, - { "item": "thrift_misc", "x": [ 5, 12 ], "y": 20, "chance": 75, "repeat": [ 1, 9 ] }, - { "item": "thrift_misc", "x": [ 15, 17 ], "y": 20, "chance": 75, "repeat": [ 1, 6 ] }, - { "item": "thrift_misc", "x": 6, "y": [ 11, 14 ], "chance": 75, "repeat": [ 1, 6 ] }, - { "item": "thrift_misc", "x": 9, "y": [ 11, 14 ], "chance": 75, "repeat": [ 1, 6 ] }, - { "item": "thrift_misc", "x": 12, "y": [ 11, 12 ], "chance": 75, "repeat": [ 1, 6 ] }, - { "item": "thrift_books", "x": 21, "y": [ 18, 20 ], "chance": 75, "repeat": [ 1, 10 ] } - ] + "place_items": [ { "item": "cash_register_random", "x": [ 16, 19 ], "y": 15, "chance": 100 } ] } }, { From eadccb202884cb4a9f60a2c41d115b15c8906d6b Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:40:36 +0200 Subject: [PATCH 07/12] Update veterinarian.json linoleum floor, cleanup, cash register --- data/json/mapgen/veterinarian.json | 79 ++++++++++++++---------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/data/json/mapgen/veterinarian.json b/data/json/mapgen/veterinarian.json index c396400784283..fba932150c7ba 100644 --- a/data/json/mapgen/veterinarian.json +++ b/data/json/mapgen/veterinarian.json @@ -5,53 +5,50 @@ "om_terrain": [ "veterinarian" ], "weight": 400, "object": { - "fill_ter": "t_floor", + "fill_ter": "t_linoleum_gray", "rows": [ - " ", - " ", - " ", - " ", - " ", - " ~~~~~~~~~~~~~~~~~~~~~~ ", - " *--OO--OO--::--------* ", - " *-TccccccTy..#%.c-?R-* ", - " *-...........#c.d-sl-* ", - " *-.ccccccT...--+---+-* ", - " *-...........-E.#...-* ", - " *--+---+---..-E...T.-* ", - " *-ll-y....-..+....T.-* ", - " *-sl-.ddd.-++---i----* ", - " *-lt-].c..+..-rr..==-* ", - " *----------..-#...^l-4 ", - " **~~~~~~~~;..-#...==-* ", - " ~-..i....^l-* ", - " ~-i--#...==-* ", - " D-.r-d...^l-* ", - " *-.$-]]%.==-* ", - " *-----------* ", - " ************* ", - " " + "~~~ ~~~", + "~*~ ~*~", + "~*~ ~*~", + "~*~ ~*~", + "~*~ ~*~", + "~~~~~~~~~~~~~~~~~~~~~~~~", + "--||OO||OO||::||||||||--", + "--|TccccccTy..#%.c|?R|--", + "--|...........#c.d|s.|--", + "--|.ccccccT...||+|||+|--", + "--|...........|E.#...|--", + "--||+|||+|||..|E...T.|--", + "--|..|y....|..+....T.|--", + "--|s.|.ddd.|++|||i||||--", + "--|.t|].c..+..|rr..^l|--", + "--||||||||||..|#...==|4-", + "--~~~~~~~~~;..|#...^l|--", + "--~~~~~~~~~|..i....==|--", + "--~~~~~~~DD|i||#...^l|--", + "--~~~~~~~DD|.r|d...==|--", + "--~~~~~~~DD|.$|]]%.^l|--", + "--~~~~~~~~~|||||||||||--", + "------------------------", + "------------------------" ], "terrain": { " ": "t_pavement", - "*": "t_region_shrub", + "*": "t_region_shrub_decorative", + "-": "t_region_groundcover_urban", "+": "t_door_c", ",": "t_pavement_y", - "-": "t_wall_w", - ".": "t_floor", + "|": "t_wall_p", + ".": "t_linoleum_gray", + "l": "t_thconc_floor", ":": "t_door_glass_c", ";": "t_door_locked", "=": "t_chainfence_h", - "?": "t_linoleum_white", "O": "t_window", - "R": "t_linoleum_white", "^": "t_chaingate_c", "i": [ [ "t_door_locked_interior", 2 ], "t_door_c" ], - "l": "t_linoleum_white", - "s": "t_linoleum_white", - "t": "t_linoleum_white", - "D": "t_sidewalk", - "~": "t_sidewalk", + "D": "t_concrete", + "~": "t_concrete", "4": "t_gutter_downspout" }, "furniture": { @@ -59,7 +56,7 @@ "#": "f_counter", "$": "f_safe_l", "?": "f_counter", - "D": "f_trashcan", + "D": "f_dumpster", "E": "f_cupboard", "R": "f_locker", "T": "f_table", @@ -89,7 +86,8 @@ { "item": "office", "x": [ 15, 16 ], "y": 20, "chance": 40, "repeat": [ 1, 2 ] }, { "item": "office", "x": 17, "y": 8, "chance": 40, "repeat": [ 1, 2 ] }, { "item": "office", "x": [ 7, 9 ], "y": 13, "chance": 40, "repeat": [ 2, 5 ] }, - { "item": "doctors_books", "x": 5, "y": 14, "chance": 35, "repeat": [ 1, 3 ] } + { "item": "doctors_books", "x": 5, "y": 14, "chance": 35, "repeat": [ 1, 3 ] }, + { "item": "cash_register_random", "x": 14, "y": [ 7, 8 ], "chance": 100 } ], "place_monsters": [ { "monster": "GROUP_VETS", "x": 20, "y": 19, "chance": 10 }, @@ -97,10 +95,9 @@ { "monster": "GROUP_VETS", "x": 20, "y": 15, "chance": 10 } ], "place_vehicles": [ - { "vehicle": "VETS", "x": 6, "y": 19, "chance": 20 }, - { "vehicle": "VETS", "x": 7, "y": 2, "chance": 15, "rotation": [ 2, 3 ] }, - { "vehicle": "VETS", "x": 15, "y": 2, "chance": 15, "rotation": [ 2, 3 ] }, - { "vehicle": "VETS", "x": 23, "y": 2, "chance": 15, "rotation": [ 2, 3 ] } + { "vehicle": "VETS", "x": 7, "y": 2, "chance": 20, "rotation": 1 }, + { "vehicle": "VETS", "x": 15, "y": 2, "chance": 20, "rotation": 1 }, + { "vehicle": "VETS", "x": 23, "y": 2, "chance": 20, "rotation": 1 } ] } }, From 180e4962427ad78097f88abba56f823908c2a4d4 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:41:38 +0200 Subject: [PATCH 08/12] Update homeimprovement_superstore_new.json vehicle variety, cash register, nested tents --- .../homeimprovement_superstore_new.json | 103 +++++++++--------- 1 file changed, 53 insertions(+), 50 deletions(-) diff --git a/data/json/mapgen/homeimprovement_superstore_new.json b/data/json/mapgen/homeimprovement_superstore_new.json index b565dcfddea11..248e342c5bdbe 100644 --- a/data/json/mapgen/homeimprovement_superstore_new.json +++ b/data/json/mapgen/homeimprovement_superstore_new.json @@ -24,21 +24,21 @@ " f SSS nn|^.77777.^|......|...........||", " f000000 SS nnn|||||||||||......|8.........8| ", " f0000000 SSS |.6666666........|8...999...8| ", - " f}}}}}00 SS nnnn|................|8...999...8| ", - " f}MMM}00 SS nnnn|.6666666........|8...999...8| ", - " f}MMM}00SSS |?????????.......|8...999...8| ", - " f}MMM}00SS nnnnn|................|8...999...8||", - " f}}{}}00SS nnnnn|.4444444........|8.........8=&", - " f0H00H00SS |.4444444........|...........= ", - " f0000000SSSSSSSS|............................= ", + " f{000000 SS nnnn|................|8...999...8| ", + " f0000000 SS nnnn|.6666666........|8...999...8| ", + " f0000000SSS |?????????.......|8...999...8| ", + " f0000000SS nnnnn|................|8...999...8||", + " f0000000SS nnnnn|.4444444........|8.........8=&", + " f0000000SS |.4444444........|...........= ", + " f0H00H00SSSSSSSS|............................= ", " f0000000SS |?????????...................= ", - " f00000H0SS & & &|.5555555....................=&", - " f0}}{}}0SS |............................||", - " f0}MMM}0SSS& & &|.5555555..^....^|.888888888.| ", - " f0}MMM}0 SS ||||||||||||=!!=|||||||||||||| ", - " f0}MMM}0/SS& & &|QQ'Q'kk'@@@?..?bbbibbi((itis| ", - " f0}}}}}0 SSS |QQ'Q'''''''?..?bbbibbiiiitis| ", - " f0/0000 SS & &|'''''kk''P'?..?bbiibbi((itis| ", + " f0M000H0SS & & &|.5555555....................=&", + " f0000000SS |............................||", + " f0000000SSS& & &|.5555555..^....^|.888888888.| ", + " f0000000 SS ||||||||||||=!!=|||||||||||||| ", + " f0000000/SS& & &|QQ'Q'kk'@@@?..?bbbibbi((itis| ", + " f0000000 SSS |QQ'Q'''''''?..?bbbibbiiiitis| ", + " f000000 SS & &|'''''kk''P'?..?bbiibbi((itis| ", " f000000 / SSS |'''''''''''?..?iiiiiiiiiiiis||", " f00000 SSS &=^..........................^=&", " f000 SSSS!............................= ", @@ -59,33 +59,33 @@ " W...............|....................||+|||+|| ", " |...............|....................|iis|sii| ", " |...............|....................|iis|sii| ", - " W..............X|...|dd|......|dd|...|iis|sii| ", - " |..............X|...xh.c......c..x...|iis|sii| ", + " W..............X|...|cx|......|xc|...|iis|sii| ", + " |..............X|...ch.c......c..c...|iis|sii| ", "f|.......g...X.XX|...c..c......c.hc...|i|||||i| ", - "f|#######|||+|WW||...c.hx......xh.c...|i+t|t+i| ", + "f|#######|||+|WW||...c.hc......ch.c...|i+t|t+i| ", "fS_______g|I..xdd|...|dd|......|dd|...|i|||||i| ", "fS_______S|I..h.c|....................|i+t|t+i| ", "fS_______SWx.....|$..................V|i|||||i| ", "fS_______SWdh....|$......^....^......V|i+t|t+i| ", "fS_______S|I..h.c|......||=!!=||......|i|||||i| ", - "fS_______S|I..xdd|......|/ SS /|......|i+t|t+i| ", - "fS_______S|||||||||====|| SS ||====|||||||||| ", - "/S_______SSSS & / &SSSSSSSSSSSSSSS.........=S", - "&S_______SSSSS /& & SSSSSSSSSSSSSSSS.........=S", - " S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSS=========|S", - " S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS", - "&S_______SS____,____,____,____,____,____,____SSS", - "/S_______SS____,____,____,____,____,____,____SSS", - "&S_______SS____,____,____,____,____,____,____S/S", - " S_______SS____,____,____,____,____,____,____S S", - " S_______SS____,____,____,____,____,____,____SBS", - "&S_______SS____,____,____,____,____,____,____SBS", - "/S_______SS____,____,____,____,____,____,____SBS", - "&S_______SS____,____,____,____,____,____,____SBS", - " S_______SS____,____,____,____,____,____,____S S", - " S_______SS__________________________________S/S", - "&S_______SS__________________________________SSS", - "/S_______SS__________________________________SSS", + "fS_______S|I..xdd|......|SSSSSS|......|i+t|t+i| ", + "fS_______S|||||||||====||SSSSSS||====||||||||||&", + "/S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSS.........=/", + "&S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSS.........=&", + " S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSS=========| ", + " S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS ", + "&S_______SS____,____,____,____,____,____,____SS&", + "/S_______SS____,____,____,____,____,____,____SS/", + "&S_______SS____,____,____,____,____,____,____SS&", + " S_______SS____,____,____,____,____,____,____SS ", + " S_______SS____,____,____,____,____,____,____SS ", + "&S_______SS____,____,____,____,____,____,____SS&", + "/S_______SS____,____,____,____,____,____,____SS/", + "&S_______SS____,____,____,____,____,____,____SS&", + " S_______SS____,____,____,____,____,____,____SS ", + " S_______SS__________________________________SS ", + "&S_______SS__________________________________SS&", + "/S_______SS__________________________________SS/", "************************************************", "*zzzzz***********??????????????????????????????*", "*zzzzz***********?zzzzzzzzzzzzzzzzzzzzzzzzzzzz??", @@ -160,6 +160,12 @@ "************************************************" ], "palettes": [ "home_improvement_palette" ], + "place_loot": [ + { "group": "cash_register_random", "x": 21, "y": [ 46, 47 ] }, + { "group": "cash_register_random", "x": 24, "y": [ 46, 47 ] }, + { "group": "cash_register_random", "x": 31, "y": [ 46, 47 ] }, + { "group": "cash_register_random", "x": 34, "y": [ 46, 47 ] } + ], "items": { "d": { "item": "office", "chance": 45, "repeat": [ 1, 2 ] }, "D": { "item": "hardware_trash", "chance": 40, "repeat": [ 1, 3 ] }, @@ -199,14 +205,14 @@ ], "place_vehicles": [ { "vehicle": "warehouse_vehicles", "x": [ 5, 12 ], "y": [ 42, 45 ], "chance": 100 }, - { "vehicle": "shopping_cart", "x": [ 37, 46 ], "y": [ 56, 57 ], "chance": 35, "repeat": 8 }, - { "vehicle": "car", "x": 42, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, - { "vehicle": "car", "x": 37, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, - { "vehicle": "car", "x": 32, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, - { "vehicle": "car", "x": 27, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, - { "vehicle": "car", "x": 22, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, - { "vehicle": "car", "x": 17, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, - { "vehicle": "car", "x": 12, "y": [ 62, 65 ], "chance": 15, "rotation": 270 } + { "vehicle": "shopping_cart", "x": [ 37, 46 ], "y": [ 56, 57 ], "chance": 100, "repeat": [ 1, 8 ] }, + { "vehicle": "parking_garage", "x": 42, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, + { "vehicle": "parking_garage", "x": 37, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, + { "vehicle": "parking_garage", "x": 32, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, + { "vehicle": "parking_garage", "x": 27, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, + { "vehicle": "parking_garage", "x": 22, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, + { "vehicle": "parking_garage", "x": 17, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }, + { "vehicle": "parking_garage", "x": 12, "y": [ 62, 65 ], "chance": 15, "rotation": 270 } ] } }, @@ -219,14 +225,13 @@ "$": "t_atm", "&": "t_region_groundcover_urban", "B": "t_region_groundcover_urban", - " ": [ [ "t_region_groundcover_urban", 10 ], "t_region_shrub" ], - "/": [ [ "t_region_tree", 2 ], "t_region_shrub" ], + " ": "t_region_groundcover_urban", + "/": "t_region_tree", "0": "t_grass_golf", "a": "t_sandmound", "A": "t_claymound", "M": "t_grass_golf", "{": "t_grass_golf", - "}": "t_grass_golf", "H": "t_grass_golf", "~": "t_woodchips", "n": "t_dirtmound", @@ -317,15 +322,13 @@ "q": "f_bookcase", "B": "f_bench", "&": "f_region_flower", - "M": "f_fema_groundsheet", - "{": "f_canvas_door", - "}": "f_canvas_wall", "H": "f_camp_chair", "X": [ [ "f_crate_c", 3 ], "f_crate_o" ], "D": "f_dumpster", "O": "f_air_conditioner", "j": "f_standing_tank", "J": "f_water_heater" - } + }, + "nested": { "M": { "chunks": [ "tent_5x5_N" ] }, "{": { "chunks": [ "tent_5x5_S" ] } } } ] From 1ceb13d96e0e2ce1fed3dd0a44872100bf8e271c Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:42:06 +0200 Subject: [PATCH 09/12] Update homeimprovement.json cash register, concrete floor --- data/json/mapgen/homeimprovement.json | 63 ++++++++++++++------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/data/json/mapgen/homeimprovement.json b/data/json/mapgen/homeimprovement.json index f9117684e7520..49abf1fdc56f2 100644 --- a/data/json/mapgen/homeimprovement.json +++ b/data/json/mapgen/homeimprovement.json @@ -5,41 +5,41 @@ "om_terrain": [ "home_improvement" ], "weight": 10000, "object": { - "fill_ter": "t_floor", + "fill_ter": "t_thconc_floor", "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",----------++---------|,", - ",|.@.@.@.@.rr.#....???|,", - ",O.........rr.#.A....?O,", - ",|.@.@.@.@.rr.#%###..?|,", - ",|rrrrrrrrrrrrrrrrrrrr|,", - ",|rrrrrrrrrrrrrrrrrrrr|,", - ",|:::::::::rryyyyyyyyy|,", - ",|.........rr.........|,", - ",|111111111rrLLLLLLLLL|,", - ",|rrrrrrrrrrrrrrrrrrrr|,", - ",|rrrrrrrrrrrrrrrrrrrr|,", - ",OSSSSSSSSSrr333333333O,", - ",O222222222rr333333333O,", - ",|rrrrrrrrrrrrrrrrrrrr|,", - ",||+|||rrrrrrrrrrrrrrr|,", - ",|y.ll|####rr#########|,", - ",OI...|#...rr.........O,", - ",|Ih.S|####rr#########|,", - ",O--+-|#...rr.........O,", - ",|6..&|####rr#########|,", - ",---------------------|,", - ",,,,,,,,,U Date: Sun, 8 May 2022 20:42:55 +0200 Subject: [PATCH 10/12] Update s_electronicstore.json cash register, concrete back alley --- data/json/mapgen/store/s_electronicstore.json | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/data/json/mapgen/store/s_electronicstore.json b/data/json/mapgen/store/s_electronicstore.json index 204598829660f..b29846c924d9d 100644 --- a/data/json/mapgen/store/s_electronicstore.json +++ b/data/json/mapgen/store/s_electronicstore.json @@ -6,11 +6,11 @@ "object": { "fill_ter": "t_linoleum_white", "rows": [ - "! sssssss ss !", - "! sssssss -w+- !", + "ssssssssssssssssssssssss", + "ssssssssssssssss-w+-ssss", "!--WW-GG---------,,----!", "!-.......t......-,,-ST-!", - "!-.......t......--,-..-!", + "!-.......t..c...--,-..-!", "!-.......txnnnn.-<,-+--!", "!-.1111.........----..-!", "!-.2222.^^^^^...4444..-!", @@ -22,17 +22,18 @@ "!-......^^^^^.444444-!!!", "!-.3333.......-------- ", "!--------.....ooo-dd}- ", - "!!!!%-__-........+.c.- ", - "!!!!!=__----++-------- ", + "!(((%-__-........+.c.- ", + "!(((!=__----++-------- ", "!!!!!=________O- ", - "!!!!(-________O- ", - "!!!!(----O____O- ", - "!!!!! -OO____- ", - "!!!!( -------- ", - "!!!!( " + "!!!!!-________O- ", + "!!!!!----O____O- ", + " -OO____- ", + " -------- ", + " " ], "palettes": [ "electro_palette" ], - "terrain": { " ": "t_region_groundcover_urban", "%": "t_gutter_downspout" } + "terrain": { " ": "t_region_groundcover_urban", "%": "t_gutter_downspout" }, + "place_loot": [ { "group": "cash_register_random", "x": 9, "y": [ 3, 5 ] } ] } }, { From c4decc9425bed50cbcd455677d823c27bc7c8c72 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:43:35 +0200 Subject: [PATCH 11/12] Update electronic_palette.json --- data/json/mapgen_palettes/electronic_palette.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/mapgen_palettes/electronic_palette.json b/data/json/mapgen_palettes/electronic_palette.json index 1bf23f1517665..7eafc256682f0 100644 --- a/data/json/mapgen_palettes/electronic_palette.json +++ b/data/json/mapgen_palettes/electronic_palette.json @@ -8,7 +8,7 @@ "_": "t_thconc_floor", "^": "t_carpet_yellow", "C": "t_carpet_yellow", - "!": "t_pavement", + "!": "t_concrete", "+": "t_door_c", "-": "t_brick_wall", "=": "t_door_metal_c", @@ -22,7 +22,7 @@ "<": "t_stairs_up", "|": "t_ladder_up", "O": "t_thconc_floor", - "(": "t_pavement" + "(": "t_concrete" }, "furniture": { "x": "f_console_broken", @@ -38,8 +38,8 @@ "S": "f_sink", "}": "f_filing_cabinet", "c": "f_chair", - "o": "f_crate_c", - "O": "f_crate_c", + "o": "f_cardboard_box", + "O": "f_cardboard_box", "(": "f_dumpster" }, "toilets": { "T": { } }, From 684cc3e95f430899fbc0b2312c676366b05c4ef1 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:44:31 +0200 Subject: [PATCH 12/12] Update s_clothing.json cash registers, linoleum toilet --- data/json/mapgen/s_clothing.json | 83 ++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/data/json/mapgen/s_clothing.json b/data/json/mapgen/s_clothing.json index 7be0cf6e8b759..f0a0b487204c3 100644 --- a/data/json/mapgen/s_clothing.json +++ b/data/json/mapgen/s_clothing.json @@ -29,13 +29,15 @@ "..#cccccccc|b |||#..", "..# |+||dd#..", "..#+||+||+|||+|| + so..", - "..# b| b| b|t S|LL|D$#..", + "..# b| b| b|t_S|LL|D$#..", "..####################..", "....................4..." ], "palettes": [ "standard_building_palette", "clothes_store_palette" ], + "terrain": { "t": "t_linoleum_white", "S": "t_linoleum_white", "_": "t_linoleum_white" }, "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 0 ], "y": [ 23, 23 ], "chance": 2, "repeat": [ 2, 3 ] } ], - "vehicles": { " ": { "vehicle": "shopping_cart", "chance": 1, "status": 0 } } + "vehicles": { " ": { "vehicle": "shopping_cart", "chance": 1, "status": 0 } }, + "place_loot": [ { "group": "cash_register_random", "x": 16, "y": [ 5, 7 ] } ] } }, { @@ -106,7 +108,7 @@ "...#c & &c| |c&c & #..", "...#||||+|| ||||||+#..", "...# b| & c #..", - "...o | % #..", + "...o | c #..", "...# h + c #..", "...#b |b cs #..", "...#||||h & & y|||+#..", @@ -117,14 +119,16 @@ "...#|||| | hd#..", "...#b + hhb y| b#..", "...# h ||+||||||||[ #..", - "...o |S |d[]b f|dh o..", - "...# b|t |dh + ;..", + "...o |S_|d[]b f|dh o..", + "...# b|t_|dh + ;..", "...######o####o#######..", - "....4..ppp...ppp........", + "....4...ppp..ppp........", "........................", "........................" ], - "palettes": [ "standard_building_palette", "tailor_palette" ] + "palettes": [ "standard_building_palette", "tailor_palette" ], + "terrain": { "t": "t_linoleum_white", "S": "t_linoleum_white", "_": "t_linoleum_white" }, + "place_loot": [ { "group": "cash_register_random", "x": 18, "y": [ 6, 9 ] } ] } }, { @@ -193,7 +197,7 @@ "..p--#JJ|& &#......", "..p--# | #......", "..p--#+||b yA y#......", - "..p--# %c h#......", + "..p--# [c h#......", "..p--# c h#......", "..p--# c ccc h#......", "..p--# c b#......", @@ -202,8 +206,8 @@ "..p--# [[[ | s%#......", "..p--# h | #......", "..p--; h |+||||#......", - ".....0 [[ + #......", - "....z#|+||i|||bSt#......", + ".....0 [[ +___#......", + "....z#|+||i|||_St#......", "....z#d | #####......", "....z#dh|LLLL#4zzz......", "....z##0######z.........", @@ -211,7 +215,9 @@ "........................", "........................" ], - "palettes": [ "standard_building_palette", "furs_palette" ] + "palettes": [ "standard_building_palette", "furs_palette" ], + "terrain": { "t": "t_linoleum_white", "S": "t_linoleum_white", "_": "t_linoleum_white" }, + "place_loot": [ { "group": "cash_register_random", "x": 7, "y": 7 } ] } }, { @@ -278,9 +284,9 @@ "~~~~~~~~~~~~~~~~~~~~~~~~", "~~~~11~~~~1111~~~11~~~~~", "***|===::----==::==|****", - "***|]....%.|##...#@|****", + "***|]....#.|##...#@|****", "***|]....#.|.......|****", - "***|]......|%#.....|****", + "***|]......|##.....|****", "***|]..]..]|.#....U|****", "***|]..]..]|&#....U|****", "***|]..]..]|.......|****", @@ -292,7 +298,7 @@ "***|dd|o.......+..]|****", "***|.h|o..TTh.F|---|****", "***O..|o..hh..}|ust|****", - "***|..+........+...O****", + "***|..+........+___O****", "***|--|--O-+---|---|****", "******4***~~~***********", "**********~~~***********", @@ -304,6 +310,10 @@ "+": "t_door_c", "-": "t_wall_w", ".": "t_floor", + "u": "t_linoleum_white", + "s": "t_linoleum_white", + "t": "t_linoleum_white", + "_": "t_linoleum_white", ":": "t_door_glass_c", "=": "t_wall_glass", "O": "t_window", @@ -315,14 +325,13 @@ }, "sealed_item": { "1": { "item": { "item": "seed_rose" }, "furniture": "f_planter_harvest" } }, "furniture": { - "%": "f_console_broken", "#": "f_counter", "&": "f_counter_gate_c", "@": "f_mannequin", "F": "f_fridge", "T": "f_table", "U": "f_bigmirror", - "]": "f_rack", + "]": "f_clothing_rail", "d": "f_desk", "h": "f_chair", "o": "f_sofa", @@ -345,7 +354,9 @@ { "item": "livingroom", "x": 14, "y": 17, "chance": 30 }, { "item": "office", "x": [ 4, 5 ], "y": 15, "chance": 50 }, { "item": "cleaning", "x": 18, "y": 15, "chance": 50 }, - { "item": "trash", "x": 16, "y": 17, "chance": 75 } + { "item": "trash", "x": 16, "y": 17, "chance": 75 }, + { "item": "cash_register_random", "x": 9, "y": [ 4, 5 ], "chance": 100 }, + { "item": "cash_register_random", "x": 13, "y": [ 6, 8 ], "chance": 100 } ] } }, @@ -415,8 +426,8 @@ ".#:::::**::::::**:::::#.", ".#cy@c c@y@ c c@y@#.", ".# sc #.", - ".#|||| c c @c #.", - ".#b | cccc%c #.", + ".#|||| c s c @c #.", + ".#b | cccccc #.", ".# + [@ R#.", ".o h | @@ [@ R#.", ".#|||| [[ RRR R#.", @@ -424,8 +435,8 @@ ".# h + [@ R#.", ".#b |RRRRRRRR R#.", ".###########||||+|||+|#.", - ".zzzz4zzzzz#<|dd ]| S#.", - "..........z#+|h ]| t#.", + ".zzzz4zzzzz#<|dd ]|_S#.", + "..........z#+|h ]|_t#.", "..........z# ]|||#.", "-----------+ ff + L#.", "..........z#####o######.", @@ -434,7 +445,9 @@ "........................", "........................" ], - "palettes": [ "standard_building_palette", "tailor_palette" ] + "palettes": [ "standard_building_palette", "tailor_palette" ], + "terrain": { "t": "t_linoleum_white", "S": "t_linoleum_white", "_": "t_linoleum_white" }, + "place_loot": [ { "group": "cash_register_random", "repeat": 2, "x": [ 10, 13 ], "y": 7 } ] } }, { @@ -559,9 +572,9 @@ "*|[..........@....|h.h|*", "*|[...............+...|*", "*|--+|-+|..@...@..|d..O*", - "*|h..|u.|.........|dh.|*", - "*|...|s.|..@...@..|]..|*", - "*|U..|t.|........y|]..|*", + "*|h..|u_|.........|dh.|*", + "*|...|s_|..@...@..|]..|*", + "*|U..|t_|........y|]..|*", "*|-O-|--|::-|.----|--.|*", "*zrzrzrzr~~r|.[[[[[[[.|*", "*********~~z|.........|4", @@ -580,6 +593,10 @@ "+": "t_door_c", "-": "t_brick_wall", ".": "t_floor", + "_": "t_linoleum_gray", + "u": "t_linoleum_gray", + "s": "t_linoleum_gray", + "t": "t_linoleum_gray", "0": "t_window_alarm", ":": "t_door_glass_c", ";": "t_door_locked", @@ -587,9 +604,9 @@ "H": "t_sidewalk", "O": "t_window", "T": "t_sidewalk", - "^": "t_region_tree", + "^": "t_region_tree_fruit", "r": "t_region_groundcover_urban", - "z": "t_region_shrub", + "z": "t_region_shrub_decorative", "|": "t_brick_wall", "~": "t_sidewalk", "R": "t_region_groundcover_urban", @@ -603,7 +620,7 @@ "T": "f_table", "&": "f_birdbath", "U": "f_bigmirror", - "[": "f_rack", + "[": "f_clothing_rail", "]": "f_bookcase", "d": "f_desk", "f": "f_indoor_plant", @@ -707,7 +724,7 @@ "..# #..", "..#J W W K#..", "..#J W cccc W K#..", - "..#J W c % W T#..", + "..#J W c c W T#..", "..oc c sc T#..", "..#U & c cc M I#..", "..#U M M I#..", @@ -716,15 +733,17 @@ "..#y b#..", "..# b [[& y#..", "..#+|||||||||+||+||+|#..", - "..# l| h| h| D#..", - ".4# h[[h l| | | #..", + "..# l| h| h|_D#..", + ".4# h[[h l| | |__#..", "..#n |b |b |St#..", "..#####o###+#######o##..", "...........-............", "...........-............", "...........-............" ], - "palettes": [ "standard_building_palette", "clothes_store_palette" ] + "palettes": [ "standard_building_palette", "clothes_store_palette" ], + "terrain": { "t": "t_linoleum_white", "S": "t_linoleum_white", "_": "t_linoleum_white", "D": "t_linoleum_white" }, + "place_loot": [ { "group": "cash_register_random", "x": [ 10, 13 ], "y": 7 } ] } }, {