From 230c5128c97bd671f626b174ca41ab40cbbe99f2 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 10 Jul 2022 16:52:41 +0200 Subject: [PATCH 1/8] migrate park tiles to recreational --- .../overmap_terrain/overmap_terrain.json | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index 4d4fe66bcc3d2..9efb27d791964 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -50,31 +50,6 @@ "see_cost": 5, "flags": [ "NO_ROTATE" ] }, - { - "type": "overmap_terrain", - "id": [ - "park", - "park_2", - "park_3", - "park_4", - "park_5", - "park_6", - "park_7", - "playground", - "playground_1", - "dog_park", - "volleyball_court", - "tennis_court", - "baskeball_court" - ], - "name": "park", - "sym": "O", - "color": "green", - "see_cost": 2, - "extras": "build", - "mondensity": 2, - "flags": [ "SIDEWALK" ] - }, { "type": "overmap_terrain", "id": [ "s_garage", "s_garage_1", "s_garage_2" ], From beac6ff9ccf25afa97369663f032eb9f3b688b50 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 10 Jul 2022 16:54:03 +0200 Subject: [PATCH 2/8] move park OM tiles to recreational, descriptive names --- .../overmap_terrain_recreational.json | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json index 564240a34b80a..7e0a75e0bc5a6 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json @@ -1,4 +1,42 @@ [ + { + "type": "overmap_terrain", + "id": [ "park", "park_roof", "park_2", "park_3", "park_4", "park_5", "park_5_roof", "park_6", "park_7", "park_7_roof" ], + "copy-from": "generic_city_building", + "name": "park", + "sym": "O", + "color": "green" + }, + { + "type": "overmap_terrain", + "id": [ "playground", "playground_roof", "playground_1" ], + "copy-from": "park", + "name": "playground" + }, + { + "type": "overmap_terrain", + "id": [ "dog_park" ], + "copy-from": "park", + "name": "dog park" + }, + { + "type": "overmap_terrain", + "id": [ "volleyball_court" ], + "copy-from": "park", + "name": "volleyball court" + }, + { + "type": "overmap_terrain", + "id": [ "tennis_court" ], + "copy-from": "park", + "name": "tennis court" + }, + { + "type": "overmap_terrain", + "id": [ "baskeball_court" ], + "copy-from": "park", + "name": "basketball court" + }, { "type": "overmap_terrain", "id": [ From cf666a030109041972e421bccf8434345b890d70 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 10 Jul 2022 17:00:16 +0200 Subject: [PATCH 3/8] park update also shifts some stuff around --- data/json/mapgen/park.json | 971 ++++++++++++++++++++----------------- 1 file changed, 539 insertions(+), 432 deletions(-) diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json index ccbf28e9a081a..434faa1914858 100644 --- a/data/json/mapgen/park.json +++ b/data/json/mapgen/park.json @@ -1,157 +1,182 @@ [ { - "type": "mapgen", "method": "json", - "om_terrain": "playground_1", + "om_terrain": "playground", "//": "Playground", - "weight": 500, + "type": "mapgen", + "weight": 300, "object": { "fill_ter": "t_region_groundcover_urban", "rows": [ - "''''''''''''''''''''''''", - "''''''''''''''''''''''''", - "''''''''''''''''''''''''", - "''''''''''''''''''''''''", - "'''''''''''''t''''''''''", - "''''''t'''''''''gg''''''", - "''''''''''''''''gg''''''", - "''''''''''''''''''''''''", - "''''mmm'''''''''''''''''", - "''''mmm''''h'''''''bt'''", - "'''tmmm''''h'''''''b''''", - "'''''''''''h''''''''''''", - "'''''''''''h''''''''''''", - "''''''''''''''''''''''''", - "''''''''''''''''''''''''", - "''''''b''''''''''''t''''", - "'''''tb'''''''''''''''''", - "'''''''''bb&'''t''''''''", - "'''''''''t''''''''''''''", - "''''''''''''''''''''''''", - "''''''''''''''''''''''''", - "''''''''''''''''''''''''", - "''''''''''''''''''''''''", - "''''''''''''''''''''''''" + " q o o o o q ", + " q q ", + "t q ggggggg !q]]]] ", + " !q ghhhhhg b q+:x] ", + " q ggggggg b q]5X] ", + " q ggggggg & q]]]] ", + " q ggggggg b q]5X] ", + " t q ghhhhhg b q+:x] ", + " q ggggggg q]]]] ", + " q ggggggg q ", + " q gmgmmmg t qqq t ", + " t q gmgmgmg q ", + " q gmgmgmg ggggg q ", + " q gmmmgmg ggggg qb ", + " q ggggggg ggggg qb ", + " t q ggggggg ggggg qb ", + " q ggggggg ggggg q ", + " q q ", + " qqqqqqqqqqqqqqqqqq ", + " bbb &! bbb ", + " t t ", + " ", + " t t ", + " t t " ], "palettes": [ "park_scenic_palette" ], - "place_monster": [ { "group": "GROUP_PARK_PLAYGROUND", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ], - "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } } + "place_items": [ + { "chance": 3, "item": "stash_drugs", "x": 21, "y": 3 }, + { "chance": 10, "item": "magazines", "x": 21, "y": 14 }, + { "chance": 10, "item": "child_items", "x": 17, "y": 15 }, + { "chance": 10, "item": "child_items", "x": 15, "y": 15 }, + { "chance": 10, "item": "snacks", "x": 14, "y": 6 }, + { "chance": 10, "item": "toy_box", "x": 16, "y": 14 }, + { "chance": 10, "item": "toy_box", "x": 14, "y": 13 } + ], + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } }, { - "type": "mapgen", "method": "json", - "om_terrain": "baskeball_court", - "//": "Basketball Court", - "weight": 700, + "om_terrain": "playground_roof", + "type": "mapgen", + "weight": 300, "object": { - "fill_ter": "t_pavement", "rows": [ " ", - " |||||||||||||||||||||| ", - " + . . . 7 . . . + ", - " |V . . . . . .&| ", - " |& . . ..... . . | ", - " | . . . . . . | ", - " |b . . ... . .b| ", - " |b . ....... .b| ", - " |b . .b| ", - " |b . ... .b| ", - " |b . . . .b| ", - " | ................. | ", - " |b . . . .b| ", - " |b . ... .b| ", - " |b . .b| ", - " |b . ....... .b| ", - " |b . . ... . .b| ", - " | . . . . . . | ", - " | . . ..... . . | ", - " |& . . . . . .&| ", - " + . . . 7 . . . + ", - " |||||||||||||||||||||| ", + " ", + " .... ", + " .... ", + " .... ", + " .... ", + " .... ", + " .... ", + " .... ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", " ", " " ], - "palettes": [ "park_asphalt_palette" ], - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ] + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_shingle_flat_roof" } } }, { "type": "mapgen", "method": "json", - "om_terrain": "tennis_court", - "//": "Tennis Court", + "om_terrain": "playground_1", + "//": "Playground", "weight": 500, "object": { - "fill_ter": "t_pavement", + "fill_ter": "t_region_groundcover_urban", "rows": [ + " q ", + " q ", + " q t ", + " q t ", + " t q ", + " q gg ", + " qqqq gg ", + " ! q qqq ", + " mmm qq qqq ", + " mmm q h qq b t ", + " mmm q h q b ", + " t q h q b ", + " q h qq ", + " b q qq t ", + " b qq qq ! ", + " b qqqqqq ", + " ", + " t bbb& t ", + " ", + " t ", + " t ", + " ", " ", - " |||||||||||||||||||||& ", - " + ........[........ + ", - " | ........[........ |V ", - " | . . [ . . |b ", - " | . . [ . . |b ", - " | . ....[.... . | ", - " | . . [ . . |b ", - " | . . [ . . |b ", - " | ........[........ | ", - " | ........[........ | ", - " | | ", - " | | ", - " | ........[........ | ", - " | ........[........ | ", - " | . . [ . . |b ", - " | . . [ . . |b ", - " | . ....[.... . | ", - " | . . [ . . |b ", - " | . . [ . . |b ", - " | ........[........ |& ", - " + ........[........ + ", - " ||||||||||||||||||||| ", " " ], - "palettes": [ "park_asphalt_palette" ], - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ] + "palettes": [ "park_scenic_palette" ], + "place_monster": [ { "group": "GROUP_PARK_PLAYGROUND", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } }, { "type": "mapgen", "method": "json", - "om_terrain": "volleyball_court", - "//": "Volleyball Court", - "weight": 300, + "om_terrain": "dog_park", + "//": "Dog Park", + "weight": 500, "object": { - "fill_ter": "t_region_groundcover_urban", + "fill_ter": "t_region_soil", "rows": [ - "&bbb bbb&", - " ,,,,,,,,,[,,,,,,,,, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,,,,,,,,,[,,,,,,,,, ", - " ", - " ", - " ,,,,,,,,,[,,,,,,,,, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,$$$$$$$$$[$$$$$$$$$, ", - " ,,,,,,,,,[,,,,,,,,, ", - "&bbb bbb&" + " [--[ [--[ ", + " tz[,,[zzzzzzzzzz[,,[zt ", + " z[[--[[[[[[[[[[[[--[[z ", + " z[,,,,, & u ,,,,,[z ", + " z[,,,, ,,,,[z ", + " z[,,, t ,,,[z ", + " z[ , t ,,,, , [z ", + " z[ , ,, ,,,, ,, b[z ", + " z[u ,,,, ! ,,, b[z ", + " z[ , ,, b[z ", + " z[& , u , t [z ", + " z[ ,, ,, u [z ", + " z[ , & , [z ", + " z[b ,,, ,,,,, &[z ", + " z[b u ,,,, ,, [z ", + " z[b , ! , [z ", + " z[ t ,, ,, [z ", + " z[sss ,,,, [z ", + " z[~~ss t [z ", + " z[~~~s u [z ", + " z[O~~s & bbb u[z ", + " z[[[[[[[[[[[[[[[[[[[[z ", + " tzzzzzzzzzzzzzzzzzzzzt ", + " " ], - "palettes": [ "park_asphalt_palette" ], - "items": { "b": { "item": "shoes", "chance": 15, "repeat": [ 2, 5 ] } }, - "place_item": [ { "item": "beach_volleyball", "x": 8, "y": 6 }, { "item": "sandbox_kit", "x": 8, "y": 6 } ], - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ] + "palettes": [ "park_scenic_palette" ], + "terrain": { "O": "t_water_pool_shallow" }, + "furniture": { "O": "f_boulder_large" }, + "place_signs": [ + { "signage": "Scoop the Poop!", "x": 11, "y": 11 }, + { "signage": "DANGER! Doggy Minefield!", "x": 2, "y": 0 }, + { "signage": "Dog Park: Off Leash Area", "x": 7, "y": 0 }, + { "signage": "Watch your step!", "x": 16, "y": 0 }, + { "signage": "Use park at your own risk.", "x": 21, "y": 0 } + ], + "place_item": [ + { "item": "bag_plastic", "x": 10, "y": 11, "repeat": [ 10, 50 ] }, + { "item": "feces_dog", "x": [ 3, 20 ], "y": [ 3, 20 ], "chance": 200 }, + { "item": "feces_dog", "x": 3, "y": 10, "repeat": [ 1, 10 ] }, + { "item": "feces_dog", "x": 10, "y": 3, "repeat": [ 1, 10 ] }, + { "item": "feces_dog", "x": 20, "y": 13, "repeat": [ 1, 10 ] }, + { "item": "feces_dog", "x": 20, "y": 10, "repeat": [ 1, 10 ] }, + { "item": "feces_dog", "x": 11, "y": 12, "repeat": [ 5, 20 ] } + ], + "place_monster": [ + { "group": "GROUP_PARK_DOG", "x": [ 3, 20 ], "y": [ 3, 20 ], "repeat": [ 1, 10 ], "chance": 50 }, + { "group": "GROUP_DOGS", "x": [ 3, 20 ], "y": [ 3, 20 ], "repeat": [ 1, 12 ], "chance": 100 } + ] } }, { @@ -161,145 +186,111 @@ "//": "Scenic Park", "weight": 500, "object": { - "fill_ter": "t_grass", + "fill_ter": "t_region_groundcover_urban", "rows": [ - " ...... ", - " zzzzzzzz....zzzzzzzz ", - " z .. z ", - " z ,bTb,.. t **`** z ", - " z t ,bTb,.. *```* z ", - " z & ..........````` z ", - " z ,,..,, .. *```* z ", - " z bb.,,, .. **`** z ", - " z TT.,,, .... . z ", - ".z bb. .ssss. . t z.", - ".. ,,. .ss~~ss. . ..", - ".........s~~~~s.........", - ".........s~~~~s.........", - ".. . .ss~~ss. . ..", - ".z . .ssss. . z.", - " z . .... . z ", - " z t . t .. . b z ", - " z .. .. .. b z ", - " z fss............ z ", - " z sAs t .. z ", - " z fsf .. bb t z ", - " z .. z ", - " zzzzzzzz....zzzzzzzz ", - " ...... " + "qqqqqqqqqqqqqqqqqqqqqqqq", + "qqzzzzzzzzqqqqzzzzzzzzqq", + "qzz & qq zzq", + "qz t bTb qq t *```* zq", + "qz ,,,bTb qq ````` zq", + "qz ,,qqqqqqqqqq````` zq", + "qz ,qq qq ````` zq", + "qz bbq ! qq *```* zq", + "qz TTq qqqqqq q zq", + "qz bbq qqssssqq q t zq", + "qq q qss~~ssq q qq", + "qqqqqqqqqs~~~~sqqqqqqqqq", + "qqqqqqqqqs~~~~sqqqqqqqqq", + "qq q qss~~ssq q qq", + "qz t q qqssssqq q t zq", + "qz q qqqqqq q zq", + "qz q ! qq ! q b zq", + "qz qq qq qq b zq", + "qz fssqqqqqqqqqqqq zq", + "qz sAs qq zq", + "qz fsf t qq t bb t zq", + "qzz qq zzq", + "qqzzzzzzzzqqqqzzzzzzzzqq", + "qqqqqqqqqqqqqqqqqqqqqqqq" ], "palettes": [ "park_scenic_palette" ], - "place_item": [ { "item": "char_smoker", "x": 7, "y": 7 } ], - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ], - "vehicles": { ".": { "vehicle": "park_playground_vehicles", "chance": 1 } } + "terrain": { "A": "t_sidewalk" }, + "place_item": [ { "item": "char_smoker", "x": 5, "y": 5 } ], + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } }, { "type": "mapgen", "method": "json", - "om_terrain": "park_2", - "//": "Scenic Park", + "om_terrain": "park_roof", "weight": 500, "object": { - "fill_ter": "t_grass", "rows": [ - " , z ...... z , ", - ", zzz .o..o. zzz, ", - " , zzz z......z zzz ", - " zz b......b zz, ", - " z tb......bt z ", - " zz t b......b t zz ", - " z z......z z ", - "zz t ........ t zz", - " zbbbz..........zbbbz ", - "..........ssss..........", - ".o.......ssffss.......o.", - ".........sfzzfs.........", - ".........sfzzfs.........", - ".o.......ssffss.......o.", - "..........ssss..........", - " zbbbz..........zbbbz ", - "zz t ........ t zz", - " z z......z z ", - " zz t b......b t zz ", - " z tb......bt z ", - " zz b......b zz ,", - ", zzz z......z zzz ", - " zzz .o..o. zzz , ", - " , , z ...... z " + " ", + " ", + " ", + " ..... ", + " ..... ", + " ..... ", + " ..... ", + " ..... ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " ], - "palettes": [ "park_scenic_palette" ], - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ], - "vehicles": { ".": { "vehicle": "park_playground_vehicles", "chance": 1 } } + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_shingle_flat_roof" } } }, { "type": "mapgen", "method": "json", - "om_terrain": "dog_park", - "//": "Dog Park", + "om_terrain": "park_2", + "//": "Scenic Park", "weight": 500, "object": { "fill_ter": "t_region_groundcover_urban", "rows": [ - "__________|++|__________", - "__zzzzzzzz|,,|Pzzzzzzz__", - "_z|||||||||++|||||||||z_", - "_z|#~~. &,,, |z_", - "_z|~~~. ,,, |z_", - "_z|~~.. t |z_", - "_z|... ,|z_", - "_z| ,b|z_", - "_z|, ,b|z_", - "_P|,,, ,b|z_", - "|||&, t ,|||", - "+,+,, P ,,+,+", - "+,+,,, & ,,,+,+", - "|||,, ,&|||", - "_z|b, ,|P_", - "_z|b,t |z_", - "_z|b, t |z_", - "_z|, ,, |z_", - "_z| t ,,, |z_", - "_z| ,,,,,,, |z_", - "_z| ,&,,,bbb, |z_", - "_z|||||||||++|||||||||z_", - "__zzzzzzzP|,,|zzzzzzzz__", - "__________|++|__________" - ], - "terrain": { - "+": "t_chaingate_c", - ",": "t_dirt", - "|": "t_chainfence", - ".": "t_sidewalk", - "#": "t_water_pool_shallow", - "b": "t_dirt", - "P": "t_dirt", - "&": "t_dirt", - "_": "t_sidewalk", - "t": "t_region_tree_shade", - "z": "t_region_shrub_decorative", - "~": "t_water_pool_shallow" - }, - "furniture": { "b": "f_bench", "P": "f_sign", "&": "f_trashcan", "#": "f_boulder_large" }, - "place_signs": [ - { "signage": "Scoop the Poop!", "x": 11, "y": 11 }, - { "signage": "DANGER! Doggy Minefield!", "x": 1, "y": 9 }, - { "signage": "Dog Park: Off Leash Area", "x": 9, "y": 22 }, - { "signage": "Watch your step!", "x": 14, "y": 1 }, - { "signage": "Use park at your own risk.", "x": 22, "y": 14 } + " zzqqqqqqzz ", + " 4 zzz qoqqoq zzz 4 ", + " zzz 1qqqqqq1 zzz ", + " zz bqqqqqqb zz ", + " z bqqqqqqb z ", + " zz bqqqqqqb zz ", + " z ! 1qqqqqq1 ! z ", + "zz qqqqqqqq& zz", + "z 1bbb1qqqqqqqqqq1bbb1 z", + "qqqqqqqqqqssssqqqqqqqqqq", + "qoqqqqqqqssffssqqqqqqqoq", + "qqqqqqqqqsfzzfsqqqqqqqqq", + "qqqqqqqqqsfzzfsqqqqqqqqq", + "qoqqqqqqqssffssqqqqqqqoq", + "qqqqqqqqqqssssqqqqqqqqqq", + "z 1bbb1qqqqqqqqqq1bbb1 z", + "zz &qqqqqqqq zz", + " z ! 1qqqqqq1 ! z ", + " zz bqqqqqqb zz ", + " z bqqqqqqb z ", + " zz bqqqqqqb zz ", + " zzz 1qqqqqq1 zzz ", + " 4 zzz qoqqoq zzz 4 ", + " zzqqqqqqzz " ], - "items": { "&": { "item": "trash", "chance": 75, "repeat": [ 2, 7 ] } }, - "place_item": [ - { "item": "bag_plastic", "x": 10, "y": 11, "repeat": [ 10, 50 ] }, - { "item": "feces_dog", "x": [ 3, 20 ], "y": [ 3, 20 ], "chance": 200 }, - { "item": "feces_dog", "x": 3, "y": 10, "repeat": [ 1, 10 ] }, - { "item": "feces_dog", "x": 10, "y": 3, "repeat": [ 1, 10 ] }, - { "item": "feces_dog", "x": 20, "y": 13, "repeat": [ 1, 10 ] }, - { "item": "feces_dog", "x": 20, "y": 10, "repeat": [ 1, 10 ] }, - { "item": "feces_dog", "x": 11, "y": 12, "repeat": [ 5, 20 ] } - ], - "place_monster": [ { "group": "GROUP_PARK_DOG", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 5, 12 ] } ] + "palettes": [ "park_scenic_palette" ], + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } }, { @@ -311,51 +302,45 @@ "object": { "fill_ter": "t_region_groundcover_urban", "rows": [ - "'ppppp''''''''''''''''''", - "'ppppp''''''''''''''''''", - "'pppppppppppppppp'''''''", - "'pppppppppppppppp'''''''", - "'PppppPppppPppppP''''u''", - "'PppppPppppPppppP'''''''", - "'PppppPppppPppppP'''''''", - "'PppppPppppPppppP'''''4'", - "'PppppPppppPppppP'''''''", - "'''''''''''ss'''''''''''", - "''''''&ssssssssss&''''e'", - "''''''sBBBBssBBBBs''''C'", - "'''''YsLLLLssLLLLsY'''''", - "''''''sBBBBssBBBBs''4'4'", - "'''t''ssssssssssssWWu'''", - "''''$$'''''''t'''WwwW'u'", - "'''$g$''''''''''Wwwwwi4'", - "''''''''''''''''Wwwwwi'4", - "''''''mm'h'''''WwwwwiI''", - "'''4''''''''''Wwwwwwi''u", - "''''''''''4'''WwwwwiI'u4", - "'4'''''4'''''''WWWi4'4''", - "'''u4'''4''0u'4u'''''u4u", - "''''''u''''u4''''u4'''''" + "spppppppppppppppps ", + "spppppppppppppppps ", + "spppppppppppppppps mm ", + "spppppppppppppppps mm t", + "sPppppPppppPppppPs ", + "sPppppPppppPppppPs ggg ", + "sPppppPppppPppppPs ggg ", + "sPppppPppppPppppPs ggg ", + "sPppppPppppPppppPs t", + "ssssssssssssssssss! h ", + " &ssssssssssss h ", + " sBBBBssBBBBs h ", + " t sLLLLssLLLLs t ", + " ,,, sBBBBssBBBBs ", + " ,e,,ssssssssssss WW ", + " ,,, , , WwwW ", + "t , , Wwwwwi ", + " ,,, ,,, Wwwwwit", + " ,Y, ,Y, WwwwwiI ", + " ,,, ,,, Wwwwwwi ", + " t WwwwwiI ", + " WWWi ", + " t t ", + " t t " ], "palettes": [ "park_scenic_palette" ], + "terrain": { "B": "t_sidewalk", "L": "t_sidewalk" }, + "items": { "L": { "item": "barbecue", "chance": 20 } }, "place_items": [ - { "chance": 8, "item": "dogfight", "x": 2, "y": 12 }, - { "chance": 30, "item": "trash", "x": 6, "y": 10 }, { "chance": 10, "item": "child_items", "x": 7, "y": 18 }, { "chance": 3, "item": "creepy", "x": 22, "y": 21 }, - { "chance": 10, "item": "trash_forest", "x": 10, "y": 23 }, - { "chance": 20, "item": "trash_forest", "x": 18, "y": 22 }, - { "chance": 10, "item": "trash_forest", "x": 2, "y": 22 }, - { "chance": 10, "item": "trash_forest", "x": 22, "y": 19 }, - { "chance": 10, "item": "magazines", "x": 17, "y": 10 }, - { "chance": 20, "item": "barbecue", "x": 18, "y": 12 }, - { "chance": 20, "item": "barbecue", "x": 8, "y": 12 }, - { "chance": 20, "item": "barbecue", "x": 5, "y": 12 }, - { "chance": 10, "item": "sports", "x": 11, "y": 16 }, - { "chance": 10, "item": "field", "x": 2, "y": 16 }, - { "chance": 10, "item": "field", "x": 1, "y": 13 } + { "chance": 10, "item": "magazines", "x": 17, "y": 10 } ], - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ], - "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 }, "p": { "vehicle": "suburban_home", "chance": 1 } } + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ], + "place_vehicles": [ + { "vehicle": "parking_garage", "x": 4, "y": 6, "rotation": 90, "chance": 33 }, + { "vehicle": "parking_garage", "x": 9, "y": 6, "rotation": 90, "chance": 33 }, + { "vehicle": "parking_garage", "x": 14, "y": 6, "rotation": 90, "chance": 33 } + ] } }, { @@ -367,140 +352,113 @@ "object": { "fill_ter": "t_region_groundcover_urban", "rows": [ - "''''_''''''''''''''''_''", - "'0ffffffff0'_0ffffffff0_", - "'||||||||||_'||||||||||'", - "'''''''_'''''''''''_''''", - "'bTTb''bTTb''bTTb''bTTb'", - "'bTTb''bTTb''bTTb''bTTb'", - "'bTTb''bTTb''bTTb''bTTb'", - "'bTTb''bTTb''bTTb''bTTb'", - "'bTTb''bTTb''bTTb''bTTb'", - "'''_'''''''''''''''''_''", - "''YY'&&'YY''''YY'&&'YY''", - "''''''''_'''''''''''''''", - "''''''''______'''''''__'", - "'''a'''''''__''''''d''__", - "'__'''''''''__'''d'''d''", - "''__''a''''''''''''d''d'", - "'t''a''bbb__'''d'''''d''", - "'''''''''____''''''d''''", - "'tu_''ut___'''''t'''u'''", - "''t''t'''''t'''u''u'''t'", - "'u''u'c'''u'''1'tu'tu''u", - "'_''_''ut''''c'''''uOt't", - "tu'1Ou'tu'c'u''u'tu1tu'u", - "'t'ut'_t''u't'ut'''u''t'" + " , ", + " t ,, t ", + " t , t ", + " fu1f1u,11u ", + " z1,,,,,,,,f1f ", + " f1,, ! , ,,,1u1 ", + " t f,,Y ,, Y,,,f1t ", + " 1u, , ,,1 ", + " u,,bTTb ,, bTTb ,u ", + " 1, bTTb , bTTb,,1 ", + "t 1u, bTTb ,& bTTb,fu t ", + " f,,,, ,,,,, ,,,,u ", + " u, ,,,, ,,,, ,1u ", + " 1,! bTTb Y ,bTTb ,,1 ", + " tu,, bTTb ,bTTb ,f t", + " 1f, bTTb ,,bTTb !,1 ", + " f,,, &, ,,1 ", + " 11u,,, ,,,, Y,,,uf ", + " t f1,,,,11,,,,f1 t ", + " 1u1f,u!1f1u1 ", + " ,, ", + " t , t ", + " t ,, t ", + " , " ], "palettes": [ "park_scenic_palette" ], + "items": { "T": { "item": "barbecue", "chance": 20 } }, "place_items": [ - { "chance": 10, "item": "barbecue", "x": 3, "y": 11 }, - { "chance": 10, "item": "barbecue", "x": 4, "y": 11 }, - { "chance": 10, "item": "barbecue", "x": 21, "y": 11 }, - { "chance": 10, "item": "barbecue", "x": 22, "y": 8 }, - { "chance": 10, "item": "barbecue", "x": 3, "y": 7 }, - { "chance": 10, "item": "snacks", "x": 2, "y": 6 }, { "chance": 10, "item": "magazines", "x": 8, "y": 3 }, - { "chance": 10, "item": "field", "x": 13, "y": 17 }, - { "chance": 10, "item": "field", "x": 21, "y": 13 }, - { "chance": 10, "item": "field", "x": 12, "y": 11 }, - { "chance": 8, "item": "dogfight", "x": 16, "y": 16 }, - { "chance": 5, "item": "clutter_yard", "x": 19, "y": 15 }, { "chance": 5, "item": "football_items", "x": 8, "y": 12 }, - { "chance": 5, "item": "stoner", "x": 7, "y": 16 }, - { "chance": 5, "item": "forage_mushroom", "x": 3, "y": 21 } + { "chance": 5, "item": "stoner", "x": 7, "y": 16 } ], - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ], - "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } } + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } }, { "method": "json", - "om_terrain": "playground", - "//": "Playground", + "om_terrain": "park_5", + "//": "Scenic Park", "type": "mapgen", "weight": 300, "object": { "fill_ter": "t_region_groundcover_urban", "rows": [ - "''0'0'O'O'O'0'0''''''_''", - "_''''''$'$''_''''''''''_", - "___t'ggggggg$'''''q]]]]'", - "'''''ghhhhhg$'b_''q+:x]'", - "'''''ggggggg$'b'_'q]5X]'", - "'''_'ggggggg''b'_'q]]]]'", - "'''''ggggggg$'b'''q]5X]'", - "'t'''ghhhhhg'_b_''q+:x]'", - "_''''ggggggg$''''_q]]]]'", - "'_'''ggggggg$''''_''bb''", - "_''''gmgmmmg'__'''_'''''", - "'t't_gmgmgmg''$$'$$'_'''", - "'''''gmgmgmg$$ggggg'''''", - "''''_gmmmgmg''ggggg$'b'_", - "_''_'ggggggg$$ggggg''b''", - "'t'_'ggggggg$'ggggg$_b''", - "t''''ggggggg''ggggg''''_", - "''t''''$'$'$''$'''$_'_''", - "'_'_t'''_'_''__''_'''''_", - "'tt'''tbbb'''t'bbb'''t''", - "t''''''''_t'''''''''''''", - "'''t't''''''''''''_'''_'", - "t''''''_t''''_'''''t''''", - "'t't''''''_'''t''_''''''" + "zzzzz qq zzzzzzzzzzzzzzz", + "zfffz qq z z", + "zftfz qq z t bTb t z", + "zfffz qq zz bTb z", + "zfffz qq! zz ! z", + "zfffz qqq zz z", + "zftfz qqq,,,,, z", + "zfffzz qqq zz & bb z", + "zzzzzzz qq z TT z", + " qqq zz bb z", + " *:::* !qq z z", + " *:::::* qqq zz z", + " ::::::: qqq zz t z", + " :::e:::,,qqqq zz , z", + " ::::::: qqqqq zzz,zzz", + " *:::::* qqq&qqq , ", + " *:::* qq qqqqqqqqqq", + " , qq z qqqqqqqqq", + " , qqq zz !qqfffqq", + " , !qqq zzzz qqfAfqq", + " & , qqq zzffz qqfffqq", + "qqqqqqqq zzftfz qqbbbqq", + "qqqqqqq zzffffz qqqqqqq", + " bbb zzzzzzz qqqqqqq" ], "palettes": [ "park_scenic_palette" ], - "place_items": [ - { "chance": 3, "item": "stash_drugs", "x": 21, "y": 3 }, - { "chance": 10, "item": "magazines", "x": 21, "y": 14 }, - { "chance": 10, "item": "child_items", "x": 17, "y": 15 }, - { "chance": 10, "item": "child_items", "x": 15, "y": 15 }, - { "chance": 10, "item": "snacks", "x": 14, "y": 6 }, - { "chance": 10, "item": "toy_box", "x": 16, "y": 14 }, - { "chance": 10, "item": "toy_box", "x": 14, "y": 13 } - ], - "place_toilets": [ { "x": 21, "y": 3 }, { "x": 21, "y": 5 } ], - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ], - "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } } + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } }, { "method": "json", - "om_terrain": "park_5", - "//": "Scenic Park", + "om_terrain": "park_5_roof", "type": "mapgen", "weight": 300, "object": { - "fill_ter": "t_region_groundcover_urban", "rows": [ - "'''sss'''''''Z'''''Z''''", - "'''sss'''f'''''''f'''''Z", - "''''sss''''Z'c'u'''cu'''", - "''''ssss''''''f'''''''''", - "''''''sss'f''''''u'''c'_", - "''''''sss'''u'''f'''Z'''", - "''c''''sss''''Z'''c'''_'", - "''''''''sss''''''''f___'", - "''''''''sss'''''u''_____", - "'''''''''sss''''''___'u'", - "'''0:::0''ss''''___'''''", - "''0ll:ll0'sss'___'''bbb'", - "'':l:::l:'sss''_''''''''", - "'':::::::'ssss'''''&c'''", - "'':l:::l:_sssss'''''''''", - "''0ll:ll0'ss_sss'''bbb''", - "'''0:::0'sss''ssssssssss", - "''''''''sss''''sssssssss", - "'''''''ssss'''''sssd''''", - "'''''''sss'''''''sss''d'", - "''''sssss'''''c'''ss''''", - "sssssssss'dbbb'''dsss'''", - "sssssss''''''''d'''sss''", - "'''''''''''d''_''''sss''" + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ..... ", + " ....... ", + " ....... ", + " ....... ", + " ....... ", + " ....... ", + " ..... ", + " ", + " ", + " ", + " ", + " ", + " ", + " " ], - "palettes": [ "park_scenic_palette" ], - "items": { "_": { "item": "forest", "chance": 4 } }, - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ], - "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 } } + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_shingle_flat_roof" } } }, { @@ -510,38 +468,35 @@ "type": "mapgen", "weight": 400, "object": { - "fill_ter": "t_grass", + "fill_ter": "t_region_groundcover_urban", "rows": [ "ssssssssssssssssssssssss", "ssssssssssssssssssssssss", - "sszzzzzzz''ss''zzzzzzzss", - "ssz||||||&'ss'&||||||zss", - "ssz|zzzzz''ss''zzzzz|zss", - "ssz|zbbb'''ss'''bbbz|zss", - "ssz|zb'''''ss'''''bz|zss", - "ssz|zb'''''ss'''''bz|zss", - "ssz|z'''tsssssst'''z|zss", - "ss'A''''sssOOsss''''A'ss", - "ss''''''ssO~~Oss''''''ss", - "sssssssssO~~~~Osssssssss", - "sssssssssO~~~~Osssssssss", - "ss''''''ssO~~Oss''''''ss", - "ss'A''''sssOOsss''''A'ss", - "ssz|z'''tsssssst'''z|zss", - "ssz|zb'''''ss'''''bz|zss", - "ssz|zb'''''ss'''''bz|zss", - "ssz|zbbb'''ss'''bbbz|zss", - "ssz|zzzzz''ss''zzzzz|zss", - "ssz||||||&'ss'&||||||zss", - "sszzzzzzz''ss''zzzzzzzss", + "sszzzzzzzzzsszzzzzzzzzss", + "ssz bbb zssz bbb zss", + "ssz t zssz t zss", + "ssz zssz& zss", + "sszb A zssz A bzss", + "sszb zssz bzss", + "sszb !ssssss! bzss", + "ssz & ssRRRRss zss", + "sszzzzzzsRR~~RRszzzzzzss", + "sssssssssR~~~~Rsssssssss", + "sssssssssR~~~~Rsssssssss", + "sszzzzzzsRR~~RRszzzzzzss", + "ssz ssRRRRss & zss", + "sszb !ssssss! bzss", + "sszb zssz bzss", + "sszb A zssz A bzss", + "ssz &zssz zss", + "ssz t zssz t zss", + "ssz bbb zssz bbb zss", + "sszzzzzzzzzsszzzzzzzzzss", "ssssssssssssssssssssssss", "ssssssssssssssssssssssss" ], "palettes": [ "park_scenic_palette" ], - "terrain": { "O": "t_sidewalk" }, - "items": { "|": { "item": "stoner", "chance": 1 } }, - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 15, 17 ], "y": [ 15, 17 ], "repeat": [ 10, 20 ] } ], - "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 } } + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } }, { @@ -553,36 +508,188 @@ "object": { "fill_ter": "t_region_groundcover_urban", "rows": [ - "''''''''''ssss''''''''''", - "''''''''''ssss''''''''''", - "''u'''''''ssss''''''''''", - "'uu'''''''ssssb''''''u''", - "'''u''''''ssssb'''''''''", - "'[''''''''ssss&bb'''u[''", - "'[''''''''sssssss''''[''", - "'['''''''{sssssss''''[u'", - "'['''''''Q::::Qss'''f[''", - "'[''gg'''::::::ss''''[''", - "'[''gg''':B::B:ss''''[''", - "'[''''''':B::B:ssR'''[''", - "'['m'''''::::::ssR'''[''", - "'['m'''''Q::::QssRu''[''", - "'['m'h'''::::::ssR'''[''", - "'['m'h'''::::::ssR'''[u'", - "u['''h'''QBBvXQRRR'''[4'", - "u['''''''QQQQQQu''''u[''", - "'[f''''''''uuu'''''''[''", - "'[''''''''''u''''''''[Z'", - "'['4'''''''''''''f'u'[u'", - "u[u'''''''''''''''''Z[u'", - "'[[[[[[[[[[[[[[[[[[[[[4'", - "'''u'''''''''''''''u''''" + " ssss ", + " ssss ", + " t t ssss t t ", + " ssssb ", + " !ssssb ", + " [ ,,,,,ssss&bb [ ", + " [ , sssssss [ ", + " [ , &sssssss [ ", + " [111,111Q::::Qss! [ ", + " [ , ::::::ss [ ", + " [ gg, :B::B:ss [ ", + " [ gg,,,,:B::B:ssR [ ", + " [ !, ::::::ssR [ ", + " [ m,,,, Q::::QssR [ ", + " [ m, , ::::::ssR [ ", + " [ m,h , ::::::ssR [ ", + " [ m,h , QBBvXQRRR [ ", + " [ ,h , QQQQQQ [ ", + " [ , 1 [ ", + " [ !, 1 [ ", + " [ t , 1 t [ ", + " [ , 1 [ ", + " [[[[[[-[[[[[[[[[[[[[[ ", + " , " ], "palettes": [ "park_scenic_palette" ], "vendingmachines": { "v": { "item_group": "vending_drink", "lootable": true } }, - "items": { "X": [ { "item": "trash", "chance": 75, "repeat": [ 2, 7 ] }, { "item": "vending_drink_items", "chance": 25 } ] }, - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ], - "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 } } + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] + } + }, + { + "method": "json", + "om_terrain": "park_7_roof", + "type": "mapgen", + "weight": 300, + "object": { + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ...... ", + " ...... ", + " ...... ", + " ...... ", + " ...... ", + " ...... ", + " ...... ", + " ...... ", + " ...... ", + " ...... ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_shingle_flat_roof" } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "baskeball_court", + "//": "Basketball Court", + "weight": 700, + "object": { + "fill_ter": "t_pavement", + "rows": [ + " ", + " |||||||||||||||||||||| ", + " + . . . 7 . . . + ", + " |V . . . . . .&| ", + " |& . . ..... . . | ", + " | . . . . . . | ", + " |b . . ... . .b| ", + " |b . ....... .b| ", + " |b . .b| ", + " |b . ... .b| ", + " |b . . . .b| ", + " | ................. | ", + " |b . . . .b| ", + " |b . ... .b| ", + " |b . .b| ", + " |b . ....... .b| ", + " |b . . ... . .b| ", + " | . . . . . . | ", + " | . . ..... . . | ", + " |& . . . . . .&| ", + " + . . . 7 . . . + ", + " |||||||||||||||||||||| ", + " ", + " " + ], + "palettes": [ "park_asphalt_palette" ], + "place_item": [ { "item": "basketball", "x": 12, "y": 11 } ], + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "tennis_court", + "//": "Tennis Court", + "weight": 500, + "object": { + "fill_ter": "t_pavement", + "rows": [ + " ", + " |||||||||||||||||||||& ", + " + ........[........ + ", + " | ........[........ |V ", + " | . . [ . . |b ", + " | . . [ . . |b ", + " | . ....[.... . | ", + " | . . [ . . |b ", + " | . . [ . . |b ", + " | ........[........ | ", + " | ........[........ | ", + " | | ", + " | | ", + " | ........[........ | ", + " | ........[........ | ", + " | . . [ . . |b ", + " | . . [ . . |b ", + " | . ....[.... . | ", + " | . . [ . . |b ", + " | . . [ . . |b ", + " | ........[........ |& ", + " + ........[........ + ", + " ||||||||||||||||||||| ", + " " + ], + "palettes": [ "park_asphalt_palette" ], + "place_item": [ { "item": "indoor_volleyball", "x": 5, "y": 6 }, { "item": "indoor_volleyball", "x": 17, "y": 17 } ], + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "volleyball_court", + "//": "Volleyball Court", + "weight": 300, + "object": { + "fill_ter": "t_region_groundcover_urban", + "rows": [ + "&bbb bbb&", + " ,,,,,,,,,,[,,,,,,,,,, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,,,,,,,,,,[,,,,,,,,,, ", + " ", + " ", + " ,,,,,,,,,,[,,,,,,,,,, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,$$$$$$$$$[$$$$$$$$$, ", + " ,,,,,,,,,,[,,,,,,,,,, ", + "&bbb bbb&" + ], + "palettes": [ "park_asphalt_palette" ], + "items": { "b": { "item": "shoes", "chance": 15, "repeat": [ 2, 5 ] } }, + "place_item": [ { "item": "beach_volleyball", "x": 8, "y": 6 }, { "item": "beach_volleyball", "x": 18, "y": 18 } ], + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } } ] From b4e0ffec3fbf6f49d761e488a9b69801f2c383b7 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 10 Jul 2022 17:02:04 +0200 Subject: [PATCH 4/8] No Hope park update --- data/mods/No_Hope/Mapgen/park.json | 55 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/data/mods/No_Hope/Mapgen/park.json b/data/mods/No_Hope/Mapgen/park.json index c53225d406837..fabb768aaaf31 100644 --- a/data/mods/No_Hope/Mapgen/park.json +++ b/data/mods/No_Hope/Mapgen/park.json @@ -6,37 +6,36 @@ "//": "Scenic Park", "weight": 50000, "object": { - "fill_ter": "t_grass", + "fill_ter": "t_region_groundcover_urban", "rows": [ - " ...... ", - " zzzzzzzz....zzzzzzzz ", - " z .. z ", - " z ,bTb,.. t **`** z ", - " z t ,bTb,.. *```* z ", - " z & ..........````` z ", - " z ,,..,, .. *```* z ", - " z bb.,,, .. **`** z ", - " z TT.,,, .... . z ", - ".z bb. .ssss. . t z.", - ".. ,,. .ss~~ss. . ..", - ".........s~~~~s.........", - ".........s~~~~s.........", - ".. . .ss~~ss. . ..", - ".z . .ssss. . z.", - " z . .... . z ", - " z t . t .. . b z ", - " z .. .. .. b z ", - " z fss............ z ", - " z sAs t .. z ", - " z fsf .. bb t z ", - " z .. z ", - " zzzzzzzz....zzzzzzzz ", - " ...... " + "qqqqqqqqqqqqqqqqqqqqqqqq", + "qqzzzzzzzzqqqqzzzzzzzzqq", + "qzz & qq zzq", + "qz t bTb qq t *```* zq", + "qz ,,,bTb qq ````` zq", + "qz ,,qqqqqqqqqq````` zq", + "qz ,qq qq ````` zq", + "qz bbq ! qq *```* zq", + "qz TTq qqqqqq q zq", + "qz bbq qqssssqq q t zq", + "qq q qss~~ssq q qq", + "qqqqqqqqqs~~~~sqqqqqqqqq", + "qqqqqqqqqs~~~~sqqqqqqqqq", + "qq q qss~~ssq q qq", + "qz t q qqssssqq q t zq", + "qz q qqqqqq q zq", + "qz q ! qq ! q b zq", + "qz qq qq qq b zq", + "qz fssqqqqqqqqqqqq zq", + "qz sAs qq zq", + "qz fsf t qq t bb t zq", + "qzz qq zzq", + "qqzzzzzzzzqqqqzzzzzzzzqq", + "qqqqqqqqqqqqqqqqqqqqqqqq" ], "palettes": [ "park_scenic_palette" ], - "place_item": [ { "item": "char_smoker", "x": 7, "y": 7, "chance": 50 } ], - "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 1, 23 ], "y": [ 1, 23 ], "repeat": [ 10, 20 ] } ], - "vehicles": { ".": { "vehicle": "park_playground_vehicles", "chance": 1 } } + "place_item": [ { "item": "char_smoker", "x": 5, "y": 5, "chance": 50 } ], + "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } } ] From a0b3379c66dc5040bbbf5c17c623b4d42c262d12 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 10 Jul 2022 17:12:37 +0200 Subject: [PATCH 5/8] organize park palette --- data/json/mapgen_palettes/park_palette.json | 90 +++++++++------------ 1 file changed, 36 insertions(+), 54 deletions(-) diff --git a/data/json/mapgen_palettes/park_palette.json b/data/json/mapgen_palettes/park_palette.json index 1084c4ba8b9c7..867a2a95fe556 100644 --- a/data/json/mapgen_palettes/park_palette.json +++ b/data/json/mapgen_palettes/park_palette.json @@ -3,86 +3,68 @@ "type": "palette", "id": "park_scenic_palette", "terrain": { - "#": "t_rock", - "%": "t_sidewalk", + "]": "t_brick_wall", "*": "t_wall_wood", - ",": "t_region_groundcover_barren", - "_": "t_region_groundcover_barren", - ".": "t_pavement", - "'": "t_region_groundcover_urban", - "`": "t_floor", - "&": "t_region_groundcover_barren", - "|": "t_fence", - "$": "t_sand", + "Q": "t_concrete_wall", "+": "t_door_c", + "-": "t_chaingate_c", + "`": "t_floor", + "s": "t_sidewalk", + ",": "t_region_soil", + "Y": "t_region_soil", + " ": "t_region_groundcover_urban", + "z": "t_region_groundcover_urban", + "P": "t_pavement_y", + "p": "t_pavement", ":": "t_thconc_floor", "v": "t_thconc_floor", - "]": "t_brick_wall", - "~": "t_water_pool_shallow", - "A": "t_sidewalk", - "a": "t_region_tree_fruit", - "b": "t_region_groundcover_barren", + "x": "t_thconc_floor", + "X": "t_thconc_floor", "B": "t_thconc_floor", - "C": "t_covered_well", - "c": "t_region_tree", - "e": "t_water_pump", - "g": "t_sandbox", - "h": "t_slide", - "i": "t_water_sh", - "l": "t_wall_log", "L": "t_thconc_floor", + "5": "t_thconc_floor", + "t": "t_region_tree_shade", + "4": "t_region_tree_evergreen", + "u": "t_region_shrub", + "1": "t_region_shrub_decorative", + "h": "t_slide", "m": "t_monkey_bars", - "o": "t_column", - "P": "t_pavement_y", - "p": "t_pavement", + "o": "t_bollard", "q": "t_concrete", - "Q": "t_concrete_wall", - "R": "t_railing", + "R": "t_concrete_railing", "[": "t_chainfence", - "s": "t_sidewalk", - "t": "t_region_tree_shade", - "T": "t_region_groundcover_barren", - "u": "t_region_shrub", + "g": "t_sandbox", + "e": "t_water_pump", + "~": "t_water_pool_shallow", + "i": "t_water_sh", "W": "t_water_sh", - "w": "t_water_dp", - "x": "t_thconc_floor", - "X": "t_thconc_floor", - "Y": "t_concrete", - "z": "t_region_shrub_decorative", - "Z": "t_region_shrub_fruit", - "1": [ [ "t_tree_young", 3 ], "t_region_shrub_decorative" ], - "4": "t_region_tree_evergreen", - "5": "t_thconc_floor" + "w": "t_water_dp" }, "furniture": { - "%": "f_trashcan", + "!": "f_street_light", + "z": "f_hedge_short", "&": "f_trashcan", - "'": [ [ "f_null", 40 ], "f_region_flower" ], - "{": "f_dumpster", + " ": [ [ "f_null", 40 ], "f_region_flower" ], + "f": "f_region_flower_decorative", "A": "f_statue", "B": "f_bench", "b": "f_bench", - "d": "f_region_weed", - "f": "f_region_flower_decorative", "I": "f_region_water_plant", "i": "f_region_water_plant", "L": "f_table", - "O": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 4 ], "f_boulder_large" ], "T": "f_table", "v": "f_vending_c", - "x": "f_toilet", "X": "f_trashcan", "Y": "f_brazier", - "0": [ [ "f_boulder_medium", 3 ], "f_boulder_large" ], "5": "f_sink" }, + "toilets": { "x": { } }, + "item": { "g": { "item": "sandbox_kit", "chance": 5 } }, "items": { + "x": { "item": "SUS_toilet", "chance": 50 }, "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, - "%": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, - "{": { "item": "trash", "chance": 100, "repeat": [ 5, 25 ] }, - "b": { "item": "trash", "chance": 2 }, - "L": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ], - "T": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ], + "L": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] } ], + "T": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] } ], "X": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] } } }, @@ -96,7 +78,7 @@ "7": "t_backboard", "[": "t_fence_rope", "$": "t_sand", - ",": "t_region_groundcover_barren" + ",": "t_region_soil" }, "furniture": { "b": "f_bench", "&": "f_trashcan" }, "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } }, From 357baac6a39cc016e0609ee373ca1b088584de8d Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 10 Jul 2022 17:14:34 +0200 Subject: [PATCH 6/8] park roof --- .../overmap/multitile_city_buildings.json | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index 5919682912347..06487aadf2631 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -4284,5 +4284,32 @@ { "point": [ 0, 0, 0 ], "overmap": "skate_park_up_north" }, { "point": [ 0, 0, -1 ], "overmap": "skate_park_down_north" } ] + }, + { + "type": "city_building", + "id": "playground", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "playground_north" }, + { "point": [ 0, 0, 1 ], "overmap": "playground_roof_north" } + ] + }, + { + "type": "city_building", + "id": "park", + "locations": [ "land" ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "park_north" }, { "point": [ 0, 0, 1 ], "overmap": "park_roof_north" } ] + }, + { + "type": "city_building", + "id": "park_5", + "locations": [ "land" ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "park_5_north" }, { "point": [ 0, 0, 1 ], "overmap": "park_5_roof_north" } ] + }, + { + "type": "city_building", + "id": "park_7", + "locations": [ "land" ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "park_7_north" }, { "point": [ 0, 0, 1 ], "overmap": "park_7_roof_north" } ] } ] From 878247d7c64c9f79c221ad676d18f64df7de72e2 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 10 Jul 2022 17:15:28 +0200 Subject: [PATCH 7/8] obsolete fake specials --- data/json/obsoletion/fakespecials.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 data/json/obsoletion/fakespecials.json diff --git a/data/json/obsoletion/fakespecials.json b/data/json/obsoletion/fakespecials.json new file mode 100644 index 0000000000000..d1cb3ebe220d3 --- /dev/null +++ b/data/json/obsoletion/fakespecials.json @@ -0,0 +1,26 @@ +[ + { + "type": "city_building", + "id": "FakeSpecial_playground", + "locations": [ "land" ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "playground_north" } ] + }, + { + "type": "city_building", + "id": "FakeSpecial_park", + "locations": [ "land" ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "park_north" } ] + }, + { + "type": "city_building", + "id": "FakeSpecial_park_5", + "locations": [ "land" ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "park_5_north" } ] + }, + { + "type": "city_building", + "id": "FakeSpecial_park_7", + "locations": [ "land" ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "park_7_north" } ] + } +] From 3e65ffe53eaef3df8cf0c9a4558190574c94e177 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Sun, 10 Jul 2022 20:07:35 +0200 Subject: [PATCH 8/8] remove volleyballs from tennis court --- data/json/mapgen/park.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json index 434faa1914858..9fbf9945776a5 100644 --- a/data/json/mapgen/park.json +++ b/data/json/mapgen/park.json @@ -648,7 +648,6 @@ " " ], "palettes": [ "park_asphalt_palette" ], - "place_item": [ { "item": "indoor_volleyball", "x": 5, "y": 6 }, { "item": "indoor_volleyball", "x": 17, "y": 17 } ], "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } },