Skip to content

Commit

Permalink
Merge pull request #58186 from LovamKicsiGazsii/regional-terrain-upda…
Browse files Browse the repository at this point in the history 
…te-1

Regional Terrain Update 1
  • Loading branch information
@dseguin
dseguin committed Jun 6, 2022
2 parents 74a67c4 + 1e64f45 commit 90e1eb2
Show file tree
Hide file tree
Showing 9 changed files with 994 additions and 1,480 deletions.
971 changes: 357 additions & 614 deletions data/json/mapgen/abandoned_warehouse.json
View file

Large diffs are not rendered by default.

514 changes: 202 additions & 312 deletions data/json/mapgen/cemetery_small.json
View file

Large diffs are not rendered by default.

111 changes: 53 additions & 58 deletions data/json/mapgen/cs_gardening_allotment.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,57 +21,47 @@
"method": "json",
"weight": 1000,
"object": {
"fill_ter": "t_dirtfloor",
"fill_ter": "t_region_soil",
"rows": [
".......~~~..............",
".......~~~..............",
"..-----===------------..",
"..|3333~~~444.sss.aaa|..",
"..|3333~~~444.sss.aaa|..",
"..|3333.~~444.sss~aaa|..",
"..|...~~~~~~.....~...|..",
"..|agaa.~.888.aaa.111|..",
"..|gaga.~.888.aaa.111|..",
"..|agga.~.888.aaa~111|..",
"..|...~.~~~..~...~...|..",
"..|gggg.~.SSS.222.666|..",
"..|gggg.~.SSS.222.666|..",
"..|gggg.~.SSS.222.666|..",
"..|..~~~~~~..~..~~~~.|..",
"..|hhhh.~.555~aaa~RRR|..",
"..|hhhh.~.555.aaa~RRR|..",
"..|hhhh.~.555OaaatRRR|..",
"..|.s...~.wwwwwwwwwwwww.",
"..|...~~~sw77777777777w.",
"..|sT.~~~~d,,,,B,,,,,Aw.",
"..----=---w,CCC,,B,,B7w.",
"..........wwwwwwwwwwwww.",
"........................"
" ____ ",
" ____ ",
" ||||====|||||||||||| ",
" |333____444_sss_aaa| ",
" |333____444_sss_aaa| ",
" |333____444_sss_aaa| ",
" |__________________| ",
" |aaa____888_aaa_111| ",
" |aaa____888_aaa_111| ",
" |aaa____888_aaa_111| ",
" |__________________| ",
" |ggg____SSS_222_666| ",
" |ggg____SSS_222_666| ",
" |ggg____SSS_222_666| ",
" |__________________| ",
" |hhh____555_aaa_RRR| ",
" |hhh____555_aaa_RRR| ",
" |hhh____555_aaa_RRR| ",
" |______twwwwwwwwwwwww ",
" |______Ow77777777777w ",
" |_T_____d,,,,B,,,,,Aw ",
" |||||==|w,CCC,,B,,B7w ",
" wwwwwwwwwwwww ",
" "
],
"terrain": {
".": "t_grass",
"-": "t_chainfence_h",
"|": "t_chainfence_v",
" ": "t_region_groundcover_urban",
"|": "t_chainfence",
"=": "t_chaingate_c",
"T": "t_tree_apple",
"s": "t_shrub",
"~": "t_dirt",
"t": "t_dirt",
"T": "t_region_tree_fruit",
"_": "t_region_soil",
"h": "t_dirtmound",
",": "t_dirtfloor",
"C": "t_dirtfloor",
"B": "t_dirtfloor",
"A": "t_dirtfloor",
"7": "t_dirtfloor",
"w": "t_wall_wood",
"d": "t_door_o",
"a": "t_dirtmound",
"R": "t_shrub_blueberry",
"S": "t_shrub_strawberry",
"g": "t_underbrush",
"1": "t_dirtmound",
"2": "t_dirtmound",
"3": "t_dirtmound",
"4": "t_dirtmound",
"5": "t_dirtmound",
"8": "t_dirtmound",
"6": "t_dirtmound"
"d": "t_door_o"
},
"furniture": {
"7": "f_table",
Expand All @@ -81,31 +71,36 @@
"D": "f_trashcan",
"t": "f_standing_tank",
"O": "f_standing_tank",
"h": "f_hay"
"h": "f_hay",
"a": "f_planter"
},
"liquids": { "O": { "liquid": "water", "amount": [ 0, 100 ] }, "t": { "liquid": "fertilizer_liquid", "amount": [ 0, 100 ] } },
"sealed_item": {
"1": { "item": { "item": "seed_tomato" }, "furniture": "f_plant_seedling", "chance": 70 },
"2": { "item": { "item": "seed_lettuce" }, "furniture": "f_plant_seedling", "chance": 70 },
"3": { "item": { "item": "seed_cucumber" }, "furniture": "f_plant_seedling", "chance": 70 },
"4": { "item": { "item": "seed_carrot" }, "furniture": "f_plant_seedling", "chance": 70 },
"5": { "item": { "item": "seed_zucchini" }, "furniture": "f_plant_seedling", "chance": 70 },
"8": { "item": { "item": "seed_celery" }, "furniture": "f_plant_seedling", "chance": 70 },
"6": { "item": { "item": "seed_pumpkin" }, "furniture": "f_plant_seedling", "chance": 70 }
"1": { "item": { "item": "seed_tomato" }, "furniture": "f_planter_seedling", "chance": 100 },
"2": { "item": { "item": "seed_lettuce" }, "furniture": "f_planter_seedling", "chance": 100 },
"3": { "item": { "item": "seed_cucumber" }, "furniture": "f_planter_seedling", "chance": 100 },
"4": { "item": { "item": "seed_carrot" }, "furniture": "f_planter_seedling", "chance": 100 },
"5": { "item": { "item": "seed_zucchini" }, "furniture": "f_planter_seedling", "chance": 100 },
"8": { "item": { "item": "seed_celery" }, "furniture": "f_planter_seedling", "chance": 100 },
"6": { "item": { "item": "seed_pumpkin" }, "furniture": "f_planter_seedling", "chance": 100 },
"R": { "item": { "item": "seed_blueberries" }, "furniture": "f_planter_seedling", "chance": 100 },
"S": { "item": { "item": "seed_strawberries" }, "furniture": "f_planter_seedling", "chance": 100 },
"s": { "item": { "item": "seed_corn" }, "furniture": "f_planter_seedling", "chance": 100 },
"g": { "item": { "item": "seed_cabbage" }, "furniture": "f_planter_seedling", "chance": 100 }
},
"items": { "C": { "item": "ga_items_1", "chance": 80 } },
"items": { "C": { "item": "ga_items_1", "chance": 80 }, "7": { "item": "garden_shed", "chance": 33 } },
"place_items": [
{ "item": "ga_items_1", "chance": 80, "x": 12, "y": 21 },
{ "item": "ga_items_1", "chance": 80, "x": 13, "y": 21 },
{ "item": "ga_items_1", "chance": 80, "x": 14, "y": 21 }
],
"add": [
{ "item": "shovel", "x": [ 13, 17 ], "y": [ 19, 20 ], "chance": 7 },
{ "item": "shovel", "x": [ 13, 17 ], "y": [ 19, 20 ], "chance": 20 },
{ "item": "stepladder", "x": 11, "y": 21, "chance": 40 },
{ "item": "gloves_work", "x": [ 14, 16 ], "y": 19, "chance": 5 },
{ "item": "shovel", "x": 12, "y": 21, "chance": 4 },
{ "item": "shovel", "x": 13, "y": 21, "chance": 4 },
{ "item": "shovel", "x": 14, "y": 21, "chance": 4 }
{ "item": "gloves_work", "x": [ 14, 16 ], "y": 19, "chance": 45 },
{ "item": "shovel", "x": 12, "y": 21, "chance": 20 },
{ "item": "shovel", "x": 13, "y": 21, "chance": 20 },
{ "item": "shovel", "x": 14, "y": 21, "chance": 20 }
]
}
},
Expand Down
70 changes: 27 additions & 43 deletions data/json/mapgen/cs_open_sewer_small.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,50 +58,34 @@
"om_terrain": [ "cs_open_sewer" ],
"weight": 1000,
"object": {
"fill_ter": "t_region_soil",
"rows": [
",,.,,..,.,,.,,..,,.,..,.",
".,bbbb..bbb.,.bbbb,..,b,",
".,...,.,rr,r.,,..,.,.,b.",
"b..,.r,r,r,rr,r,,,,,,,b,",
"b.,o,,r,rrr,rr,,,,,,,,,,",
"b,oo.,r,rrrrr,r,,,w,ww,,",
",b.o,,,,r,r,,r,,,ww,w,,b",
".ooo,,,,,ssssss,wwww,w,b",
"..,o,,,,sswwwwwwww,w,w,.",
",b.o,,,sswwwwwwwwwww,,b,",
".b,o,,oooopooowwoopooo,b",
".b.,,,sswwwwwwwwwwsw,o,,",
",,oo,ooooopowwwooopowob.",
".b,.,,,sswwwwwwwwwwo,ob,",
"..,oo,oooopoowwoopsosob.",
",ooo,,,,,ssswwwwwoso,ob,",
".b,..,,,,,,sssssso,owooo",
",b,,-DOD-,,,.,,,,o,o,o.,",
".,.,|fff|,.,,,,.oo,ooo,b",
",b.,|fff|,.,.,.,o.,.,o.b",
".b.,|LBB|.,.,,.,o,.,.o.b",
",b,,-----,.,.,.,o.,.,.,.",
",.,,.,.,bbbbb,..,.,..,b.",
",.bbb,.,..,.,..,bbb,bb.,"
" ",
" bbbb bbb bbbb b ",
" rr r b ",
"b r r r rr r b ",
"b o r rrr rr ",
"b oo r rrrrr r w ww ",
" b o r r r ww w b",
" ooo ssssss wwww w b",
" o sswwwwwwww w w ",
" b o sswwwwwwwwwww b ",
" b o oooopooowwoopooo b",
" b sswwwwwwwwwwsw o ",
" oo ooooopowwwooopowob ",
" b sswwwwwwwwwwo ob ",
" oo oooopoowwoopsosob ",
" ooo ssswwwwwoso ob ",
" b sssssso owooo",
" b -DOD- o o o ",
" |fff| oo ooo b",
" b |fff| o o b",
" b |LBB| o o b",
" b ----- o ",
" bbbbb b ",
" bbb bbb bb "
],
"terrain": {
",": "t_dirt",
".": "t_grass",
"o": "t_sewage_pipe",
"p": "t_sewage_pump",
"w": "t_sewage",
"b": "t_dirt",
"r": "t_dirt",
"s": "t_dirt",
"S": "t_dirt",
"-": "t_dirt",
"|": "t_dirt",
"D": "t_dirt",
"O": "t_dirt",
"f": "t_dirt",
"L": "t_dirt",
"B": "t_dirt"
},
"terrain": { ",": "t_region_soil", "o": "t_sewage_pipe", "p": "t_sewage_pump", "w": "t_sewage" },
"furniture": {
"b": "f_barricade_road",
"r": "f_rubble",
Expand All @@ -117,7 +101,7 @@
},
"items": {
"r": { "item": "os_items", "chance": 5 },
"L": { "item": "os_items", "chance": 60 },
"L": { "item": "os_items", "chance": 80, "repeat": [ 1, 5 ] },
"w": { "item": "os_items", "chance": 1 }
},
"place_vehicles": [
Expand Down

0 comments on commit 90e1eb2

Please sign in to comment.