Skip to content

Commit

Permalink
Merge pull request #31240 from curstwist/add-roofs-to-s_garage-buildings
Browse files Browse the repository at this point in the history 
add roofs to garages
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Jun 8, 2019
2 parents 2789faf + 3944b38 commit c30bad0
Show file tree
Hide file tree
Showing 4 changed files with 318 additions and 47 deletions.
288 changes: 242 additions & 46 deletions data/json/mapgen/garage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,54 @@
"om_terrain": [ "s_garage" ],
"weight": 1000,
"object": {
"fill_ter": "t_floor",
"fill_ter": "t_concrete",
"rows": [
" EEEEEE EEEEEE ",
" EEEEEE EEEEEE ",
" EEEEEE EEEEEE ",
" EEEEEE EEEEEE ",
" eEEEEEE eEEEEEE ",
" ----======----======-- ",
" |S.eM#MM#M...eM#MM#M.| ",
" |S..M#MM#M....M#MM#M.| ",
" |c..M#MM#M....M#MM#M.| ",
" |c..M#MM#M....M#MM#M.| ",
" |c..M#MM#M....M#MM#M.| ",
" |c..M#MM#M....M#MM#M.| ",
" |c..MMMMMMMMMMMMMMMM.| ",
" A....................| ",
" |---l...........HHHHH| ",
" |ts|c...........HLLLL| ",
" |-+|p...........Hbbbb| ",
" |...............$....+ ",
" |^W|............Hhbbb| ",
" |xx|cccccSScccccH6LLL| ",
" |----::::--::::------| ",
" ",
" ",
" eEEEEEE eEEEEEEEEE",
" ----======----======--E",
" |S.eM#MM#M...eM#MM#M.|E",
" |S..M#MM#M....M#MM#M.|E",
" |c..M#MM#M....M#MM#M.|E",
" |c..M#MM#M....M#MM#M.|E",
" |c..M#MM#M....M#MM#M.|E",
" |c..M#MM#M....M#MM#M.|E",
" |c..MMMMMMMMMMMMMMMM.|E",
" |....................|E",
" |---l...........HHHHH|E",
" |ts|c...........HLLLL|E",
" |-+|p...........Hbbbb|E",
"4|...............$....+E",
" |^W|............Hhbbb|E",
" |xx|cccccSScccccH6LLL|E",
" |----::::--::::------|E",
" EU<UEE",
" EUEEEE",
" "
],
"terrain": {
" ": [ "t_grass", "t_grass", "t_grass", "t_dirt", "t_shrub", "t_grass", "t_grass", "t_grass", "t_dirt" ],
" ": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ],
"E": "t_pavement",
"U": "t_pavement",
"$": "t_door_glass_c",
"+": "t_door_c",
"-": "t_wall",
".": "t_floor",
"-": "t_brick_wall",
".": "t_concrete",
"6": "t_console_broken",
":": "t_window",
"=": "t_door_metal_locked",
"A": "t_m_frame",
"H": "t_wall_glass",
"e": "t_gates_mech_control",
"|": "t_wall",
"|": "t_brick_wall",
"W": "t_chainfence_h",
"^": "t_chaingate_c",
"M": "t_metal_floor",
"#": "t_grate"
"#": "t_grate",
"4": "t_gutter_downspout",
"<": "t_ladder_up"
},
"furniture": {
"A": "f_air_conditioner",
Expand All @@ -62,7 +65,8 @@
"l": "f_heavy_lathe",
"t": "f_toilet",
"x": "f_crate_c",
"h": "f_chair"
"h": "f_chair",
"U": [ "f_dumpster", "f_recycle_bin" ]
},
"items": {
"L": { "item": "clothing_work_set", "chance": 25 },
Expand All @@ -79,7 +83,51 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_garage" ],
"om_terrain": "s_garage_roof",
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" |222222222222222222223 ",
" |....................3 ",
" |....................3 ",
" |....................3 ",
" |....................3 ",
" |....................3 ",
" |....................3 ",
" |....................3 ",
" |....................3 ",
" |....................3 ",
" |....................3 ",
" |....&...............3 ",
" 5....................3 ",
" |..........AA........3 ",
" |.=..................3 ",
" |----------------##### ",
" ##>## ",
" #### ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ">": "t_ladder_down" },
"place_items": [ { "item": "roof_trash", "x": [ 4, 20 ], "y": [ 7, 18 ], "chance": 50, "repeat": [ 1, 3 ] } ],
"place_nested": [
{
"chunks": [ [ "null", 20 ], [ "roof_2x2_utilities_b", 40 ], [ "roof_2x2_utilities_c", 40 ] ],
"x": [ 3, 15 ],
"y": [ 8, 12 ]
}
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_garage_1" ],
"weight": 1000,
"object": {
"fill_ter": "t_floor",
Expand All @@ -103,7 +151,7 @@
" wSx..w_~~~~~~~~_wd..Lw ",
" wS..xD_~~~~~~~~_+....+ ",
" wS.x.w_~~~~~~~~_ww+www ",
" wccccw__________ws..tw ",
" wccccw4________4ws..tw ",
" wwwwwwUUUUUUUUUUwwwwww ",
" ",
" ",
Expand All @@ -124,7 +172,8 @@
":": "t_window",
"W": "t_chainfence_h",
"^": "t_chaingate_c",
"z": "t_dirt"
"z": "t_dirt",
"4": "t_gutter_downspout"
},
"furniture": {
"L": "f_locker",
Expand Down Expand Up @@ -153,57 +202,97 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_garage" ],
"om_terrain": "s_garage_roof_1",
"object": {
"fill_ter": "t_tar_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" |22223 |22223 ",
" |....3 |....3 ",
" |....3 |....3 ",
" |....3 |....3 ",
" |....3 |....3 ",
" |....5 5....3 ",
" |----30000000000|----3 ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_tar_flat_roof", "0": "t_open_air_rooved" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_garage_2" ],
"weight": 1000,
"object": {
"fill_ter": "t_floor",
"fill_ter": "t_concrete",
"rows": [
" EEEEEE XXX ",
" EEEEEE XXX ",
" EEEEEE XXX ",
" EEEEEE XXX ",
" eEEEEEEXXXXXXXXXXXXXX",
" ---======-----HHOHH---X",
" |.eM#MM#M..|.........|X",
" |.eM#MM#M..|y.......y|X",
" |..M#MM#M..|b........|X",
" :..M#MM#M..:b..|-ddd-|X",
" :..M#MM#M..:b..|..h..|X",
" :..M#MM#M..:b..|f.h.y|X",
" A..M#MM#M..:b..|--.--|X",
" |..M#MM#M..|b..|...hd|X",
" |..MMMMMM..|...+f6ddd|X",
" |..........|...|-----|X",
" |---....---|-+-|LLLLL|X",
" |..M#MM#M..+...+...hd|X",
" |..MMMMMM..|-+-|f6ddd|X",
" |..........|&.s|-----|X",
" |---....---|---|LLLLL|X",
" |..............|bbbbb|X",
" |WWWW..WWWW|...+.....|X",
" |c........c|------+--|X",
" |c.xx..xx.p|xx.+T|...OX",
" |c........c|-------+-|X",
" |c.xx..xx.p|xx.+T|<..OX",
" |l.xx..xx.c|x..-|----|X",
" |S.........O..xx|XXXXXX",
" |ScccccccSS|----|XXXXXX",
" |S.........O..xx|4UUXXX",
" |ScccccccSS|----|UXXXXX",
" |----------|WWWWWWWWWWW",
" "
],
"terrain": {
" ": [ "t_grass", "t_grass", "t_grass", "t_dirt", "t_shrub", "t_grass", "t_grass", "t_grass", "t_dirt" ],
"E": "t_pavement",
"X": "t_sidewalk",
"U": "t_sidewalk",
"$": "t_door_glass_c",
"+": "t_door_c",
"O": "t_door_locked",
"-": "t_wall",
".": "t_floor",
"-": "t_wall_b",
".": "t_concrete",
"6": "t_console_broken",
":": "t_window",
"=": "t_door_metal_locked",
"A": "t_m_frame",
"H": "t_wall_glass",
"e": "t_gates_mech_control",
"|": "t_wall",
"|": "t_wall_b",
"W": "t_chainfence_h",
"^": "t_chaingate_c",
"M": "t_metal_floor",
"#": "t_grate"
"#": "t_grate",
"4": "t_gutter_downspout",
"<": "t_stairs_up"
},
"toilets": { "&": { } },
"furniture": {
"A": "f_air_conditioner",
"L": "f_locker",
Expand All @@ -218,7 +307,9 @@
"t": "f_toilet",
"x": "f_crate_c",
"f": "f_filing_cabinet",
"h": "f_chair"
"h": "f_chair",
"U": [ "f_dumpster", "f_recycle_bin" ],
"y": [ "f_indoor_plant", "f_indoor_plant_y" ]
},
"items": {
"L": { "item": "clothing_work_set", "chance": 25 },
Expand All @@ -231,5 +322,110 @@
},
"place_vehicles": [ { "vehicle": "garage", "x": [ 8, 8 ], "y": [ 9, 10 ], "chance": 95, "rotation": 90 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "s_garage_roof_2",
"object": {
"fill_ter": "t_concrete",
"rows": [
" ",
" ",
" ",
" ",
" ",
" |222222222222222222223 ",
" |....................3 ",
" |....***************.3 ",
" |....8......x..xx..*.3 ",
" |....*xxx..........*.3 ",
" |....%%%%%%%%%%%+%%%%% ",
" |....%yfff%'rr''''%ST% ",
" |....WI'''W'''''''%''% ",
" |....WIh''W'''CC''%+%% ",
" |....WI'''+''C'C''''C% ",
" |....%''''W'''''''Y''% ",
" |...4%tsst%'rrrrr''''% ",
" |....%%%%%%%%%%%%%%+%% ",
" |................%>''% ",
" |...............5%%%%% ",
" |...............3 ",
" |..........3----3 ",
" |----------3 ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": {
"%": "t_wall_b",
"+": "t_door_locked",
">": "t_stairs_down",
"'": "t_concrete",
"W": "t_window_domestic",
"*": "t_chainfence",
"8": "t_chaingate_c",
"x": [ "t_machinery_light", "t_machinery_heavy", "t_machinery_old", "t_machinery_electronic" ]
},
"furniture": { "I": "f_desk", "h": "f_chair", "f": "f_filing_cabinet" },
"items": {
"I": { "item": "office", "chance": 30 },
"f": { "item": "office_paper", "chance": 30 },
"S": { "item": "mechanics", "chance": 20 },
"r": { "item": "mechanics", "chance": 20 },
"C": { "item": "softdrugs", "chance": 20 }
},
"place_nested": [
{
"chunks": [
[ "null", 20 ],
[ "roof_2x2_utilities_b", 15 ],
[ "roof_2x2_utilities_c", 5 ],
[ "roof_2x2_utilities_d", 10 ],
[ "roof_2x2_utilities", 10 ],
[ "roof_2x2_golf", 10 ],
[ "roof_3x3_wine", 10 ],
[ "roof_4x4_party", 5 ]
],
"x": 3,
"y": 18
}
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "s_garage_upper_roof_2",
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" |2222222222222223 ",
" |...............3 ",
" |....X..........3 ",
" |...............3 ",
" |...............3 ",
" |.........:.....3 ",
" 5...............3 ",
" |-----------|...3 ",
" |...3 ",
" |---3 ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"furniture": { ":": "f_cellphone_booster", "X": "f_small_satelitte_dish" }
}
}
]
Loading

0 comments on commit c30bad0

Please sign in to comment.