Skip to content

Commit

Permalink
fix: trailer park and the palette trailer_park (#5273)
Browse files Browse the repository at this point in the history 
* Update trailer_park.json

* Update trailer_park.json
  • Loading branch information
@0Monet
0Monet authored Aug 29, 2024
1 parent db13960 commit fc4699e
Show file tree
Hide file tree
Showing 2 changed files with 131 additions and 188 deletions.
244 changes: 106 additions & 138 deletions data/json/mapgen/trailer_park.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,37 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": "trailerparksmall0",
"object": {
"furniture": {
"#": "f_table",
"&": "f_toilet",
"B": "f_bed",
"C": "f_counter",
"W": "f_wreckage",
"o": "f_oven",
"a": "f_cupboard",
"e": "f_shower",
"t": "f_trashcan",
"{": "f_dumpster"
},
"fill_ter": "t_floor",
"rows": [
" d dddd d dd ",
" d|||||||||||||WW||d",
" cccc||T,|,,|,,tt|FoCa| ",
" cccc||,,|,,+,,,b|,,,,| ",
" cccc||,,|,,|,,,,,,,,,|d",
" cccc||S,+,@|,,,,,,,,,|d",
" cccc||j,|,@|HH,,,,,,^| ",
" ccccd||||W|||W|||||+||d",
" cccc ddd sd dd ds g ",
" .......................",
"{.......................",
"{.......................",
"{.......................",
" .......................",
" .......................",
" cccc dd sss g d ",
" cccc ||||W|||W||||+||| ",
" cccc||,,|,@|HHHt,,,,&|d",
" cccc||S,+,@|,,,,,,,,,| ",
" cccc||,,|,,|,,,,,,,,,|d",
" cccc||,,|,,+,,b,|a,,,|d",
" cccc||jT|,,|,,tt|aoCF| ",
" d|||||||||||||WW||d",
" d d d d d "
],
"palettes": [ "trailer_park" ],
"items": { "{": { "item": "trash_dumpster", "chance": 80 } },
"place_items": [
{ "chance": 10, "item": "kitchen_nonfood", "x": 20, "y": 3 },
Expand All @@ -38,40 +56,8 @@
{ "chance": 5, "item": "road", "x": 5, "y": 10 },
{ "chance": 5, "item": "road", "x": 2, "y": 8 }
],
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 14, 23 ], "y": [ 10, 16 ], "repeat": [ 1, 6 ] } ],
"place_toilets": [ { "x": 7, "y": 3 }, { "x": 8, "y": 21 } ],
"rows": [
"________________________",
"______d___dddd__d__dd___",
"_ccWcd|||||||||||||w|||d",
"_cWWc||&f|ff|ff##|FoCa|_",
"_cccc||ff+ff+fffb|ffff|d",
"_cccg||fS|ff|fffffffff|d",
"_cccc||ef|Bf|HHffffff^|_",
"_ccccd|||||w|||w||||+||d",
"_cccc_ddd__d_dd__ds_.___",
"_.......................",
"{.......................",
"{.......................",
"{.......................",
"_.......................",
"_.......................",
"_cccc________sss___.____",
"_cccc_||||w|||w||||+|||_",
"_cccc||ff|fB|HHH#fffft|d",
"_cccc||Sf+ff|fffffffff|_",
"_cccc||ff|ff|fffffffff|d",
"_cccc||ff|ff+ffbf|afff|d",
"_cccc||e&|ff|ff##|aoCF|_",
"_____d|||||||||||||ww||d",
"_______d_____d__d__d_d__"
],
"terrain": { "#": "t_floor", "W": "t_concrete", "b": "t_floor", "{": "t_grass" },
"palettes": [ "trailer_park" ]
},
"om_terrain": "trailerparksmall0",
"type": "mapgen",
"weight": 100
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 14, 23 ], "y": [ 10, 16 ], "repeat": [ 1, 6 ] } ]
}
},
{
"type": "mapgen",
Expand All @@ -80,12 +66,12 @@
"object": {
"fill_ter": "t_tar_flat_roof",
"rows": [
" ",
" ",
" ................. ",
" ...............&.. ",
" ..........%....... ",
" .................. ",
" .................. ",
" .............=.... ",
" ................. ",
" ",
Expand All @@ -111,61 +97,56 @@
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "trailerparksmall1",
"object": {
"place_item": [ { "item": "blanket", "repeat": 1, "x": 11, "y": 17 }, { "item": "corpse", "repeat": 1, "x": 7, "y": 19 } ],
"furniture": { "B": "f_bed", "D": "f_null", "b": "f_null", "g": "f_shower", "o": "f_oven" },
"fill_ter": "t_floor",
"rows": [
" ....... ",
" # # ....... d ",
" #d d....... ddd# d",
" 4# 4# d.......||||||d ",
" d# ## .......|,,,,|#d",
" d d#4 .......w,,,,|#d",
" # # #d.......w,,,,|d ",
" # 4# dd.......|,,,,| d",
" dd d ddd.......||||+| ",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
" cccc s dss dd g ss ",
" cccc ||||W|||W||||+||| ",
" cccc||,,|,@|HHHt,,,,&|d",
" cccc||S,+,@|,,,,,,,,,| ",
" cccc||,,|,,|,,,,,,,,,|d",
" cccc||,,|,,+,,b,|a,,o|d",
" cccc||jT|,,|,,tt|aCCF| ",
" d|||||||||||||WW||d",
" d d d d d "
],
"palettes": [ "trailer_park" ],
"place_item": [ { "item": "blanket", "repeat": 1, "x": 11, "y": 17 } ],
"place_items": [
{ "chance": 25, "item": "house_suicide_shotgun", "x": 8, "y": 20 },
{ "chance": 45, "item": "cannedfood", "x": 20, "y": 21 },
{ "chance": 35, "item": "magazines", "x": 16, "y": 17 },
{ "chance": 45, "item": "alcohol", "x": 19, "y": 21 },
{ "chance": 25, "item": "clutter_bedroom", "x": 10, "y": 20 },
{ "chance": 35, "item": "clutter_bedroom", "x": 11, "y": 18 },
{ "chance": 15, "item": "textbooks", "x": 15, "y": 21 },
{ "chance": 70, "item": "SUS_fridge", "x": 21, "y": 21 },
{ "chance": 35, "item": "softdrugs", "x": 7, "y": 20 },
{ "chance": 35, "item": "house_suicide_clothing", "x": 7, "y": 19 }
{ "chance": 35, "item": "softdrugs", "x": 7, "y": 20 }
],
"place_monster": [
{ "group": "GROUP_ZOMBIE", "x": [ 7, 13 ], "y": [ 16, 23 ], "repeat": [ 1, 6 ] },
{ "group": "GROUP_ZOMBIE", "x": [ 14, 20 ], "y": [ 10, 16 ], "repeat": [ 1, 6 ] },
{ "group": "GROUP_DOGS", "x": [ 0, 6 ], "y": [ 11, 17 ], "repeat": [ 1, 2 ] }
],
"place_loot": [ { "item": "television", "x": 20, "y": 6, "chance": 100 }, { "item": "stepladder", "x": 19, "y": 5, "chance": 100 } ],
"place_toilets": [ { "x": 8, "y": 21 } ],
"rows": [
"_________.......________",
"__#___#__.......__d_____",
"____#d__d......._ddd#__d",
"_4#_4#__d.......||||||d_",
"_d#_##___.......|ffff|#d",
"___d_d#4_.......wffff|#d",
"_#__#__#d.......wffff|d_",
"__#_7s_dd.......|ffff|_d",
"_dd_d_ddd.......||||+|__",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"_cccc__s___s#______._ss_",
"_cccc_||||0|||b||||D|||_",
"_cccc||ff|fB|ffftfHHH&|d",
"_cccc||Sf-ff|fffffffff|_",
"_cccc||ff|ff|fffffffff|d",
"_cccc||ff|ffDffef|Cffo|d",
"_cccc||gT|ff|fftt|Caa{|_",
"_____d|||||||||||||WW||d",
"_______d_____d__d__d_d__"
],
"terrain": { "D": "t_door_o", "g": "t_floor" },
"palettes": [ "trailer_park" ]
},
"om_terrain": "trailerparksmall1",
"type": "mapgen",
"weight": 100
"place_loot": [ { "item": "television", "x": 20, "y": 6, "chance": 100 }, { "item": "stepladder", "x": 19, "y": 5, "chance": 100 } ]
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -205,19 +186,38 @@
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "trailerparksmall2",
"object": {
"furniture": {
"#": "f_table",
"&": "f_toilet",
"C": "f_counter",
"a": "f_cupboard",
"b": "f_bed",
"g": "f_null",
"t": "f_trashcan",
"{": "f_dumpster",
"o": "f_oven"
},
"fill_ter": "t_floor",
"rows": [
" ddd d d d ",
" ||W|||||||||||||| ",
" |aCF|tHH,|,,D|jT||cccc ",
"d|o,,|,,,,+,,,|,,||cccc ",
" |,,,,,,,,|,,,|,,||cccc ",
" |,,,,,,,,|@@,+,,||cccc ",
"d|,,,,,bt&|@@,|,S||cccc ",
" ||+|||WW|||W|||||dcccc ",
" gd s dds cccc ",
"....................... ",
".......................{",
".......................{",
".......................{",
"....................... ",
"....................... ",
" cccc sd ss d d g ss ",
" cccc ||||W|||W||||+||| ",
" cccc||,,|,@|,,At,,,,&|d",
" cccc||S,+,@|,,,,,,,,,| ",
" cccc||,,|,,|,,,,,,,,,|d",
" cccc||,,|,,+,,b,|a,,o|d",
" cccc||jT|,D|,,tt|aCCF| ",
" d|||||||||||||WW||d",
" d d d d d "
],
"palettes": [ "trailer_park" ],
"items": { "{": { "item": "trash_dumpster", "chance": 80 } },
"place_items": [
{ "chance": 20, "item": "table_livingroom", "x": 16, "y": 21 },
Expand All @@ -242,40 +242,8 @@
"place_monster": [
{ "group": "GROUP_ZOMBIE", "x": [ 14, 20 ], "y": [ 10, 16 ], "repeat": [ 1, 6 ] },
{ "group": "GROUP_DOGS", "x": [ 0, 6 ], "y": [ 11, 17 ], "repeat": [ 1, 2 ] }
],
"place_toilets": [ { "x": 18, "y": 2 }, { "x": 8, "y": 21 } ],
"rows": [
"________ppp_p___p_______",
"ddd||ww|||||||||||||____",
"ddd|aCC|f#HH|fbb|B&||p__",
"ddd|off|ffff|fbb|ff||___",
"ddd|ffffffffffff|ff||___",
"dddwffffffff|ffffff||p__",
"ddd|fffffe#t|Dff|fS||p__",
"ddd||+|||ww|||w||i||p___",
"ddd__gp______pp_________",
"......................._",
".......................{",
".......................{",
".......................{",
"......................._",
"......................._",
"_cccc__s___su______g_ss_",
"_cccc_||||w|||w||||+|||_",
"_cccc||ff|fb|ffA#fffft|d",
"_cccc||Sfhff|fffffffff|_",
"_cccc||ff|ff|fffffffff|d",
"_cccc||ff|ffhffef|affo|d",
"_cccc||j&|fD|ff##|aCCF|_",
"_____d|||||||||||||WW||d",
"_______d_____d__d__d_d__"
],
"terrain": { "#": "t_floor", "b": "t_floor", "g": "t_sidewalk", "{": "t_grass" },
"palettes": [ "trailer_park" ]
},
"om_terrain": "trailerparksmall2",
"type": "mapgen",
"weight": 100
]
}
},
{
"type": "mapgen",
Expand All @@ -285,13 +253,13 @@
"fill_ter": "t_tar_flat_roof",
"rows": [
" ",
" ................. ",
" .................. ",
" .................. ",
" ......&....=...... ",
" .................. ",
" .......%.......... ",
" ................. ",
" ................. ",
" .................. ",
" .................. ",
" ......&....=...... ",
" .................. ",
" .......%.......... ",
" ................. ",
" ",
" ",
" ",
Expand Down
Loading

0 comments on commit fc4699e

Please sign in to comment.