From eea97b28346f461722e8f29a030521c2a8f1bead Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 19:58:36 +0200 Subject: [PATCH 01/12] Update s_coffee.json cash register, counter gates --- data/json/mapgen/s_coffee.json | 141 ++++++++++++++++----------------- 1 file changed, 68 insertions(+), 73 deletions(-) diff --git a/data/json/mapgen/s_coffee.json b/data/json/mapgen/s_coffee.json index 67e1e60eaefbd..d75df8bb5b2a2 100644 --- a/data/json/mapgen/s_coffee.json +++ b/data/json/mapgen/s_coffee.json @@ -13,20 +13,20 @@ "fill_ter": "t_floor", "rows": [ "S___________SSTzzzzzzzTS", - "S_____,_____SSzMbMbMbMzS", - "S_____,_____SSSSSSSS/MzS", - "S_____,_____SSSSSSSS/MzS", - "S_____,_____SSzzzSSS/MzS", + "S_____,_____SSzMMMMMMMzS", + "S_____,_____SSSSSSSSSMzS", + "S_____,_____SSSSSSSSSMzS", + "S_____,_____SSSSSSSSSMzS", "S_____,_____SS||V{{{V||S", "S_____,_____SS|D <|S", "SSSSSSSSSSSSSS|r OS", "SSSSSSSSSSSSSS|r |S", - "SVVVVVVVz./Mzz| #W##|S", - "SVD>>>>Vz./bMzV #ww%|S", - "SV BBB>Vz.b/..{ xwwF|S", - "SV B>Vz.Mb..{ flwl|S", - "SV B>Vz....zV flwU|S", - "SV B>Vzbbbzz|X #wwG|S", + "SVVVVVVVzMSSzz| #W##|S", + "SVD>>>>VzMSSMzV #ww%|S", + "SV BBB>VzMSSSS{ xwwF|S", + "SV B>VzMSSSS{ flwl|S", + "SV B>VzMMMMzV flwU|S", + "SV B>Vzzzzzz|X #wwG|S", "S|B ^||||||||||^ ||I||S", "SO6 B|=;|;=|99 r|FwC|S", "S|B 6|=A|A=|9 r|Fwc|S", @@ -45,7 +45,6 @@ "+": "t_door_c", ",": "t_pavement_y", ".": "t_region_groundcover_urban", - "/": "t_region_groundcover_barren", "3": [ "t_door_locked", "t_door_locked_alarm" ], ";": "t_linoleum_white", "=": "t_linoleum_white", @@ -55,14 +54,13 @@ "G": "t_linoleum_white", "I": "t_door_locked_interior", "L": "t_linoleum_white", - "M": "t_region_groundcover_barren", + "M": "t_region_groundcover_urban", "O": "t_window", "S": "t_sidewalk", "U": "t_linoleum_white", "V": "t_wall_glass", - "W": "t_fencegate_c", + "W": "t_linoleum_white", "_": "t_pavement", - "b": "t_dirt", "c": "t_linoleum_white", "f": "t_linoleum_white", "l": "t_linoleum_white", @@ -75,10 +73,10 @@ "T": "t_tree_coffee" }, "furniture": { - "x": "f_console_broken", + "x": "f_counter", "#": "f_counter", + "W": "f_counter_gate_c", "%": "f_trashcan", - "/": "f_bluebell", "6": "f_table", "9": "f_rack", ">": "f_counter", @@ -94,13 +92,13 @@ "U": "f_sink", "X": "f_rack", "^": "f_indoor_plant", - "b": "f_region_weed", "f": "f_glass_fridge", "l": "f_rack", "r": "f_rack" }, "toilets": { ";": { } }, "items": { + "x": { "item": "cash_register_random", "chance": 100 }, "#": { "item": "coffee_counter", "chance": 10 }, "6": { "item": "coffee_table", "chance": 35 }, "9": { "item": "coffee_display_2", "chance": 85, "repeat": [ 1, 8 ] }, @@ -184,17 +182,17 @@ "weight": 250, "object": { "//": "Default fill is floor but some tables are outside", - "fill_ter": "t_floor", + "fill_ter": "t_linoleum_white", "rows": [ "_______,,,,,,,ss########", "______________ss#pppppp#", - "______________ssspHTTHp#", + "______________sssphtthp#", "______________ssspppppp#", - "______________ssspHppHp#", - "_______,,,,,,,ssspTppTp#", - "______________ssspHppHp#", + "______________sssphpphp#", + "_______,,,,,,,sssptpptp#", + "______________sssphpphp#", "______________ssspppppp#", - "______________ss#pHTTHp#", + "______________ss#phtthp#", "______________ss#pppppp#", "_______,,,,,,,ss|-5555-|", "______________ss|.HTTH.|", @@ -208,51 +206,44 @@ "|......................|", "|-D---D---cWWcccxccxccc|", "|S==|==S|==============|", - "|P==|==P|llSO==rrrrrSTe|", + "|P==|==P|llSO==rrrrrSce|", "|-------------L--------|" ], - "set": [ - { "line": "terrain", "id": "t_concrete", "x": 21, "x2": 18, "y": 2, "y2": 2 }, - { "line": "terrain", "id": "t_concrete", "x": 21, "x2": 18, "y": 8, "y2": 8 }, - { "line": "terrain", "id": "t_concrete", "x": 21, "x2": 21, "y": 6, "y2": 4 }, - { "line": "terrain", "id": "t_concrete", "x": 18, "x2": 18, "y": 6, "y2": 4 } - ], "terrain": { - "#": "t_region_shrub", + "#": "t_region_shrub_decorative", "%": "t_wall_glass", "+": "t_door_glass_c", ",": "t_pavement_y", "-": "t_wall_b", ".": "t_floor", + "H": "t_floor", + "T": "t_floor", + "&": "t_floor", "5": "t_wall_glass", - "=": "t_linoleum_white", "D": "t_door_c", "L": "t_door_locked", - "O": "t_linoleum_white", - "P": "t_linoleum_white", - "S": "t_linoleum_white", - "T": "t_linoleum_white", - "W": "t_fencegate_c", "_": "t_pavement", - "c": "t_linoleum_white", - "e": "t_linoleum_white", - "l": "t_linoleum_white", "p": "t_concrete", - "r": "t_linoleum_white", + "t": "t_concrete", + "h": "t_concrete", + "=": "t_linoleum_white", "s": "t_sidewalk", "4": "t_gutter_downspout", "|": "t_wall_b" }, "furniture": { - "x": "f_console_broken", + "x": "f_counter", "&": "f_trashcan", "H": "f_chair", + "h": "f_chair", "O": "f_oven", "S": "f_sink", "T": "f_table", + "t": "f_table", "c": "f_counter", "e": "f_fridge", "l": "f_locker", + "W": "f_counter_gate_c", "r": "f_rack" }, "toilets": { "P": { } }, @@ -275,7 +266,8 @@ { "item": "coffee_bathroom", "x": [ 5, 6 ], "y": [ 21, 22 ], "chance": 20, "repeat": [ 1, 2 ] }, { "item": "coffee_bathroom", "x": [ 2, 3 ], "y": [ 21, 22 ], "chance": 20, "repeat": [ 1, 2 ] } ], - "place_item": [ { "item": "coffeemaker", "x": 21, "y": 22 }, { "item": "atomic_coffeepot", "x": 21, "y": 22, "chance": 20 } ] + "place_item": [ { "item": "coffeemaker", "x": 21, "y": 22 }, { "item": "atomic_coffeepot", "x": 21, "y": 22, "chance": 20 } ], + "items": { "x": { "item": "cash_register_random", "chance": 100 } } } }, { @@ -334,30 +326,30 @@ "weight": 100, "object": { "rows": [ - "______________sss_______", - "______u__u____sss_______", - "____uSSuSSSu__sss_SSS___", - "__||||||----||sss||w||__", - "_u|{{o|#tr{t#|sss|..^|__", - "__|...|.##t#.|+|+|...|__", - "_u|...D..#..#r{rvr...|u_", - "__|...|......#.tt....|__", - "__|...c..............|__", - "__|...c.............^|u_", - "__|...c..............|__", - "__|...c..............|_u", - "__|...x......#.......|__", - "_u|..c|.....#t#......|u_", - "__|..c|......#....|D||__", - "__|..&|...........|..|__", - "__|...|||||#...#..|..|__", - "_u|.....D<|t#.#t#.|aT|__", - "_u|.....||||||||||||||__", - "__|#t#....bppppdd4ppS___", - "__|#t#.lll|pppppppppS___", - "__|||||||||pppppppppS___", - "_____u_____ppppppppp____", - "________________________" + " sss ", + " sss ", + " SSSS sss SSS ", + " ||||||----||sss||w|| ", + " |{{o|#tr{t#|sss|..^| ", + " |...|.##t#.|+|+|...| ", + " |...D..#..#r{rvr...| ", + " |...|......#.tt....| ", + " |...c..............| ", + " |...c.............^| ", + " |...c..............| ", + " |...c..............| ", + " |...x......#.......| ", + " |..c|.....#t#......| ", + " |..c|......#....|D|| ", + " |..&|...........|''| ", + " |...|||||#...#..|''| ", + " |.....D<|t#.#t#.|aT| ", + " |.....|||||||||||||| ", + " |#t#....bppppdd4ppS ", + " |#t#.lll|pppppppppS ", + " |||||||||pppppppppS ", + " pppppppppS ", + " " ], "fill_ter": "t_floor", "furniture": { @@ -374,19 +366,21 @@ "t": "f_table", "v": "f_vending_o", "{": "f_fridge", - "x": "f_console_broken" + "x": "f_counter" }, "terrain": { "+": "t_door_glass_c", "-": "t_wall_glass", "D": "t_door_c", "S": "t_region_shrub_decorative", - "_": "t_region_groundcover_urban", + " ": "t_region_groundcover_urban", "b": "t_door_metal_pickable", - "d": "t_pavement", - "p": "t_pavement", + "d": "t_concrete", + "p": "t_concrete", + "'": "t_linoleum_gray", + "a": "t_linoleum_gray", + "T": "t_linoleum_gray", "s": "t_sidewalk", - "u": "t_region_shrub", "w": "t_window_boarded_noglass", "4": "t_gutter_downspout", "<": "t_ladder_up", @@ -409,7 +403,8 @@ { "chance": 4, "density": 1, "monster": "GROUP_ZOMBIE", "x": 8, "y": 10 }, { "chance": 3, "density": 1, "monster": "GROUP_ZOMBIE_FAT_BASE", "x": 17, "y": 11 } ], - "place_toilets": [ { "x": 20, "y": 17 } ] + "place_toilets": [ { "x": 20, "y": 17 } ], + "items": { "x": { "item": "cash_register_random_ransacked", "chance": 100 } } } }, { From b2a7df9abd631e788a0c79dea403f97c8adc7b0d Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 19:59:44 +0200 Subject: [PATCH 02/12] Update s_gun.json cash registers, cleanup --- data/json/mapgen/s_gun.json | 208 +++++++++++++++++++----------------- 1 file changed, 108 insertions(+), 100 deletions(-) diff --git a/data/json/mapgen/s_gun.json b/data/json/mapgen/s_gun.json index 1d490fce9c476..e57e2ffe1ef88 100644 --- a/data/json/mapgen/s_gun.json +++ b/data/json/mapgen/s_gun.json @@ -7,16 +7,16 @@ "object": { "fill_ter": "t_thconc_floor", "rows": [ - ",,____________________,,", - ",,*___*___*______*___*,,", - ",,*___*___*______*___*,,", - ",,*___*___*______*___*,,", - ",,*___*___*______*___*,,", - ",,*___*___*______*___*,,", - ",,###:::########:::###,,", - ",,#|rC..vvvKKK..dddLL#,,", - ",,#Xa?..............L#,,", - ",,#|.C...............+,,", + ",,____________________',", + ",,*___*___*___*___*___',", + ",,*___*___*___*___*___',", + ",,*___*___*___*___*___',", + ",,*___*___*___*___*___',", + ",,*___*___*___*___*___',", + ",,###:::########:::###',", + ",,#|?C..vvvKKK..dddLL#',", + ",,#XaC..............L#',", + ",,#|.C...............+',", ",,#|....YYYYYY..LLLLL#,,", ",,#---D--------------#,,", ",,#&q-.-lll.AnA.r-sss#,,", @@ -25,8 +25,8 @@ ",;#N=n==n==n==n==-.--#,,", ",,#N=============-.D<#,,", ",,WWWRWWRWWRWWRW=W+###,,", - ",,W==============W,www,,", - ",,W==============W,,,,,,", + ",,W==============W.www,,", + ",,W==============W....,,", ",,W..............W,,,,,,", ",,W..T..T..T..T..W,,,,,,", ",,WxxxxxxxxxxxxxxW,,,,,,", @@ -34,7 +34,8 @@ ], "palettes": [ "gun_store_palette" ], "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 0 ], "y": [ 23, 23 ], "chance": 2, "repeat": [ 2, 3 ] } ], - "terrain": { ";": "t_region_groundcover_urban", "w": "t_pavement" } + "terrain": { ";": "t_region_groundcover_urban" }, + "place_loot": [ { "group": "cash_register_random", "x": 5, "y": [ 7, 9 ] } ] } }, { @@ -110,16 +111,16 @@ "object": { "fill_ter": "t_thconc_floor", "rows": [ - ",,____________________,,", - ",,*___*___*______*___*,,", - ",,*___*___*______*___*,,", - ",,*___*___*______*___*,,", - ",,*___*___*______*___*,,", - ",,*___*___*______*___*,,", - ",,###:::########:::###,,", - ",,#MrC``mmmmmm``pppmm#,,", - ",,#ea?``````````````m#,,", - ",,#M`C```````````````+,,", + ",,____________________',", + ",,*___*___*___*___*___',", + ",,*___*___*___*___*___',", + ",,*___*___*___*___*___',", + ",,*___*___*___*___*___',", + ",,*___*___*___*___*___',", + ",,###:::########:::###',", + ",,#M?C``mmmmmm``pppmm#',", + ",,#eaC``````````````m#',", + ",,#M`C```````````````+',", ",,#M````mmmmmm``mmmmm#,,", ",,#---D--------------#,,", ",,#&q-`-MMM`AnA`r-SSS#,,", @@ -128,8 +129,8 @@ ",;#M=n==n==n==n==-`--#,,", ",,#M=============-`D<#,,", ",,WWWCWWCWWCWWCW=W+###,,", - ",,W==============W,www,,", - ",,W==============W,,,,,,", + ",,W==============W.www,,", + ",,W==============W....,,", ",,W..............W,,,,,,", ",,W..T..T..T..T..W,,,,,,", ",,WxxxxxxxxxxxxxxW,,,,,,", @@ -160,7 +161,8 @@ ":": { "chunks": [ [ "damaged_window_bars_nested", 75 ], [ "destroyed_window_bars_nested", 100 ], [ "null", 95 ] ] }, "+": { "chunks": [ [ "destroyed_metal_door_nested", 90 ], [ "null", 75 ] ] }, "`": { "chunks": [ [ "corpse_blood_casings_1x1", 4 ], [ "null", 20 ] ] } - } + }, + "place_loot": [ { "group": "cash_register_random_ransacked", "x": 5, "y": [ 7, 9 ] } ] } }, { @@ -173,11 +175,11 @@ "fill_ter": "t_thconc_floor", "rows": [ ",'''''''''''''''''''''',", - ",'@@@@@@@_''''_@@@@@@@',", - ",'##:::##_''''_##:::##',", - ",'#^...^:_''''_:^...^#',", - ",'#..a..:_''''_:..a..#',", - ",'#.n?n.:_''''_:.n?n.#',", + ",'@@@@@@@''''''@@@@@@@',", + ",'##:::##''''''##:::##',", + ",'#^...?:'''''':?...^#',", + ",'#..a..:'''''':..a..#',", + ",'#.nnn.:'''''':.nnn.#',", ",'#.....#::++::#.....#',", ",'#..................#',", ",'#..................#',", @@ -199,7 +201,11 @@ ], "palettes": [ "gun_store_palette" ], "vendingmachines": { "V": { "item_group": "vending_ammo", "lootable": false } }, - "terrain": { ";": "t_sidewalk" } + "terrain": { ";": "t_sidewalk" }, + "place_loot": [ + { "group": "cash_register_random", "x": [ 4, 6 ], "y": 5 }, + { "group": "cash_register_random", "x": [ 17, 19 ], "y": 5 } + ] } }, { @@ -273,30 +279,30 @@ "object": { "fill_ter": "t_thconc_floor", "rows": [ - "_''''''''''''''''''''''_", - "_'@@,,@@@_''''_@@@@@@@'_", - "_'##:::##_''''_##:::##'_", - "_'#MMMM`:_''''_:MMMM^#'_", - "_'#MaaM`:_''''_:M``r`#'_", - "_'#`EM``:_''''_:C````#'_", - "_'#`````#::++::#C````#'_", - "_'#`r````aCMMCa``````#'_", - "_'#``````````````````#'_", - "_'#```````````M``````#'_", - "_'#````M`````````````#'_", - "''#^````````````````^#'_", - "'##```````mmmm```````#'_", - "'$#``````mm``mm``````#'_", - "'##`````mm```````````#'_", - "''#````mm``M`M`mmM`M`#'_", - "_'#-D-D-ZZ----ZZ--D--#'_", - "_'#&`-`-````V```-M`C`#'_", - "_'#^`-`D``r`````D`A`V#'_", - "_'#qr-<-V``M``V`-`MEA#;_", - "_'#################+##'_", - "_''''''''''''''''''''''_", - "________________________", - "________________________" + ",'''''''''''''''''''''',", + ",'@@,,@@@''''''@@@@@@@',", + ",'##:::##''''''##:::##',", + ",'#MMMM`:'''''':MMMM^#',", + ",'#MaaM`:'''''':M``r`#',", + ",'#`EM``:'''''':C````#',", + ",'#`````#::++::#C````#',", + ",'#`r````aCMMCa``````#',", + ",'#``````````````````#',", + ",'#```````````M``````#',", + ",'#````M`````````````#',", + "''#^````````````````^#',", + "'##```````mmmm```````#',", + "'$#``````mm``mm``````#',", + "'##`````mm```````````#',", + "''#````mm``M`M`mmM`M`#',", + ",'#-D-D-ZZ----ZZ--D--#',", + ",'#&`-`-````V```-M`C`#',", + ",'#^`-`D``r`````D`A`V#',", + ",'#qr-<-V``M``V`-`MEA#',", + ",'#################+##',", + ",'''''''''''''''''''''',", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,," ], "palettes": [ "gun_store_palette" ], "terrain": { ";": "t_sidewalk" }, @@ -332,33 +338,34 @@ "object": { "fill_ter": "t_thconc_floor", "rows": [ - ",,,,,,,,B,,,,'',,,BB,B,,", - ",,,,,,,B,,,,,'',,,,,,,,,", - "B,,,,,,,,,,,,'',B,B,,,,,", - ",,B,,,,B,,B,B'',,,,,,,,B", - ",,,,B##::###:#+#:####,,,", - "B,,,,#X.rCvv^....LLL#u,,", - "B,,,,#|..d.........L#,,,", - ",B,,,#|.a?..YY.KK..L#u,B", - ",,,u;#|.....YY.KK..L#u,,", - "B,####--------D-----#,,,", - ",u#r.AnA..D.....D..A#u,B", - ",u#l.....s-.--D--.E?#,,,", - "B,#l.sssss-.-&rq-O.A#,,,", + ",,,,,,,,,,,,,'',,,,,,,,,", + ",,,,,,,,,,,,,'',,,,,,,,,", + ",,,,,,,,,,,,,'',,,,,,,,,", + ",,,,,,,,,,,,,'',,,,,,,,,", + ",,,,,##::##:#++#:####,,,", + ",,,,,#Xr?Cvv^....LLL#,,,", + ",,,,,#|..d.........L#,,,", + ",,,,,#|.aC..YY.KK..L#,,,", + ",,,,;#|.....YY.KK..L#,,,", + ",,####--------D-----#,,,", + ",,#r.AnA..D.....D..A#,,,", + ",,#l.....s-.--D--.E?#,,,", + ",,#l.sssss-.-&rq-O.A#,,,", ",,#--------D--------#,,,", - ",u#N==n===n==n===n=N#u,,", - "Bu#=================#u,,", + ",,#N==n===n==n===n=N#,,,", + ",,#=================#,,,", ",,W.WWRWWWWRWWWWRWW.W,,,", - ",,W=================W,,B", - "BuW=================Wu,,", - ",,W.................W,,B", - ",uW.................W,,B", - "B,W...T....T....T...Wu,,", + ",,W=================W,,,", + ",,W=================W,,,", + ",,W.................W,,,", + ",,W.................W,,,", + ",,W...T....T....T...W,,,", ",,WxxxxxxxxxxxxxxxxxW,,,", - ",BWWWWWWWWWWWWWWWWWWW,B." + ",,WWWWWWWWWWWWWWWWWWW,,," ], "palettes": [ "gun_store_palette" ], - "terrain": { ";": "t_region_groundcover_urban" } + "terrain": { ";": "t_region_groundcover_urban" }, + "place_loot": [ { "group": "cash_register_random", "x": 9, "y": 7 } ] } }, { @@ -418,30 +425,30 @@ "object": { "fill_ter": "t_thconc_floor", "rows": [ - ",,,,,,,,B,,,,'',,,BB,B,,", - ",,,,,,,B,,,,,'',,,,,,,,,", - "B,,,,,,,,,,,,'',B,B,,,,,", - ",,B,,,,B,,B,B'',,,,,,,,B", - ",,,,B##::###:#+#:####,,,", - "B,,,,#e`rCmm^````mmm#u,,", - "B,,,,#M``p`````````m#,,,", - ",B,,,#M`a?``mm`mm``m#u,B", - ",,,u;#M`````mm`mm``m#u,,", - "B,####--------D-----#,,,", - ",u#r.AnA``D`````D``A#u,B", - ",u#M`````S-`--D--`E?#,,,", - "B,#M`SSSSS-`-&rq-e`A#,,,", + ",,,,,,,,,,,,,'',,,,,,,,,", + ",,,,,,,,,,,,,'',,,,,,,,,", + ",,,,,,,,,,,,,'',,,,,,,,,", + ",,,,,,,,,,,,,'',,,,,,,,,", + ",,,,,##::##:#++#:####,,,", + ",,,,,#er?Cmm^````mmm#,,,", + ",,,,,#M``p`````````m#,,,", + ",,,,,#M`aC``mm`mm``m#,,,", + ",,,,;#M`````mm`mm``m#,,,", + ",,####--------D-----#,,,", + ",,#r.AnA``D`````D``A#,,,", + ",,#M`````S-`--D--`E?#,,,", + ",,#M`SSSSS-`-&rq-e`A#,,,", ",,#--------D--------#,,,", - ",u#N==n===n==n===n=N#u,,", - "Bu#=================#u,,", + ",,#N==n===n==n===n=N#,,,", + ",,#=================#,,,", ",,W=WWCWWWWCWWWWCWW=W,,,", - ",,W=================W,,B", - "BuW=================Wu,,", - ",,W.................W,,B", - ",uW.................W,,B", - "B,W...T....T....T...Wu,,", + ",,W=================W,,,", + ",,W=================W,,,", + ",,W.................W,,,", + ",,W.................W,,,", + ",,W...T....T....T...W,,,", ",,WxxxxxxxxxxxxxxxxxW,,,", - ",BWWWWWWWWWWWWWWWWWWW,B." + ",,WWWWWWWWWWWWWWWWWWW,,." ], "palettes": [ "gun_store_palette" ], "terrain": { ";": "t_region_groundcover_urban" }, @@ -468,7 +475,8 @@ "e": { "chunks": [ [ "looted_gunsafe_nested", 25 ], [ "jammed_gunsafe_nested", 75 ], [ "null", 95 ] ] }, "+": { "chunks": [ [ "destroyed_metal_door_nested", 90 ], [ "null", 75 ] ] }, "`": { "chunks": [ [ "corpse_blood_casings_1x1", 4 ], [ "null", 20 ] ] } - } + }, + "place_loot": [ { "group": "cash_register_random_ransacked", "x": 9, "y": 7 } ] } } ] From 1e0400a5e3e6128a2cb174f531a35c9dc74212f1 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:00:21 +0200 Subject: [PATCH 03/12] Update s_hardware.json cash register, concrete floor --- data/json/mapgen/s_hardware.json | 152 ++++++++++++++++--------------- 1 file changed, 78 insertions(+), 74 deletions(-) diff --git a/data/json/mapgen/s_hardware.json b/data/json/mapgen/s_hardware.json index c6923e007d731..0ed056f6741d6 100644 --- a/data/json/mapgen/s_hardware.json +++ b/data/json/mapgen/s_hardware.json @@ -5,51 +5,51 @@ "om_terrain": [ "s_hardware" ], "weight": 300, "object": { - "fill_ter": "t_floor", + "fill_ter": "t_thconc_floor", "rows": [ - "________________________", - "________________________", - "~~~~~~~~~~~_____________", - "~~~~~~~~~~~_____________", - "*|-----++-|_____________", - "*|[[[[...]|_____________", - "*|.......]O_____________", - "*|[.[....]|-----------|~", - "*|[.[.....y[[[[[[[[[[[|~", - "*|[.[.................|~", - "*|[.[.#%###...........|~", - "*|[...#l.....[[[[[[[[[|~", - "*|-+-------.----------|~", - "*|..y|]]]]].]]]]]]]]|~~~", - "*|&.S|..............|~**", - "*|||||]]]]].]]]]]]]]|~**", - "*****|..............|~**", - "*****|dh............O___", - "*****|dd..@@@@.h....;___", - "*****|O-------------|___", - "****************_4UU____", - "****************________", - "****************________", - "************************" + " ~~~~~~~~~~~_____,_____~", + " ~~~~~~~~~~~_____,_____~", + " ~~~~~~~~~~~_____,_____~", + " ~~~~~~~~~~~_____,_____~", + " |----O++O|~_____,_____~", + " |[[[[...]|~_____,_____~", + " |.......]|~~~~~~~~~~~~~", + " |[.[....]|-----------|~", + " |[.[.....y[[[[[[[[[[[|~", + " |[.[.................O~", + " |[.[.#####...........O~", + " |[...#.l....[[[[[[[[[|~", + " |-+-------.----------|~", + " |..y|]]]]].]]]]]]]]|~~~", + " |&.S|..............|~ ", + " |||||]]]]].]]]]]]]]|~ ", + " |..............|~ ", + " Odh............O~ ", + " |dd..@@@@.h....;~ ", + " |--------------|~ ", + " ~4UU~~ ", + " ~~~~~~ ", + " ~~~~~~ ", + " " ], "terrain": { - "*": [ [ "t_region_groundcover_urban", 8 ], "t_region_shrub" ], + " ": "t_region_groundcover_urban", "+": "t_door_c", "-": "t_wall_w", - ".": "t_floor", + ".": "t_thconc_floor", ";": "t_door_locked", "O": "t_window", "_": "t_pavement", - "U": "t_pavement", + ",": "t_pavement_y", + "U": "t_concrete", "|": "t_wall_w", - "~": "t_sidewalk", + "~": "t_concrete", "4": "t_gutter_downspout" }, "furniture": { - "%": "f_console_broken", "#": "f_counter", "@": "f_locker", - "[": "f_bookcase", + "[": "f_rack_wood", "]": "f_warehouse_shelf", "d": "f_desk", "h": "f_chair", @@ -72,7 +72,8 @@ { "item": "hardware_plumbing", "x": 9, "y": [ 5, 7 ], "chance": 90, "repeat": [ 1, 2 ] }, { "item": "hardware_plumbing", "x": [ 10, 13 ], "y": 18, "chance": 80, "repeat": [ 1, 3 ] }, { "item": "hardware", "x": [ 14, 19 ], "y": [ 16, 18 ], "chance": 80, "repeat": [ 1, 2 ] }, - { "item": "office", "x": 6, "y": [ 17, 18 ], "chance": 50 } + { "item": "office", "x": 6, "y": [ 17, 18 ], "chance": 50 }, + { "item": "cash_register_random", "x": [ 7, 9 ], "y": 10, "chance": 100 } ] } }, @@ -130,10 +131,10 @@ "om_terrain": [ "s_hardware_1" ], "weight": 500, "object": { - "fill_ter": "t_floor", + "fill_ter": "t_thconc_floor", "rows": [ - "ppppp~~~~~~~~~~~~~~~~~~~", - "ppppp###---##++##---###~", + "ppppp''''''''~~'''''''''", + "ppppp###---##++##---###'", "ppppp#b.........v....P#'", "ppppp#b.b.b.r..r.o.o.P#'", "ppppp#b.b.b.c..c.o.o.P#'", @@ -147,13 +148,13 @@ "ppppp#HHHHHHH__HHHHHHH#'", "ppppp#__T________T____#'", "ppppp#HHHH#HHT_HH#HHHH#'", - "pppppwppppppppppppppppw'", - "pppppwHHHHHHHppHHHHHHHw'", - "ppppp|ppppppppppppppppw'", - "ppppp|pppppppppHpHpHpHw'", - "pppppw1p2p3pMppHpHpHpHw'", - "pppppw1p2p3pMppHpHpHpHw'", - "'D'D'w1p2p3pMppHpHpHpHw'", + "pppppw________________w'", + "pppppwHHHHHHH__HHHHHHHw'", + "ppppp|________________w'", + "ppppp|_________H_H_H_Hw'", + "pppppw1_2_3_M__H_H_H_Hw'", + "pppppw1_2_3_M__H_H_H_Hw'", + "'D'D'w1_2_3_M__H_H_H_Hw'", "'''''WWWWWWWWWWWWWWWWWW'", "''''''''''''''''''''''''" ], @@ -162,18 +163,18 @@ "'": "t_region_groundcover_urban", "+": "t_door_glass_c", "-": "t_wall_glass", - ".": "t_floor", + ".": "t_thconc_floor", "D": "t_region_groundcover_barren", "=": "t_door_c", - "H": "t_pavement", - "M": "t_pavement", + "H": "t_concrete", + "T": "t_concrete", + "M": "t_concrete", "V": "t_pavement", - "U": "t_pavement", - "1": "t_pavement", - "2": "t_pavement", - "3": "t_pavement", + "1": "t_concrete", + "2": "t_concrete", + "3": "t_concrete", "W": "t_chainfence_h", - "_": "t_floor", + "_": "t_concrete", "p": "t_pavement", "w": "t_chainfence_v", "|": "t_chaingate_c", @@ -187,7 +188,7 @@ "M": { "item": { "item": "seed_flower" }, "furniture": "f_planter_harvest" } }, "furniture": { - "r": "f_console_broken", + "r": "f_counter", "D": "f_dumpster", "H": "f_warehouse_shelf", "P": "f_rack", @@ -211,6 +212,7 @@ { "item": "trash", "chance": 50 }, { "item": "trash", "chance": 50 } ], + "r": { "item": "cash_register_random", "chance": 100 }, "H": { "item": "hardware_bulk", "chance": 85, "repeat": [ 1, 6 ] }, "P": { "item": "paint", "chance": 85, "repeat": [ 1, 8 ] }, "b": { "item": "tools_construction", "chance": 65, "repeat": [ 1, 4 ] }, @@ -280,10 +282,10 @@ "om_terrain": [ "s_hardware_2" ], "weight": 300, "object": { - "fill_ter": "t_floor", + "fill_ter": "t_thconc_floor", "rows": [ - "~~~~~~~~~~~~~~~~~~~~~~~~", - "*W^^^WW|-=--:---:---:-|*", + "**~~~***~~~*************", + "*W^^^WW|-:-=========--|*", "*w~~~%~|..............|*", "*w~~~v~|..............|*", "*w~~~v~|..l%..l%..l%..|*", @@ -311,20 +313,20 @@ "*": "t_region_groundcover_urban", "+": "t_door_c", "-": "t_wall_w", - ".": "t_floor", + ".": "t_thconc_floor", ":": "t_door_glass_c", "=": "t_wall_glass", "W": "t_chainfence_h", "^": "t_chaingate_c", - "r": "t_sidewalk", - "v": "t_sidewalk", + "r": "t_concrete", + "v": "t_concrete", "w": "t_chainfence_v", "|": "t_wall_w", - "~": "t_sidewalk", + "~": "t_concrete", "4": "t_gutter_downspout" }, "furniture": { - "%": "f_console_broken", + "%": "f_counter", "#": "f_counter", "]": "f_rack", "l": "f_stool", @@ -357,7 +359,8 @@ { "vehicle": "shopping_cart", "x": [ 15, 16 ], "y": [ 7, 22 ], "chance": 25 }, { "vehicle": "shopping_cart", "x": [ 12, 13 ], "y": [ 7, 22 ], "chance": 25 }, { "vehicle": "shopping_cart", "x": [ 8, 10 ], "y": [ 5, 16 ], "chance": 25 } - ] + ], + "items": { "%": { "item": "cash_register_random", "chance": 100 } } } }, { @@ -414,24 +417,24 @@ "om_terrain": [ "s_hardware_3" ], "weight": 500, "object": { - "fill_ter": "t_floor", + "fill_ter": "t_thconc_floor", "rows": [ - "~~~~~~~~~~~~~~~~~~~~~~~~", - "~~~WWWWWWWWW^^WWWWWWW~~~", + "***~~~~~~~~~~~~~~~~~~***", + "***WWWWWWWW^^WWWWWWWW***", "***w~~~~~~~~~~~~~~~~w***", "***w~~~~~~~~~~~~~~~~w***", "***w~~~~~~~~~~~~~~~~w***", - "***-=----===-++---=--***", + "***|--===--++--===--|***", "***|...............]|***", "***|.]]]..[[...[[..]|***", - "***|...............]|***", - "***|...........]]..]|***", + "***=...............]|***", + "***=...........]]..]|***", "***|.]]].###.......]|***", "***|.......#...]]..]|***", - "***|.....#l%.......]|***", + "***|.....%l#.......]|***", "***|.]]].###...]]..]|***", - "***|......y........]|***", - "***|...............]|***", + "***=......y........]|***", + "***=...............]|***", "***|.]]]]]...]..]..]|***", "***|.......y.]..]..]|***", "***|-+------+-------|***", @@ -442,16 +445,16 @@ "************************" ], "terrain": { - "*": [ [ "t_region_groundcover_urban", 8 ], "t_region_shrub" ], + "*": "t_region_groundcover_urban", "+": "t_door_c", "-": "t_wall_w", - ".": "t_floor", - "=": "t_wall_glass", + ".": "t_thconc_floor", + "=": "t_window", "W": "t_chainfence_h", "^": "t_chaingate_c", "w": "t_chainfence_v", "|": "t_wall_w", - "~": "t_sidewalk", + "~": "t_concrete", "4": "t_gutter_downspout" }, "toilets": { "&": { } }, @@ -487,7 +490,8 @@ { "item": "snacks", "x": [ 15, 16 ], "y": 13, "chance": 80, "repeat": [ 1, 10 ] }, { "item": "hardware", "x": 13, "y": [ 16, 17 ], "chance": 80, "repeat": [ 1, 4 ] }, { "item": "hardware", "x": 16, "y": [ 16, 17 ], "chance": 80, "repeat": [ 1, 4 ] }, - { "item": "tools_carpentry", "x": 19, "y": [ 6, 17 ], "chance": 70, "repeat": [ 1, 9 ] } + { "item": "tools_carpentry", "x": 19, "y": [ 6, 17 ], "chance": 70, "repeat": [ 1, 9 ] }, + { "item": "cash_register_random", "x": 11, "y": [ 10, 13 ], "chance": 100 } ], "place_vehicles": [ { "vehicle": "wheelbarrow", "x": 4, "y": 2, "chance": 25 }, From d2426aa8e2f41671e341c6a9150e70948389a1e7 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:02:45 +0200 Subject: [PATCH 04/12] Update s_grocery.json linoleum floor, cash register --- data/json/mapgen/s_grocery.json | 143 ++++++++++++++++++-------------- 1 file changed, 79 insertions(+), 64 deletions(-) diff --git a/data/json/mapgen/s_grocery.json b/data/json/mapgen/s_grocery.json index ec6c88e8960d1..8b57460f0304a 100644 --- a/data/json/mapgen/s_grocery.json +++ b/data/json/mapgen/s_grocery.json @@ -6,13 +6,13 @@ "weight": 100, "object": { "rows": [ - "ssssssssssssssssssssssss", - "ssWWWWWWWWssssssssssssss", - "sswsssssssssssssssssssss", - "sswsssssssssssssssssssss", + "__sssssssssssssssssssss_", + "__WWWWWWWWsssssssssssss_", + "__wssssssssssssssssssss_", + "__wssssssssssssssssssss_", "__|====-====-=[[=-====|_", "__|tttt^ttttt^RR^# b |_", - "__|t #%## |_", + "__|t #### |_", "__|t rrr rrr |_", "__|r r|r r|r f|rrr |_", "__|r r|r r|r f|777 |_", @@ -26,20 +26,20 @@ "|TS|^ A|r r|t t|r r|_", "|ll+ A|r r|t t|r r|_", "|--|-I-- |_", - "__4|**C|[[[[-[[[[-[[[[|_", - "___|**C|]]]]]]]]]]]]]]|_", - "___L***+**************|_", - "___|------------------|_" + "ss4|**C|[[[[-[[[[-[[[[|_", + "sss|**C|]]]]]]]]]]]]]]|_", + "sssL***+**************|_", + "sss|------------------|_" ], "fill_ter": "t_linoleum_white", "terrain": { " ": "t_linoleum_white", - "*": "t_floor", + "*": "t_thconc_floor", "+": "t_door_c", "-": "t_wall_w", "=": "t_wall_glass", "A": "t_atm", - "C": "t_floor", + "C": "t_thconc_floor", "I": "t_door_locked_interior", "L": "t_door_locked", "R": "t_carpet_red", @@ -47,16 +47,15 @@ "T": "t_linoleum_gray", "W": "t_chainfence_h", "[": "t_door_glass_c", - "]": "t_floor", - "_": "t_pavement", + "]": "t_thconc_floor", + "_": "t_region_groundcover_urban", "l": "t_linoleum_gray", - "s": "t_sidewalk", + "s": "t_concrete", "w": "t_chainfence", "4": "t_gutter_downspout", "|": "t_wall_w" }, "furniture": { - "%": "f_console_broken", "#": "f_counter", "7": "f_bookcase", "C": "f_crate_c", @@ -95,7 +94,8 @@ { "item": "cleaning", "x": 21, "y": [ 16, 18 ], "chance": 80, "repeat": [ 1, 8 ] }, { "item": "groce_frozen", "x": [ 8, 12 ], "y": 21, "chance": 80, "repeat": [ 1, 12 ] }, { "item": "groce_meat", "x": [ 13, 17 ], "y": 21, "chance": 80, "repeat": [ 1, 12 ] }, - { "item": "groce_dairyegg", "x": [ 18, 21 ], "y": 21, "chance": 80, "repeat": [ 1, 12 ] } + { "item": "groce_dairyegg", "x": [ 18, 21 ], "y": 21, "chance": 80, "repeat": [ 1, 12 ] }, + { "item": "cash_register_random", "x": [ 18, 20 ], "y": 6, "chance": 100 } ], "place_vehicles": [ { "vehicle": "shopping_cart", "x": 3, "y": 2, "chance": 10 }, @@ -127,13 +127,13 @@ "weight": 1000, "object": { "rows": [ - "ssssssssssssssssssssssss", - "ssWWWWWWWWssssssssssssss", - "sswsssssssssssssssssssss", - "sswsssssssssssssssssssss", + "__sssssssssssssssssssss_", + "__WWWWWWWWsssssssssssss_", + "__wssssssssssssssssssss_", + "__wssssssssssssssssssss_", "__|====-====-=[[=-====|_", "__|tttt^ttttt^RR^# b |_", - "__|t #%## |_", + "__|t #### |_", "__|t rrr rrr |_", "__|r r|r r|r f|rrr |_", "__|r r|r r|r f|777 |_", @@ -147,35 +147,34 @@ "|TS|^ A|r r|t t|r r|_", "|ll+ A|r r|t t|r r|_", "|--|-+-- |_", - "__4|**C|[[[[-[[[[-[[[[|_", - "___|**C|]]]]]]]]]]]]]]|_", - "___+***+**************|_", - "___|------------------|_" + "ss4|**C|[[[[-[[[[-[[[[|_", + "sss|**C|]]]]]]]]]]]]]]|_", + "sss+***+**************|_", + "sss|------------------|_" ], "fill_ter": "t_linoleum_white", "terrain": { " ": "t_linoleum_white", - "*": "t_floor", + "*": "t_thconc_floor", "+": [ [ "t_door_b", 20 ], [ "t_door_frame", 10 ], [ "t_door_o", 70 ], [ "t_door_c", 5 ], [ "t_door_locked_interior", 3 ] ], "-": "t_wall_w", "=": "t_wall_glass", "A": "t_linoleum_white", - "C": "t_floor", + "C": "t_thconc_floor", "R": "t_carpet_red", "S": "t_linoleum_gray", "T": "t_linoleum_gray", "W": "t_chainfence_h", "[": "t_door_glass_c", - "]": "t_floor", - "_": "t_pavement", + "]": "t_thconc_floor", + "_": "t_region_groundcover_urban", "l": "t_linoleum_gray", - "s": "t_sidewalk", + "s": "t_concrete", "w": "t_chainfence", "4": "t_gutter_downspout", "|": "t_wall_w" }, "furniture": { - "%": "f_console_broken", "#": "f_counter", "7": "f_bookcase", "C": [ [ "f_crate_c", 20 ], [ "f_crate_o", 80 ] ], @@ -234,7 +233,8 @@ { "item": "cleaning", "x": 21, "y": [ 16, 18 ], "chance": 5, "repeat": [ 1, 8 ] }, { "item": "groce_frozen", "x": [ 8, 12 ], "y": 21, "chance": 5, "repeat": [ 1, 12 ] }, { "item": "groce_meat", "x": [ 13, 17 ], "y": 21, "chance": 5, "repeat": [ 1, 12 ] }, - { "item": "groce_dairyegg", "x": [ 18, 21 ], "y": 21, "chance": 5, "repeat": [ 1, 12 ] } + { "item": "groce_dairyegg", "x": [ 18, 21 ], "y": 21, "chance": 5, "repeat": [ 1, 12 ] }, + { "item": "cash_register_random_ransacked", "x": [ 18, 20 ], "y": 6, "chance": 100 } ], "item": { "A": [ { "item": "steel_chunk", "chance": 100, "repeat": [ 1, 3 ] }, { "item": "scrap", "chance": 100, "repeat": [ 4, 8 ] } ], @@ -294,13 +294,13 @@ "weight": 500, "object": { "rows": [ - "ssssssssssssssssssssssss", - "ssWWWWWWWWssssssssssssss", - "sswsssssssssssssssssssss", - "ssЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮs", + "__sssssssssssssssssssss_", + "__WWWWWWWWsssssssssssss_", + "__wssssssssssssssssssss_", + "__ЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮЮ_", "__|====-====-=[[=-====|_", "__|tttt^ttttt^RR^# b |_", - "__|t #%## |_", + "__|t #### |_", "__|t rrr rrr |_", "__|r r|r r|r f|rrr |_", "__|r r|r r|r f|777 |_", @@ -314,20 +314,20 @@ "|TS|^ A|r r|t t|r r|_", "|ll+ A|r r|t t|r r|_", "|--|-I-- |_", - "__4|**C|[[[[-[[[[-[[[[|_", - "___|**C|]]]]]]]]]]]]]]|_", - "___L***+**************|_", - "___|------------------|_" + "ss4|**C|[[[[-[[[[-[[[[|_", + "sss|**C|]]]]]]]]]]]]]]|_", + "sssL***+**************|_", + "sss|------------------|_" ], "fill_ter": "t_linoleum_white", "terrain": { " ": "t_linoleum_white", - "*": "t_floor", + "*": "t_thconc_floor", "+": "t_door_boarded", "-": "t_wall_w", "=": "t_wall_glass", "A": "t_atm", - "C": "t_floor", + "C": "t_thconc_floor", "I": "t_door_boarded", "L": "t_door_boarded", "R": "t_carpet_red", @@ -335,17 +335,16 @@ "T": "t_linoleum_gray", "W": "t_chainfence_h", "[": "t_door_glass_c", - "]": "t_floor", - "_": "t_pavement", + "]": "t_thconc_floor", + "_": "t_region_groundcover_urban", "l": "t_linoleum_gray", - "s": "t_sidewalk", + "s": "t_concrete", "w": "t_chainfence", "4": "t_gutter_downspout", "|": "t_wall_w", - "Ю": "t_sidewalk" + "Ю": "t_concrete" }, "furniture": { - "%": "f_console_broken", "#": "f_counter", "7": "f_bookcase", "C": "f_crate_c", @@ -385,7 +384,8 @@ { "item": "cleaning", "x": 21, "y": [ 16, 18 ], "chance": 1, "repeat": [ 1, 8 ] }, { "item": "groce_frozen", "x": [ 8, 12 ], "y": 21, "chance": 1, "repeat": [ 1, 12 ] }, { "item": "groce_meat", "x": [ 13, 17 ], "y": 21, "chance": 1, "repeat": [ 1, 12 ] }, - { "item": "groce_dairyegg", "x": [ 18, 21 ], "y": 21, "chance": 1, "repeat": [ 1, 12 ] } + { "item": "groce_dairyegg", "x": [ 18, 21 ], "y": 21, "chance": 1, "repeat": [ 1, 12 ] }, + { "item": "cash_register_random_ransacked", "x": [ 18, 20 ], "y": 6, "chance": 100 } ], "place_monster": [ { "monster": [ "mon_grocerybot", "mon_grocerybot_busted" ], "x": [ 19, 22 ], "y": 2, "chance": 15, "repeat": [ 1, 3 ] } @@ -451,10 +451,10 @@ "om_terrain": [ "s_grocery_1" ], "weight": 100, "object": { - "fill_ter": "t_floor", + "fill_ter": "t_linoleum_gray", "rows": [ - " ", - " ", + " ss ", + " ss ", " ---:::---++---:::--- ", " |..................| ", " |..................| ", @@ -480,9 +480,10 @@ ], "terrain": { " ": "t_region_groundcover_urban", + "s": "t_concrete", "+": "t_door_c", "-": "t_wall_w", - ".": "t_floor", + ".": "t_linoleum_gray", ":": "t_window", "4": "t_gutter_downspout", "|": "t_wall_w" @@ -510,7 +511,11 @@ { "item": "magazines", "x": 16, "y": 7, "chance": 80, "repeat": [ 4, 16 ] }, { "item": "snacks", "x": 20, "y": [ 5, 6 ], "chance": 80, "repeat": [ 1, 12 ] }, { "item": "magazines", "x": 20, "y": 7, "chance": 80, "repeat": [ 4, 16 ] }, - { "item": "coat_rack", "x": 3, "y": 20, "chance": 70, "repeat": 1 } + { "item": "coat_rack", "x": 3, "y": 20, "chance": 70, "repeat": 1 }, + { "item": "cash_register_random", "x": 5, "y": 5, "chance": 100 }, + { "item": "cash_register_random", "x": 9, "y": 5, "chance": 100 }, + { "item": "cash_register_random", "x": 13, "y": 5, "chance": 100 }, + { "item": "cash_register_random", "x": 17, "y": 5, "chance": 100 } ], "place_monsters": [ { "monster": "GROUP_GROCERY", "x": [ 0, 0 ], "y": [ 23, 23 ], "chance": 2, "repeat": [ 2, 3 ] }, @@ -526,10 +531,10 @@ "om_terrain": [ "s_grocery_1" ], "weight": 1000, "object": { - "fill_ter": "t_floor", + "fill_ter": "t_linoleum_gray", "rows": [ - " ", - " ", + " ss ", + " ss ", " ---:::---++---:::--- ", " |..................| ", " |..................| ", @@ -555,9 +560,10 @@ ], "terrain": { " ": "t_region_groundcover_urban", + "s": "t_concrete", "+": [ [ "t_door_b", 20 ], [ "t_door_frame", 10 ], [ "t_door_o", 70 ], [ "t_door_c", 5 ], [ "t_door_locked_interior", 3 ] ], "-": "t_wall_w", - ".": "t_floor", + ".": "t_linoleum_gray", ":": [ [ "t_window_frame", 70 ], [ "t_window_empty", 20 ], [ "t_window", 5 ] ], "4": "t_gutter_downspout", "|": "t_wall_w" @@ -604,7 +610,11 @@ { "item": "magazines", "x": 16, "y": 7, "chance": 5, "repeat": [ 4, 16 ] }, { "item": "snacks", "x": 20, "y": [ 5, 6 ], "chance": 5, "repeat": [ 1, 12 ] }, { "item": "magazines", "x": 20, "y": 7, "chance": 5, "repeat": [ 4, 16 ] }, - { "item": "coat_rack", "x": 3, "y": 20, "chance": 5, "repeat": 1 } + { "item": "coat_rack", "x": 3, "y": 20, "chance": 5, "repeat": 1 }, + { "item": "cash_register_random_ransacked", "x": 5, "y": 5, "chance": 100 }, + { "item": "cash_register_random_ransacked", "x": 9, "y": 5, "chance": 100 }, + { "item": "cash_register_random_ransacked", "x": 13, "y": 5, "chance": 100 }, + { "item": "cash_register_random_ransacked", "x": 17, "y": 5, "chance": 100 } ], "item": { ".": [ @@ -642,10 +652,10 @@ "om_terrain": [ "s_grocery_1" ], "weight": 500, "object": { - "fill_ter": "t_floor", + "fill_ter": "t_linoleum_gray", "rows": [ - " ", - " ", + " ss ", + " ss ", " ---:::---++---:::--- ", " |..................| ", " |..................| ", @@ -671,9 +681,10 @@ ], "terrain": { " ": "t_region_groundcover_urban", + "s": "t_concrete", "+": "t_door_boarded", "-": "t_wall_w", - ".": "t_floor", + ".": "t_linoleum_gray", ":": "t_window_boarded", "4": "t_gutter_downspout", "|": "t_wall_w" @@ -701,7 +712,11 @@ { "item": "magazines", "x": 16, "y": 7, "chance": 1, "repeat": [ 4, 16 ] }, { "item": "snacks", "x": 20, "y": [ 5, 6 ], "chance": 1, "repeat": [ 1, 12 ] }, { "item": "magazines", "x": 20, "y": 7, "chance": 1, "repeat": [ 4, 16 ] }, - { "item": "coat_rack", "x": 3, "y": 20, "chance": 1, "repeat": 1 } + { "item": "coat_rack", "x": 3, "y": 20, "chance": 1, "repeat": 1 }, + { "item": "cash_register_random_ransacked", "x": 5, "y": 5, "chance": 100 }, + { "item": "cash_register_random_ransacked", "x": 9, "y": 5, "chance": 100 }, + { "item": "cash_register_random_ransacked", "x": 13, "y": 5, "chance": 100 }, + { "item": "cash_register_random_ransacked", "x": 17, "y": 5, "chance": 100 } ], "place_monsters": [ { "monster": "GROUP_GROCERY", "x": [ 0, 0 ], "y": [ 23, 23 ], "chance": 2, "repeat": [ 2, 3 ] }, From 6f9ccb868c2dfed99c3f96d592dc6bac2d887d1a Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:03:27 +0200 Subject: [PATCH 05/12] Update s_bookstore.json cash registers, cleanup --- data/json/mapgen/s_bookstore.json | 182 ++++++++++++++++-------------- 1 file changed, 98 insertions(+), 84 deletions(-) diff --git a/data/json/mapgen/s_bookstore.json b/data/json/mapgen/s_bookstore.json index 6db5302096468..786fbb74aea79 100644 --- a/data/json/mapgen/s_bookstore.json +++ b/data/json/mapgen/s_bookstore.json @@ -7,36 +7,39 @@ "object": { "fill_ter": "t_floor", "rows": [ - "~~~~~~~~~~~~~~~~~~~~~~~~", - "~~~~~~~~~~~~~~~~~~~~~~~~", - "*|----OOO-::--OO--OO--|*", - "*|s.l#.Thf..#ccccccccc|*", - "*|e..%................|*", - "*|#..#.hT...##%#%#%#--|*", - "*|...%..............:.:*", - "*|.###.Th...........:.:*", - "*|..................--|*", - "*|.h..h...TT.TT..]]..]|*", - "*|.T..T..........]]..]|*", - "*|.h..h...TT.TT..]]..]|*", - "*|f..............]]..]|*", - "*|...............]]..]|*", - "*|]..]]..]]..]]].....]|*", - "*|]..]]..]]........|--|*", - "*|]..]]..]]........+..|*", - "*|]..........]]]]]]|st|*", - "*|------+----------|--|*", - "***4|C.......f|bb.L|****", - "^***|CC.......+...L|*^**", - "****|CCC...CC<|-----****", - "**^*|----O----|*****^***", - "************************" + " ~~ ~", + " ~~ ~", + " |----OOO-::--OO--OO--|~", + " |s.l#.Thf..#ccccccccc|~", + " |e..%................|~", + " |#..#.hT...##%#%#%#--|~", + " |...%..............:.:~", + " |.###.Th...........:.:~", + " |..................--| ", + " |.h..h...TT.TT..]]..]| ", + " |.T..T..........]]..]| ", + " |.h..h...TT.TT..]]..]| ", + " |f..............]]..]| ", + " |...............]]..]| ", + " |]..]]..]]..]]].....]| ", + " |]..]]..]]........|--| ", + " |]..]]..]]........+''| ", + " |]..........]]]]]]|St| ", + " |------+----------|--| ", + " 4|C.......f|bb.L| ", + "^ |CC.......+...L| ^ ", + " |CCC...CC<|----- ", + " ^ |----O----| ^ ", + " " ], "terrain": { - "*": "t_region_groundcover_urban", + " ": "t_region_groundcover_urban", "^": "t_region_tree_nut", "+": "t_door_c", "-": "t_wall_w", + "'": "t_linoleum_white", + "t": "t_linoleum_white", + "S": "t_linoleum_white", ":": "t_door_glass_c", "O": "t_window", "|": "t_wall_w", @@ -45,7 +48,7 @@ "~": "t_sidewalk" }, "furniture": { - "%": "f_console_broken", + "%": "f_counter", "#": "f_counter", "T": "f_table", "]": "f_rack", @@ -56,8 +59,9 @@ "l": "f_stool", "b": "f_bench", "L": "f_locker", - "C": "f_crate_c", - "s": "f_sink" + "C": "f_cardboard_box", + "s": "f_sink", + "S": "f_sink" }, "toilets": { "t": { } }, "items": { @@ -69,7 +73,8 @@ { "item": "jackets", "chance": 20, "repeat": [ 1, 2 ] }, { "item": "bags", "chance": 20, "repeat": [ 1, 2 ] }, { "item": "snacks", "chance": 20, "repeat": [ 1, 2 ] } - ] + ], + "%": { "item": "cash_register_random", "chance": 100 } }, "place_items": [ { "item": "magazines", "x": 21, "y": [ 9, 14 ], "chance": 80, "repeat": [ 6, 20 ] }, @@ -139,7 +144,7 @@ "4": "t_gutter_downspout", "5": "t_gutter_drop" }, - "furniture": { "&": "f_roof_turbine_vent", "=": "f_vent_pipe", "C": "f_crate_c" }, + "furniture": { "&": "f_roof_turbine_vent", "=": "f_vent_pipe", "C": "f_cardboard_box" }, "place_items": [ { "item": "roof_trash", "x": [ 3, 20 ], "y": [ 4, 15 ], "chance": 50, "repeat": [ 1, 3 ] } ], "items": { "C": [ @@ -224,37 +229,40 @@ "object": { "fill_ter": "t_floor", "rows": [ - "~~~~~~~~~~~~~~~~~~~~~~~~", - "~~~~~~~~~~~~~~~~~~~~~~~~", - "~~~~~~~~~~~~~~~~~~~~~~~~", - "**|========::-OO--OO-|**", - "**|hTh.hTh...#.......|**", - "**|.h...h....#%##%##.|**", - "*qO..................Oq*", - "**|###%#.h...........|**", - "**|e...#.T...[[[[[..]|**", - "**|s..c#....>|-|....]|**", - "**|c..c#....||s|....]|**", - "**|...a#.h..|t.|TT..]|**", - "**|.##%#.T..|-+|TT..]|**", - "*qO.................]|**", - "**|hTh.hTh..........]|**", - "*qO.................]|**", - "**|[[[[[[[..[[[[[[..]|**", - "**|[[[[[[[..[[[[[[..]|**", - "**|..................|**", - "*qO..................Oq*", - "**|]]]]]]]]]]]]]]]]]]|**", - "**|------------------|**", - "************************", - "************************" + " ~~ ", + " ~~ ", + " ~~ ", + " |========::-OO--OO-| ", + " |hTh.hTh...#.h..h..| ", + " |.h...h....#%##%##.| ", + " qO..................Oq ", + " |###%#.h...........| ", + " |e...#.T...[[[[[..]| ", + " |s..c#....>|-|....]| ", + " |c..c#....||S|....]| ", + " |...a#.h..|t'|TT..]| ", + " |.##%#.T..|-+|TT..]| ", + " qO.................]| ", + " |hTh.hTh..........]| ", + " qO.................]| ", + " |[[[[[[[..[[[[[[..]| ", + " |[[[[[[[..[[[[[[..]| ", + " |..................| ", + " qO..................Oq ", + " |]]]]]]]]]]]]]]]]]]| ", + " |------------------| ", + " ", + " " ], "terrain": { "#": "t_floor", - "*": "t_region_groundcover_urban", + " ": "t_region_groundcover_urban", "+": "t_door_c", "-": "t_wall_w", ".": "t_floor", + "'": "t_linoleum_white", + "S": "t_linoleum_white", + "t": "t_linoleum_white", ":": "t_door_glass_c", "=": "t_wall_glass", ">": "t_stairs_up", @@ -264,7 +272,7 @@ "~": "t_sidewalk" }, "furniture": { - "%": "f_console_broken", + "%": "f_counter", "#": "f_counter", "T": "f_table", "[": "f_rack", @@ -273,8 +281,9 @@ "c": "f_cupboard", "e": "f_fridge", "h": "f_chair", - "q": "f_bluebell", - "s": "f_sink" + "q": "f_region_flower", + "s": "f_sink", + "S": "f_sink" }, "toilets": { "t": { } }, "place_items": [ @@ -295,7 +304,8 @@ { "item": "coffee_table", "x": 4, "y": 13, "chance": 20 }, { "item": "coffee_table", "x": 8, "y": 13, "chance": 20 } ], - "place_item": [ { "item": "coffeemaker", "x": 4, "y": 7, "chance": 30 }, { "item": "coffeemaker", "x": 4, "y": 12, "chance": 30 } ] + "place_item": [ { "item": "coffeemaker", "x": 4, "y": 7, "chance": 30 }, { "item": "coffeemaker", "x": 4, "y": 12, "chance": 30 } ], + "items": { "%": { "item": "cash_register_random", "chance": 100 } } } }, { @@ -377,7 +387,8 @@ { "item": "baked_goods", "chance": 30 }, { "item": "coffee_counter", "chance": 20 } ] - } + }, + "place_loot": [ { "group": "cash_register_random", "x": 5, "y": [ 4, 6 ] } ] } }, { @@ -432,35 +443,38 @@ "fill_ter": "t_floor", "rows": [ "~~~~~~~~~~~~~~~~~~~~~~~~", - "~~~qSq~~~~~~~~~~qqq~~~~~", + "~~~qSq~~~~~~~~~~qSq~~~~~", "~~~~~~~~~~~~~~~~~~~~~~~~", "~~~~~~~~~~~~~~~~~~~~~~~~", - "***********~************", - "***********~**|-----|***", - "*******^***~**|]]]]]|***", - "***********~**|]...]|***", - "***^*******~**|].].]|***", - "***********~**|].].]|***", - "***********~**|].].]|***", - "****|------+-O|....]|***", - "****|]]]]]..#a...T.]|***", - "****|]......#%#..T.]|***", - "****|].]]].........]|***", - "****|].]]].TT..TT..]|***", - "****|].............]|***", - "****|]]]]]]]]]]]]..]|***", - "****|------------.--||**", - "***********4|LbL|.|ts|**", - "*o**********+...+.+..|**", - "*******o****---------|**", - "**************o*********", - "************************" + " ~ ", + " ~ |-----| ", + " ^ ~ |]]]]]| ", + " ~ |]...]| ", + " ^ ~ |].].]| ", + " ~ |].].]| ", + " ~ |].].]| ", + " |------+-O|....]| ", + " |]]]]]..#a...T.]| ", + " |]......###..T.]| ", + " |].]]].........]| ", + " |].]]].TT..TT..]| ", + " |].............]| ", + " |]]]]]]]]]]]]..]| ", + " |------------.--|| ", + " 4|LbL|.|ts| ", + " o +...+.+''| ", + " o ---------| ", + " o ", + " " ], "terrain": { - "*": "t_region_groundcover_urban", + " ": "t_region_groundcover_urban", "+": [ "t_door_c", "t_door_locked" ], "-": "t_wall_w", ".": "t_floor", + "t": "t_linoleum_white", + "s": "t_linoleum_white", + "'": "t_linoleum_white", "O": "t_window", "S": "t_sidewalk", "^": "t_region_tree_nut", @@ -471,7 +485,6 @@ "~": "t_sidewalk" }, "furniture": { - "%": "f_console_broken", "#": "f_counter", "S": "f_statue", "T": "f_table", @@ -533,7 +546,8 @@ { "item": "mansion_books", "x": [ 7, 9 ], "y": [ 14, 15 ], "chance": 10, "repeat": 2 }, { "item": "bookstore_misc", "x": [ 11, 12 ], "y": 15, "chance": 25, "repeat": [ 2, 3 ] }, { "item": "bookstore_misc", "x": [ 15, 16 ], "y": 15, "chance": 25, "repeat": [ 2, 3 ] }, - { "item": "bookstore_misc", "x": 17, "y": [ 12, 13 ], "chance": 25, "repeat": [ 2, 3 ] } + { "item": "bookstore_misc", "x": 17, "y": [ 12, 13 ], "chance": 25, "repeat": [ 2, 3 ] }, + { "item": "cash_register_random", "x": [ 12, 14 ], "y": 13, "chance": 100 } ] } }, From 4f176b19b26958ce578ec4008f95e94e5f1c6192 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:04:14 +0200 Subject: [PATCH 06/12] Update s_candy.json cash register, regional terrain, cleanups, regional flowers --- data/json/mapgen/s_candy.json | 110 +++++++++++++++++----------------- 1 file changed, 54 insertions(+), 56 deletions(-) diff --git a/data/json/mapgen/s_candy.json b/data/json/mapgen/s_candy.json index 8d756346dc7f3..f3f47093045cb 100644 --- a/data/json/mapgen/s_candy.json +++ b/data/json/mapgen/s_candy.json @@ -7,26 +7,26 @@ "object": { "fill_ter": "t_floor", "rows": [ - ".............dssd.......", - "....fD..f.D..dssd....fD.", - "........D.f..dssd..d....", - "...uudud.....dssd.d7d...", - "..|-----|rrrrrssd..d....", - "..|____^|sbbsRssdudud...", + ".............fssf.......", + ".....7.......fssf.......", + ".............fssf.......", + "...uuuuu.....fssf..7....", + "..|-----|rrrrrssf.......", + "..|____^|sbbsRssfuuuu...", "..|B____asssssss|----|..", "..|B____asssssss|H__H|..", "..|^____|sbbssss|t__t|..", "..|B____||||---||H__H|..", - "..|B____{#&__________|..", + "..|B____{{&__________|..", "..|__________________|..", "..|^{_____________SSS|..", "..|||cccc|||www|__||||..", "..|_^__C__&|F##|__|e#|..", - "..|C___________|__+__|..", - "..|tt__________+__|T_|..", + "..|C_______ |__+ |..", + "..|tt______ +__|T |..", "..|ttC_{{{_|o##|__||||..", - "..|||w||w|||||||__|T_|..", - "........4pggppph__+__|..", + "..|||w||w|||||||__|T |..", + "........4pggppph__+ |..", "........ppppppp|ll|#e|..", "........ppppppp|||||||..", "........................", @@ -35,21 +35,25 @@ "terrain": { "+": "t_door_c", "-": "t_wall_glass", - ".": [ [ "t_grass", 5 ], [ "t_grass_long", 5 ], "t_dirt" ], - "7": "t_tree_apple_harvested", - "D": "t_dirt", - "R": "t_railing_v", + ".": "t_region_groundcover_urban", + "7": "t_region_tree_fruit", + "R": "t_railing", "_": "t_floor", + " ": "t_linoleum_white", + "e": "t_linoleum_white", + "#": "t_linoleum_white", + "T": "t_linoleum_white", + "o": "t_linoleum_white", + "F": "t_linoleum_white", "a": "t_door_glass_c", "b": "t_sidewalk", - "d": "t_dirt", - "f": "t_dirt", - "g": "t_grass", + "f": "t_region_groundcover_urban", + "g": "t_concrete", "h": "t_door_locked", - "p": "t_pavement", + "p": "t_concrete", "r": "t_railing_h", "s": "t_sidewalk", - "u": "t_underbrush", + "u": "t_region_shrub_decorative", "w": "t_window", "4": "t_gutter_downspout", "|": "t_wall_y" @@ -59,7 +63,6 @@ "&": "f_trashcan", "B": "f_bench", "C": "f_chair", - "D": "f_dahlia", "F": "f_fridge", "H": "f_armchair", "S": "f_sofa", @@ -68,7 +71,7 @@ "b": "f_bench", "c": "f_counter", "e": "f_sink", - "f": "f_bluebell", + "f": "f_region_flower", "g": "f_dumpster", "l": "f_locker", "o": "f_oven", @@ -96,7 +99,8 @@ { "item": "candy_shop", "x": 4, "y": 12, "chance": 75 }, { "item": "candy_shop", "x": 8, "y": 10, "chance": 75 }, { "item": "light_reading", "x": 8, "y": 13, "chance": 25 }, - { "item": "light_reading", "x": 3, "y": 7, "chance": 25 } + { "item": "light_reading", "x": 3, "y": 7, "chance": 25 }, + { "item": "cash_register_random", "x": [ 5, 8 ], "y": 13, "chance": 100 } ] } }, @@ -170,49 +174,45 @@ "rows": [ "............ss..........", "............ss..........", - "...d....d...ss.u.u.u.u..", - "..d7d..d4d..ss|||||||||.", + "...d....d...ssuuuuuuuuu.", + "..dtd..dtd..ss|||||||||.", "...d....d..bss-____#__|.", "...........bss-____#__|.", "............ss|||__#C_|.", "...d........ssss+__#__|.", - "..dtd....uu.ssss+__#__|.", - "...d....||-----||__#&_|.", - ".......d|^_________##_|.", - ".......f-_____________|.", + "..dtd.......ssss+__#__|.", + "...d...u||-----||__#&_|.", + ".......u|^_________##_|.", + ".......u-_____________|.", "...d...u-__{__{_______|.", - "..d4d..e-__{__{___{w_w|.", - "...d...D-__{__{___{w__|.", + "..dtd..u-__{__{___{w_w|.", + "...d...u-__{__{___{w__|.", ".......u-__{__{___{wwa|.", - ".......g|__{__{___#wT_|.", - "...d...f|__{__{___#w#S|.", - "..dhd..u|__{__{__||||||.", - "...d...D|________aspcc5.", - ".......d|^______&|spppp.", - "........||||||||||spppp.", - "..................spppp.", + ".......u|__{__{___#wT |.", + "...d...u|__{__{___#wS |.", + "..dtd..u|__{__{__||||||.", + "...d...u|________appcc5.", + ".......u|^______&|ppppp.", + ".......u||||||||||ppppp.", + "..................ppppp.", "........................" ], "terrain": { "+": "t_door_glass_c", "-": "t_wall_glass", - ".": [ [ "t_grass", 5 ], [ "t_grass_long", 5 ], "t_dirt" ], - "4": "t_tree_pine", - "7": "t_tree_birch_harvested", - "D": "t_dirt", + ".": "t_region_groundcover_urban", + "d": "t_region_groundcover_urban", "_": "t_floor", + "T": "t_linoleum_white", + " ": "t_linoleum_white", + "S": "t_linoleum_white", "a": "t_door_c", - "b": "t_sidewalk", - "c": "t_pavement", - "d": "t_dirt", - "e": "t_dirt", - "f": "t_dirt", - "g": "t_dirt", - "h": "t_tree", - "p": "t_pavement", + "b": "t_region_groundcover_urban", + "c": "t_concrete", + "p": "t_concrete", "s": "t_sidewalk", "t": "t_tree_maple_tapped", - "u": "t_underbrush", + "u": "t_region_shrub_decorative", "w": "t_wall_y", "5": "t_gutter_downspout", "|": "t_brick_wall" @@ -221,15 +221,12 @@ "#": "f_counter", "&": "f_trashcan", "C": "f_chair", - "D": "f_dandelion", "S": "f_sink", "T": "f_toilet", "^": "f_indoor_plant", "b": "f_bench", + "d": "f_region_flower", "c": "f_dumpster", - "e": "f_dahlia", - "f": "f_bluebell", - "g": "f_chamomile", "{": "f_rack" }, "toilets": { "T": { } }, @@ -250,7 +247,8 @@ { "item": "toy_store", "x": 18, "y": 16, "chance": 55 }, { "item": "toy_store", "x": 14, "y": [ 15, 16 ], "chance": 55 }, { "item": "toy_store", "x": 14, "y": 12, "chance": 55 }, - { "item": "toy_store", "x": 19, "y": 4, "chance": 55 } + { "item": "toy_store", "x": 19, "y": 4, "chance": 55 }, + { "item": "cash_register_random", "x": 19, "y": [ 4, 8 ], "chance": 100 } ] } }, From edf7a97657f14e50e28752803835cec0819b568c Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:04:59 +0200 Subject: [PATCH 07/12] Update s_icecream.json cash register, cleanup, fill_ter, regional terrain --- data/json/mapgen/s_icecream.json | 83 ++++++++++++++------------------ 1 file changed, 35 insertions(+), 48 deletions(-) diff --git a/data/json/mapgen/s_icecream.json b/data/json/mapgen/s_icecream.json index d72930e351289..983686e938b47 100644 --- a/data/json/mapgen/s_icecream.json +++ b/data/json/mapgen/s_icecream.json @@ -5,74 +5,60 @@ "om_terrain": [ "icecream_shop" ], "weight": 100, "object": { + "fill_ter": "t_linoleum_gray", "rows": [ - ".............d__d.......", - ".............d__d.......", - "...D...b.....d__d.......", - "..bab.DaD...d____d......", - "...D...b...d#____#d.....", - "...........d#____#d.....", - "............d____d......", - "..dddddddddddd__ddddddd.", - "..d______________#t#__d.", - "..d______________#t#__d.", - "..dCC_________________d.", - "..|w'||||___##__##____d.", - "..|cc-ff+___tt__tt__v|..", - "..|ffcff+___##__##__v|..", - "..|efcff||||||||||||||..", - "..|ff-ff-T&-j{{{c&ccc|..", - "..|ff-ffgfc-fffffffff|..", - "..|ff-k-----offfffffh|..", - "..|fffffffffffffffffh|..", - "..|meffffffffff---g--|..", - "..||||||||||||||ffffl|..", - "...4....piippp_nffffl|..", - "........pppppp_|||||||..", - "........................" + " D__D ", + " DD__DD ", + " D D D____D ", + " DaD DaD D#__#D ", + " D D D#__#D ", + " D____D ", + " DD__DD ", + " D__D ", + " dddddddddddd__dddddd ", + " d_______________#t#d ", + " d__________________d ", + " |w'||||___##__##___d ", + " |cc-j.+___tt__tt__v| ", + " |..c..+___##__##__v| ", + " |e.c..|||||||||||||| ", + " |..-..-T&-j{{{c&ccc| ", + " |..-..g.c-.........| ", + " |..-k-----o.......h| ", + " |j................h| ", + " |me..........---g--| ", + " ||||||||||||||....l| ", + " 4 ppiiippn....l| ", + " ppppppp||||||| ", + " " ], "terrain": { "#": "t_sidewalk", - "&": "t_floor", "'": "t_window_no_curtains_open", "+": "t_door_glass_c", "-": "t_wall_y", - ".": "t_grass", - "C": "t_sidewalk", - "D": "t_dirt", - "T": "t_floor", + " ": "t_region_groundcover_urban", + "D": "t_region_groundcover_urban", + "a": "t_region_tree_fruit", + "d": "t_glass_railing", "_": "t_sidewalk", - "a": "t_dirt", - "b": "t_dirt", - "c": "t_floor", - "d": "t_dirt", - "e": "t_floor", - "f": "t_floor", + ".": "t_linoleum_gray", "g": "t_door_c", - "h": "t_floor", - "i": "t_pavement", - "j": "t_floor", + "i": "t_concrete", "k": "t_door_c_peep", - "l": "t_floor", - "m": "t_floor", "n": "t_door_locked_interior", - "o": "t_floor", - "p": "t_pavement", + "p": "t_concrete", "t": "t_sidewalk", "v": "t_sidewalk", "w": "t_window", - "{": "t_floor", "|": "t_brick_wall", "4": "t_gutter_downspout" }, "furniture": { "#": "f_bench", "&": "f_sink", - "C": "f_counter", - "D": "f_dahlia", + "D": "f_region_flower", "T": "f_toilet", - "a": "f_dandelion", - "b": "f_bluebell", "c": "f_counter", "e": "f_chair", "h": "f_cupboard", @@ -109,7 +95,8 @@ { "item": "floor_trash", "x": 3, "y": 9, "chance": 35 }, { "item": "floor_trash", "x": 14, "y": 4, "chance": 35 }, { "item": "candy_shop", "x": 19, "y": 15, "chance": 75 }, - { "item": "light_reading", "x": 5, "y": 14, "chance": 25 } + { "item": "light_reading", "x": 5, "y": 14, "chance": 25 }, + { "item": "cash_register_random", "x": 3, "y": 12, "chance": 100 } ], "place_item": [ { "item": "cookies", "x": 18, "y": 15 }, From c87bfa14d0ad4570ca4f20fd58327ef9b9b3155d Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:05:49 +0200 Subject: [PATCH 08/12] Update s_camping.json cash registers, ihatepavement --- data/json/mapgen/store/s_camping.json | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/data/json/mapgen/store/s_camping.json b/data/json/mapgen/store/s_camping.json index ecfe2d116fdcc..da3b7661a0c2d 100644 --- a/data/json/mapgen/store/s_camping.json +++ b/data/json/mapgen/store/s_camping.json @@ -24,7 +24,7 @@ ".# ssssss y#________g..", ".# ||||||b|#;_K__jjj#..", ".# |ooo===q###hh#####..", - ".#|b|oop===q#mm__illlg..", + ".#|b|ooo===q#mm__illlg..", ".#z |=======b_____lllg..", ".# |rr=====b________h..", ";#AB|krr==kk#iii_____g..", @@ -38,13 +38,13 @@ "c": "t_wall_glass", ".": "t_region_groundcover_urban", "`": "t_sidewalk", - "_": "t_pavement", + "_": "t_concrete", "g": "t_chainfence_v", "h": "t_chaingate_c", - "i": "t_pavement", - "j": "t_pavement", - "l": "t_pavement", - "m": "t_pavement", + "i": "t_concrete", + "j": "t_concrete", + "l": "t_concrete", + "m": "t_concrete", "=": "t_thconc_floor", "o": "t_thconc_floor", "p": "t_thconc_floor", @@ -53,11 +53,11 @@ "k": "t_thconc_floor", "s": "t_linoleum_gray", "t": "t_linoleum_gray", - "v": "t_pavement", - "w": "t_pavement", - "x": "t_pavement", - "K": "t_pavement", - "G": "t_pavement", + "v": "t_concrete", + "w": "t_concrete", + "x": "t_concrete", + "K": "t_concrete", + "G": "t_concrete", ";": "t_gutter_downspout" }, "furniture": { @@ -68,14 +68,13 @@ "r": "f_camp_chair", "k": "f_tourist_table", "l": "f_dumpster", - "m": "f_crate_c", - "o": "f_crate_c", - "p": "f_crate_o", + "m": [ "f_crate_c", "f_cardboard_box" ], + "o": [ "f_crate_c", "f_cardboard_box" ], "q": "f_bench", "s": "f_rack", "ƃ": "f_counter_gate_c", "t": "f_counter", - "u": "f_console_broken", + "u": "f_counter", "v": "f_groundsheet", "w": "f_canvas_wall", "x": "f_canvas_door", @@ -106,7 +105,8 @@ { "group": "camping", "chance": 60, "repeat": 4, "x": [ 5, 6 ], "y": 17 }, { "group": "hand_tools", "chance": 50, "repeat": 3, "x": 7, "y": 17 }, { "group": "cannedfood", "chance": 60, "repeat": 6, "x": [ 5, 6 ], "y": 18 } - ] + ], + "items": { "u": { "item": "cash_register_random", "chance": 100 } } } }, { From 583ac92e412b3c643f1a4d99e44eeda5b4012fd5 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:06:22 +0200 Subject: [PATCH 09/12] Update s_diner.json cash register --- data/json/mapgen/store/s_diner.json | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/data/json/mapgen/store/s_diner.json b/data/json/mapgen/store/s_diner.json index 2353caf4115aa..af89038a2a79c 100644 --- a/data/json/mapgen/store/s_diner.json +++ b/data/json/mapgen/store/s_diner.json @@ -7,13 +7,13 @@ "fill_ter": "t_linoleum_white", "rows": [ "%%%%```%%%%!!%````!%....", - ".`````````%%%%````!%.[..", - ".`````````````````!%%%%%", - ".``v```v``%%%%````!!!!!!", - ".`vuv`vuv##bb##cc##bb##.", - ".``v```v`#<;;;;;;;;;;;#.", - ".````````#G ;gG ;gG ;G#.", - ".##bbbbb##F; Ff; Ff; F#.", + "%`````````%%%%````!%.[..", + "%`````````````````!%%%%%", + "%``v```v``%%%%````!!!!!!", + "%`vuv`vuv##bb##cc##bb##.", + "%``v```v`#<;;;;;;;;;;;#.", + "%````````#G ;gG ;gG ;G#.", + "%##bbbbb##F; Ff; Ff; F#.", ".bHH;G;HH#G ;gG ;gG ;G#.", ".bFF F FF#;; ; ; ; ; ;#.", ".bH@;g;@H## ;## ;## ;##.", @@ -32,7 +32,7 @@ "......```..............." ], "terrain": { - "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], + "%": [ "t_region_shrub_fruit", "t_region_shrub_decorative" ], "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ], "!": "t_region_groundcover_urban", "#": "t_brick_wall", @@ -64,7 +64,7 @@ "<": "t_stairs_up" }, "furniture": { - "n": "f_console_broken", + "n": "f_counter", "e": "f_counter", "f": "f_table", "F": "f_table", @@ -91,6 +91,7 @@ "toilets": { "j": { } }, "items": { "p": { "item": "oven", "chance": 80, "repeat": [ 2, 4 ] }, + "n": { "item": "cash_register_random", "chance": 100 }, "F": [ { "item": "coffee_dishes", "chance": 20 }, { "item": "coffee_condiments", "chance": 20 }, From b883cdbb45590667d784698b52cea661fe96c27a Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:07:25 +0200 Subject: [PATCH 10/12] Update s_liquor.json cash registers, linoleum toilet, regional terrain --- data/json/mapgen/s_liquor.json | 93 +++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 42 deletions(-) diff --git a/data/json/mapgen/s_liquor.json b/data/json/mapgen/s_liquor.json index 67add2be17008..47ebd33d1b202 100644 --- a/data/json/mapgen/s_liquor.json +++ b/data/json/mapgen/s_liquor.json @@ -7,25 +7,25 @@ "object": { "fill_ter": "t_floor", "rows": [ - " ", - " ", - " --:---------+--:-- ", + " _ ", + " _ ", + " ||:|||||||||+||:|| ", " |#..#####....cs..| ", " |#..##.......c...| ", " |#..##..##...ccc.| ", " |#..##..##.......| ", " |#..##..........&| ", " |.......#####...&| ", - " |--+-...#####...&| ", - " |S..|...........&| ", - " |U..|.........&&&| ", - " ---------+-------- ", + " |||+|...#####...&| ", + " |S,,|...........&| ", + " |U,,|.........&&&| ", + " |||||||||+|||||||| ", " _4{{{|K=====<|..L| ", " __{{{|KK=====+..B| ", " _____|KKK====|..L| ", - " _____|KKK====|---| ", + " _____|KKK====||||| ", " _____|KK====*|{{{_ ", - " _____-^^^^^^--____ ", + " _____|^^^^^^||____ ", " ____________*_____ ", " __________________ ", " __________________ ", @@ -33,12 +33,14 @@ " __________________ " ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], - "-": "t_wall_g", + " ": "t_region_groundcover_urban", ".": "t_floor", ":": "t_window", - "_": "t_pavement", - "{": "t_pavement", + "_": "t_concrete", + "{": "t_concrete", + ",": "t_linoleum_white", + "S": "t_linoleum_white", + "U": "t_linoleum_white", "|": "t_wall_g", "=": "t_thconc_floor", "K": "t_thconc_floor", @@ -70,7 +72,8 @@ { "item": "liqstore_brew", "x": 16, "y": [ 3, 5 ], "chance": 70, "repeat": [ 1, 12 ] }, { "item": "liqstore_brew", "x": [ 17, 18 ], "y": 5, "chance": 70, "repeat": [ 1, 12 ] }, { "item": "trash", "x": [ 5, 7 ], "y": 14, "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "trash", "x": 18, "y": [ 15, 17 ], "chance": 30, "repeat": [ 1, 2 ] } + { "item": "trash", "x": 18, "y": [ 15, 17 ], "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "cash_register_random", "x": 16, "y": [ 3, 5 ], "chance": 100 } ], "items": { "K": { "item": "keg_beer", "chance": 70 }, "L": { "item": "jackets", "chance": 50 } }, "toilets": { "U": { } }, @@ -86,25 +89,25 @@ "object": { "fill_ter": "t_floor", "rows": [ - " ", - " ", - " --:---------+--:-- ", + " _ ", + " _ ", + " ||:|||||||||+||:|| ", " |#..#####....cs..| ", " |#..##;......c...| ", " |#Z.##..##...ccc.| ", " |#..##..##.Z.,...| ", " |#..##..........&| ", " |.......#####...&| ", - " |--+-...#####...&| ", - " |S..|..,.......;&| ", - " |U..|.....;...&&&| ", - " ---------+-------- ", + " |||+|...#####...&| ", + " |S,,|..,.......;&| ", + " |U,,|.....;...&&&| ", + " |||||||||+|||||||| ", " _4{{{|K=====<|..L| ", " __{{{|KK=====+..B| ", " _____|KKK====|..L| ", - " _____|KKK====|---| ", + " _____|KKK====||||| ", " _____|KK====*|{{{_ ", - " _____-^^^^^^--____ ", + " _____|^^^^^^||____ ", " ____________*_____ ", " __________________ ", " __________________ ", @@ -112,12 +115,14 @@ " __________________ " ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], - "-": "t_wall_g", + " ": "t_region_groundcover_urban", ".": "t_floor", ":": [ [ "t_window_frame", 70 ], [ "t_window_empty", 20 ], [ "t_window", 5 ] ], - "_": "t_pavement", - "{": "t_pavement", + "_": "t_concrete", + "{": "t_concrete", + ",": "t_linoleum_white", + "S": "t_linoleum_white", + "U": "t_linoleum_white", "|": "t_wall_g", "=": "t_thconc_floor", "K": "t_thconc_floor", @@ -149,7 +154,8 @@ { "item": "liqstore_brew", "x": 16, "y": [ 3, 5 ], "chance": 5, "repeat": [ 1, 12 ] }, { "item": "liqstore_brew", "x": [ 17, 18 ], "y": 5, "chance": 5, "repeat": [ 1, 12 ] }, { "item": "trash", "x": [ 5, 7 ], "y": 14, "chance": 90, "repeat": [ 1, 2 ] }, - { "item": "trash", "x": 18, "y": [ 15, 17 ], "chance": 90, "repeat": [ 1, 2 ] } + { "item": "trash", "x": 18, "y": [ 15, 17 ], "chance": 90, "repeat": [ 1, 2 ] }, + { "item": "cash_register_random_ransacked", "x": 16, "y": [ 3, 5 ], "chance": 100 } ], "fields": { "U": { "field": "fd_bile", "intensity": 1, "age": 10 }, "S": { "field": "fd_bile", "intensity": 1, "age": 10 } }, "item": { @@ -187,25 +193,25 @@ "object": { "fill_ter": "t_floor", "rows": [ - " ", - " ", - " --:---------+--:-- ", + " _ ", + " _ ", + " ||:|||||||||+||:|| ", " |#..#####....cs..| ", " |#..##.......c...| ", " |#..##..##...ccc.| ", " |#..##..##.......| ", " |#..##..........&| ", " |.......#####...&| ", - " |--+-...#####...&| ", - " |S..|...........&| ", - " |U..|.........&&&| ", - " ---------+-------- ", + " |||+|...#####...&| ", + " |S,,|...........&| ", + " |U,,|.........&&&| ", + " |||||||||+|||||||| ", " _4{{{|K=====<|..L| ", " __{{{|KK=====+..B| ", " _____|KKK====|..L| ", - " _____|KKK====|---| ", + " _____|KKK====||||| ", " _____|KK====*|{{{_ ", - " _____-^^^^^^--____ ", + " _____|^^^^^^||____ ", " ____________*_____ ", " __________________ ", " __________________ ", @@ -213,12 +219,14 @@ " __________________ " ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], - "-": "t_wall_g", + " ": "t_region_groundcover_urban", ".": "t_floor", ":": "t_window_boarded", - "_": "t_pavement", - "{": "t_pavement", + "_": "t_concrete", + "{": "t_concrete", + ",": "t_linoleum_white", + "S": "t_linoleum_white", + "U": "t_linoleum_white", "|": "t_wall_g", "=": "t_thconc_floor", "K": "t_thconc_floor", @@ -250,7 +258,8 @@ { "item": "liqstore_brew", "x": 16, "y": [ 3, 5 ], "chance": 5, "repeat": [ 1, 12 ] }, { "item": "liqstore_brew", "x": [ 17, 18 ], "y": 5, "chance": 5, "repeat": [ 1, 12 ] }, { "item": "trash", "x": [ 5, 7 ], "y": 14, "chance": 80, "repeat": [ 1, 2 ] }, - { "item": "trash", "x": 18, "y": [ 15, 17 ], "chance": 80, "repeat": [ 1, 2 ] } + { "item": "trash", "x": 18, "y": [ 15, 17 ], "chance": 80, "repeat": [ 1, 2 ] }, + { "item": "cash_register_random_ransacked", "x": 16, "y": [ 3, 5 ], "chance": 100 } ], "items": { "K": { "item": "keg_beer", "chance": 70 }, "L": { "item": "jackets", "chance": 50 } }, "toilets": { "U": { } }, From a0a595fd63f317d533dd35a7c31b0a4e65d7e6b0 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 8 May 2022 20:56:01 +0200 Subject: [PATCH 11/12] Update s_liquor.json fix fields --- data/json/mapgen/s_liquor.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/mapgen/s_liquor.json b/data/json/mapgen/s_liquor.json index 47ebd33d1b202..d053a062991da 100644 --- a/data/json/mapgen/s_liquor.json +++ b/data/json/mapgen/s_liquor.json @@ -99,8 +99,8 @@ " |#..##..........&| ", " |.......#####...&| ", " |||+|...#####...&| ", - " |S,,|..,.......;&| ", - " |U,,|.....;...&&&| ", + " |S''|..,.......;&| ", + " |U''|.....;...&&&| ", " |||||||||+|||||||| ", " _4{{{|K=====<|..L| ", " __{{{|KK=====+..B| ", @@ -120,7 +120,7 @@ ":": [ [ "t_window_frame", 70 ], [ "t_window_empty", 20 ], [ "t_window", 5 ] ], "_": "t_concrete", "{": "t_concrete", - ",": "t_linoleum_white", + "'": "t_linoleum_white", "S": "t_linoleum_white", "U": "t_linoleum_white", "|": "t_wall_g", From 5721b8e053ba569ab9241cedbd210c5dcc3ae725 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Mon, 9 May 2022 16:04:42 +0200 Subject: [PATCH 12/12] small fix --- data/json/mapgen/s_gun.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mapgen/s_gun.json b/data/json/mapgen/s_gun.json index e57e2ffe1ef88..5ed79b220932a 100644 --- a/data/json/mapgen/s_gun.json +++ b/data/json/mapgen/s_gun.json @@ -448,7 +448,7 @@ ",,W.................W,,,", ",,W...T....T....T...W,,,", ",,WxxxxxxxxxxxxxxxxxW,,,", - ",,WWWWWWWWWWWWWWWWWWW,,." + ",,WWWWWWWWWWWWWWWWWWW,,," ], "palettes": [ "gun_store_palette" ], "terrain": { ";": "t_region_groundcover_urban" },