Skip to content

Commit

Permalink
Replace artificial forests, part III (CleverRaven#56123)
Browse files Browse the repository at this point in the history
  • Loading branch information
LovamKicsiGazsii authored Mar 16, 2022
1 parent c5cf02e commit 03d89b0
Show file tree
Hide file tree
Showing 16 changed files with 844 additions and 1,547 deletions.
127 changes: 55 additions & 72 deletions data/json/mapgen/cs_private_park.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,95 +5,78 @@
"om_terrain": [ "cs_private_park" ],
"weight": 1000,
"object": {
"fill_ter": "t_floor",
"predecessor_mapgen": "forest",
"rows": [
"..xxxxxxxxxxxxxxxxxxxx.,",
".WWWWWWWWW-XX-WWWWWWWWW.",
",W......T.PxxP.s,p.p..W,",
",W.f.p.f..oxxo..f..T..W.",
".W.Y..p...oxxo.A.~dpA.W.",
".Wo..T...T.xx.d.p.f.,.W.",
",W..f.YfA.dxxxxxxxxxT.W,",
",W~.,.dwwwAxxxxxxxxxY.W.",
".WP..TwwwwwwwwwA.pxxY,W.",
",W.f.AwwwwwwwwwwwAxxp.W,",
".W.d.xxxxxxxxxxxxxxx..W.",
".W~.Txxxxxxxxxxxxxxx.TW.",
".W.,.xxwwwwwwwwwwfY.p,W.",
",W.f.xxAwwwwwwwwA.Y.d.W,",
".W.Y.xx,.wwwwwwwf.Tf,pW.",
".W.T.xx.Y.T.wwT.f..A.pW.",
".W..fxx...Y..p...~.T,.W,",
",Wdddxxd~o~....P.fY...W.",
".WzzzDDzzzo.T..f...,ooW.",
".WazS Lz~.Y.,pY.d.T.W.",
",W C 21G,,.f...T.,..W,",
".WtzBE 1z@@T.P...Y,.YW.",
",WWWWWWWWWWWWWWWWW-X-WW.",
"..,,..,.....,......,..,."
"...........ss...........",
".#########-XX-#########.",
".# f__f #.",
".# f__f #.",
".# f__fffffff #.",
".# f________ff #.",
".# ff________f #.",
".# 7 WWfffffff__f #.",
".# WWWWWWW f__f #.",
".# fffWwwwwwwWWWf__f #.",
".# ff__==========___f #.",
".# f___==========__ff #.",
".# f__fWwwwwwwwwWf'f #.",
".# f__fWWwwwwwwWW ' #.",
".# f__f WWwwwwwW ' #.",
".# f__f WWwwWWW 7 ' #.",
".# f__f 7 WWWW ' #.",
".# f__f ''''' ' #.",
".#||DD|G||'bbb''''''' #.",
".#a|,,S,L|''''' ' #.",
".#,C,,,,1G'4'4' ' #.",
".#t|BE,21|''''' ' #.",
".#################-X-##.",
"........................"
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "park_nature_palette" ],
"terrain": {
",": "t_dirt",
"-": "t_chainfence_h",
".": "t_grass",
" ": "t_floor",
"x": "t_sidewalk",
"w": "t_water_dp",
"z": "t_wall_wood",
"A": "t_tree_willow",
"-": "t_chainfence",
".": "t_region_groundcover_urban",
"f": "t_region_groundcover_urban",
",": "t_floor",
"1": "t_floor",
"2": "t_floor",
"a": "t_floor",
"t": "t_floor",
"B": "t_floor",
"E": "t_floor",
"L": "t_floor",
"S": "t_floor",
"s": "t_sidewalk",
"|": "t_wall_wood",
"D": "t_door_locked_peep",
"C": "t_door_c",
"G": "t_curtains",
"P": "t_tree_cherry",
"T": "t_tree",
"W": "t_brick_wall",
"X": "t_chaingate_l",
"Y": "t_tree_young",
"~": "t_grass",
"@": "t_grass",
"d": "t_grass",
"f": "t_grass",
"o": "t_grass",
"p": "t_grass",
"s": "t_grass"
"4": "t_tree_cherry",
"7": "t_tree_willow",
"#": "t_brick_wall",
"X": "t_chaingate_l"
},
"furniture": {
"~": "f_dahlia",
"@": "f_dumpster",
"d": "f_dandelion",
"f": "f_bluebell",
"o": "f_datura",
"p": "f_mutpoppy",
"s": "f_bulletin",
"1": "f_desk",
"2": "f_chair",
"a": "f_sink",
"t": "f_toilet",
"B": "f_bookcase",
"E": "f_armchair",
"F": "f_fridge",
"L": "f_locker",
"S": "f_woodstove"
"S": "f_woodstove",
"f": "f_region_flower_decorative"
},
"toilets": { "t": { } },
"place_vehicles": [ { "vehicle": "bicycle", "x": 3, "y": 2, "rotation": 0, "chance": 50 } ],
"place_items": [
{ "item": "trash_forest", "chance": 50, "x": [ 17, 19 ], "y": [ 19, 21 ] },
{ "item": "trash", "chance": 50, "x": [ 4, 5 ], "y": [ 8, 11 ] },
{ "item": "trash", "chance": 50, "x": [ 6, 15 ], "y": [ 10, 15 ] },
{ "item": "trash_forest", "chance": 50, "x": [ 17, 19 ], "y": [ 19, 21 ] },
{ "item": "trash", "chance": 50, "x": [ 4, 5 ], "y": [ 8, 11 ] },
{ "item": "trash", "chance": 50, "x": [ 6, 15 ], "y": [ 10, 15 ] },
{ "item": "trash_forest", "chance": 50, "x": 9, "y": 21 },
{ "item": "trash_forest", "chance": 50, "x": 10, "y": 21 },
{ "item": "trash", "chance": 50, "x": 9, "y": 21 },
{ "item": "trash", "chance": 50, "x": 10, "y": 21 },
{ "item": "trash_forest", "chance": 50, "x": 9, "y": 21 },
{ "item": "trash_forest", "chance": 50, "x": 10, "y": 21 },
{ "item": "trash", "chance": 50, "x": 10, "y": 21 },
{ "item": "trash", "chance": 50, "x": 11, "y": 21 }
],
"place_signs": [ { "signage": "Private Property: No Trespassing", "x": 8, "y": 0 } ]
"items": {
"B": { "item": "homebooks", "chance": 60, "repeat": [ 1, 5 ] },
"1": { "item": "office", "chance": 50 },
"S": { "item": "fireplace_fill", "chance": 80, "repeat": [ 1, 3 ] },
"L": { "item": "tools_earthworking", "chance": 40, "repeat": [ 1, 2 ] }
},
"place_vehicles": [ { "vehicle": "bicycle", "x": 6, "y": 0, "rotation": 0, "chance": 50 } ],
"place_signs": [ { "signage": "Private Property: No Trespassing", "x": 15, "y": 0 } ]
}
},
{
Expand Down
64 changes: 28 additions & 36 deletions data/json/mapgen/cs_public_art_piece.json
Original file line number Diff line number Diff line change
@@ -1,49 +1,41 @@
[
{
"type": "item_group",
"id": "oa_pap_chess_pieces",
"items": [ [ "rock", 60 ] ]
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "cs_public_art_piece" ],
"weight": 1000,
"object": {
"fill_ter": "t_region_groundcover_urban",
"rows": [
"........,.....,...,.....",
"....,...,.,.....,...,...",
"....,........,..........",
"........,.......,...,...",
"...,,........,.....,,...",
".........cbbbbc.........",
"....,..........,,......,",
".......++++++++++...,...",
".,.....+OXOXOXOX+.,.....",
".....c.+XOXOXOXO+.c.....",
"...,.b.+OXOXOXOX+.b..,..",
".....b,+XOXOXOXO+.b,....",
"..,..b.+OXOXOXOX+.b.....",
".....b,+XOXOXOXO+.b...,.",
"...,.c.+OXOXOXOX+.c.....",
".......+XOXOXOXO+...,,..",
"....,..++++++++++.......",
".,.....,...,.,......,...",
"...,,..,.cbbbbc..,......",
"...........,.......,....",
".......,...,....,.......",
"...,................,...",
"......,,.....,..,.......",
"....,,....,..........,.."
" ss ",
" ss ",
" ss ",
" ss ",
" ss ",
" ss ",
" ss ",
" ssssssssss ",
" sOXOXOXOXs ",
" c sXOXOXOXOs c ",
" b sOXOXOXOXs b ",
" b sXOXOXOXOs b ",
" b sOXOXOXOXs b ",
" b sXOXOXOXOs b ",
" c sOXOXOXOXs c ",
" sXOXOXOXOs ",
" ssssssssss ",
" ",
" cbbbbc ",
" ",
" ",
" ",
" ",
" "
],
"terrain": { ".": "t_grass", ",": "t_dirt", "+": "t_floor", "X": "t_pavement", "O": "t_sidewalk", "b": "t_dirt", "c": "t_dirt" },
"terrain": { " ": "t_region_groundcover_urban", "s": "t_sidewalk", "X": "t_pavement", "O": "t_concrete" },
"furniture": { "b": "f_bench", "c": "f_trashcan" },
"items": {
"c": { "item": "oa_custom_trash", "chance": 30 },
"b": { "item": "oa_discarded_news", "chance": 5 },
"X": { "item": "oa_pap_chess_pieces", "chance": 20 },
"O": { "item": "oa_pap_chess_pieces", "chance": 20 }
}
"items": { "c": { "item": "oa_custom_trash", "chance": 30 }, "b": { "item": "oa_discarded_news", "chance": 5 } },
"item": { "X": { "item": "rock", "chance": 20 }, "O": { "item": "rock", "chance": 20 } }
}
}
]
69 changes: 33 additions & 36 deletions data/json/mapgen/cs_public_space.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,43 @@
"method": "json",
"weight": 1000,
"object": {
"fill_ter": "t_sidewalk",
"rows": [
"...,......,'',..,...,,..",
"..,...,..,,'',..,..,...,",
"..,...,...,'',,......,..",
"...,fsfsfs,'',sfsfsf,.,.",
".,.f,,,,,,,'',,,,,,,f...",
"...s,,'''''''''''',,s..,",
"..,f,'''bb''''bb'D',f...",
"...s,''''''NN'''''',s,..",
"...f,'b''''ww''''b',f...",
".,.s,'b''''ww''''b',s..,",
"...f,'''''wwww''''',f...",
"..,s,,''wwwSSwww'',,s...",
"...f,,''wwwSSwww'',,f.,.",
"...s,'''''wwww''''',s...",
".,.f,'b''''ww''''b',f,..",
"...s,'b''''ww''''b',s...",
".,.f,'''''''''''''',f..,",
"...s,'D'bb''''bb''',s...",
"...f,,''''',,''''',,f.,.",
",..s,,,,,,,,,,,,,,,,s..,",
"...,fsfsfsf,,fsfsfsf,...",
"..,...,.....,......,...,",
"....,...,.....,.....,...",
".........,...,....,...,."
" ss ",
" ss ",
" ####### ss ####### ",
" ##fffff ss fffff## ",
" #ff ss ff# ",
" #f ssssssssssss f# ",
" #f sssbbssssbbsss f# ",
" #f ssssssssssssss f# ",
" #f sbssssssssssbs f# ",
" #f sbssswwwwsssbs f# ",
" #f sssswwwwwwssss f# ",
" #f sssswwSSwwssss f# ",
" #f sssswwSSwwssss f# ",
" #f sssswwwwwwssss f# ",
" #f sbssswwwwsssbs f# ",
" #f sbssssssssssbs f# ",
" #f ssssssssssssss f# ",
" #f sssbbssssbbsss f# ",
" #f ssssssssssss f# ",
" #ff ff# ",
" ##ffffffffffffffff## ",
" ################## ",
" ",
" "
],
"terrain": {
".": "t_grass",
",": "t_dirt",
"'": "t_sidewalk",
"w": "t_water_sh",
"s": "t_underbrush",
"S": "t_water_sh",
"b": "t_sidewalk",
"D": "t_sidewalk",
"N": "t_sidewalk",
"f": "t_dirtmound"
" ": "t_region_groundcover_urban",
"s": "t_sidewalk",
"w": "t_water_pool_shallow_outdoors",
"#": "t_region_shrub_decorative",
"S": "t_water_pool_shallow_outdoors",
"f": "t_region_groundcover_urban"
},
"furniture": { "S": "f_statue", "b": "f_bench", "D": "f_dumpster", "N": "f_bulletin", "f": "f_bluebell" },
"items": { "D": { "item": "oa_custom_trash", "chance": 70 }, "b": { "item": "oa_discarded_news", "chance": 5 } }
"furniture": { "S": "f_statue", "b": "f_bench", "f": "f_region_flower_decorative" },
"items": { "b": { "item": "oa_discarded_news", "chance": 5 } }
}
}
]
Loading

0 comments on commit 03d89b0

Please sign in to comment.