Skip to content

Commit

Permalink
fix: use regional terrain for recycling centres (#5030)
Browse files Browse the repository at this point in the history 
Update recycle_center.json
  • Loading branch information
@0Monet
0Monet authored Jul 21, 2024
1 parent 2a1983e commit 63206ad
Showing 1 changed file with 101 additions and 104 deletions.
205 changes: 101 additions & 104 deletions data/json/mapgen/recycle_center.json
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,10 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": "recyclecenter",
"object": {
"fill_ter": "t_thconc_floor",
"furniture": {
"'": "f_street_light",
"#": "f_table",
"&": "f_trashcan",
"P": "f_sign",
"c": "f_chair",
"d": "f_desk",
"t": "f_table",
"{": "f_recycle_bin",
"S": "f_sink"
},
"toilets": { "T": { } },
"place_items": [
{ "chance": 50, "repeat": [ 120, 220 ], "item": "recycle_iron", "x": [ 10, 14 ], "y": [ 15, 16 ] },
{ "chance": 50, "repeat": [ 50, 120 ], "item": "recycle_electronic", "x": [ 18, 19 ], "y": [ 12, 14 ] },
{ "chance": 50, "repeat": [ 160, 400 ], "item": "recycle_paper", "x": [ 4, 5 ], "y": [ 11, 19 ] },
{ "chance": 50, "repeat": [ 80, 180 ], "item": "recycle_copper", "x": [ 10, 14 ], "y": [ 12, 13 ] },
{ "chance": 50, "repeat": [ 30, 100 ], "item": "recycle_battery", "x": [ 18, 19 ], "y": [ 17, 19 ] },
{ "chance": 50, "repeat": [ 80, 180 ], "item": "recycle_glass", "x": [ 18, 19 ], "y": [ 7, 9 ] },
{ "chance": 50, "repeat": [ 150, 250 ], "item": "recycle_steel", "x": [ 10, 14 ], "y": [ 18, 19 ] },
{ "chance": 25, "item": "office_mess", "x": 6, "y": 7 },
{ "chance": 25, "item": "office_mess", "x": 3, "y": 7 },
{ "chance": 35, "repeat": 2, "item": "trash", "x": 3, "y": 5 },
{ "chance": 50, "repeat": [ 80, 180 ], "item": "recycle_aluminum", "x": [ 10, 14 ], "y": [ 9, 10 ] },
{ "chance": 50, "repeat": [ 180, 350 ], "item": "recycle_plastic", "x": [ 7, 8 ], "y": [ 11, 19 ] }
],
"rows": [
".........s.............'",
".........s..............",
Expand Down Expand Up @@ -58,8 +34,8 @@
"terrain": {
"&": "t_floor",
"+": "t_door_metal_c",
".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
"'": "t_dirt",
".": "t_region_groundcover_urban",
"'": "t_region_groundcover_urban",
"D": "t_door_c",
"_": "t_thconc_floor",
"c": "t_floor",
Expand All @@ -72,6 +48,32 @@
"|": "t_brick_wall",
"4": "t_gutter_downspout"
},
"furniture": {
"'": "f_street_light",
"#": "f_table",
"&": "f_trashcan",
"P": "f_sign",
"c": "f_chair",
"d": "f_desk",
"t": "f_table",
"{": "f_recycle_bin",
"S": "f_sink"
},
"toilets": { "T": { } },
"place_items": [
{ "chance": 50, "repeat": [ 120, 220 ], "item": "recycle_iron", "x": [ 10, 14 ], "y": [ 15, 16 ] },
{ "chance": 50, "repeat": [ 50, 120 ], "item": "recycle_electronic", "x": [ 18, 19 ], "y": [ 12, 14 ] },
{ "chance": 50, "repeat": [ 160, 400 ], "item": "recycle_paper", "x": [ 4, 5 ], "y": [ 11, 19 ] },
{ "chance": 50, "repeat": [ 80, 180 ], "item": "recycle_copper", "x": [ 10, 14 ], "y": [ 12, 13 ] },
{ "chance": 50, "repeat": [ 30, 100 ], "item": "recycle_battery", "x": [ 18, 19 ], "y": [ 17, 19 ] },
{ "chance": 50, "repeat": [ 80, 180 ], "item": "recycle_glass", "x": [ 18, 19 ], "y": [ 7, 9 ] },
{ "chance": 50, "repeat": [ 150, 250 ], "item": "recycle_steel", "x": [ 10, 14 ], "y": [ 18, 19 ] },
{ "chance": 25, "item": "office_mess", "x": 6, "y": 7 },
{ "chance": 25, "item": "office_mess", "x": 3, "y": 7 },
{ "chance": 35, "repeat": 2, "item": "trash", "x": 3, "y": 5 },
{ "chance": 50, "repeat": [ 80, 180 ], "item": "recycle_aluminum", "x": [ 10, 14 ], "y": [ 9, 10 ] },
{ "chance": 50, "repeat": [ 180, 350 ], "item": "recycle_plastic", "x": [ 7, 8 ], "y": [ 11, 19 ] }
],
"place_signs": [
{ "signage": "GLASS", "x": 18, "y": 6 },
{ "signage": "ALUMINUM", "x": 15, "y": 9 },
Expand All @@ -83,10 +85,7 @@
{ "signage": "BATTERIES", "x": 18, "y": 16 },
{ "signage": "STEEL", "x": 15, "y": 18 }
]
},
"om_terrain": "recyclecenter",
"type": "mapgen",
"weight": 100
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -138,39 +137,11 @@
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "recyclecenter_1",
"object": {
"fill_ter": "t_thconc_floor",
"furniture": {
"'": "f_street_light",
"#": "f_table",
"&": "f_trashcan",
"C": "f_chair",
"P": "f_sign",
"S": "f_sign",
"a": "f_desk",
"b": "f_bench",
"d": "f_recycle_bin",
"s": "f_sign",
"{": "f_recycle_bin",
"R": "f_sink"
},
"place_items": [
{ "chance": 50, "repeat": [ 20, 60 ], "item": "recycle_copper", "x": [ 8, 9 ], "y": 19 },
{ "chance": 50, "repeat": [ 80, 220 ], "item": "recycle_plastic", "x": [ 4, 5 ], "y": [ 6, 11 ] },
{ "chance": 50, "repeat": [ 80, 220 ], "item": "recycle_iron", "x": [ 8, 9 ], "y": [ 6, 11 ] },
{ "chance": 30, "repeat": 2, "item": "trash", "x": 12, "y": 7 },
{ "chance": 30, "repeat": 2, "item": "trash", "x": 13, "y": 5 },
{ "chance": 50, "repeat": [ 100, 350 ], "item": "recycle_paper", "x": [ 18, 19 ], "y": [ 9, 19 ] },
{ "chance": 50, "repeat": [ 20, 120 ], "item": "recycle_battery", "x": [ 13, 15 ], "y": [ 18, 19 ] },
{ "chance": 25, "item": "office", "x": 14, "y": 5 },
{ "chance": 25, "item": "office", "x": 12, "y": 5 },
{ "chance": 50, "repeat": [ 80, 250 ], "item": "recycle_steel", "x": [ 4, 5 ], "y": [ 14, 19 ] },
{ "chance": 50, "repeat": [ 20, 100 ], "item": "recycle_aluminum", "x": [ 8, 9 ], "y": [ 14, 15 ] },
{ "chance": 50, "repeat": [ 20, 120 ], "item": "recycle_electronic", "x": [ 13, 15 ], "y": [ 14, 15 ] },
{ "chance": 50, "repeat": [ 20, 150 ], "item": "recycle_glass", "x": [ 13, 15 ], "y": [ 10, 11 ] }
],
"place_vehicles": [ { "chance": 75, "fuel": 0, "rotation": 270, "status": -1, "vehicle": "forklift", "x": 16, "y": [ 7, 16 ] } ],
"rows": [
".....cccc..............'",
".....cccc...............",
Expand Down Expand Up @@ -200,8 +171,8 @@
"terrain": {
"+": "t_chaingate_c",
"-": "t_chainfence",
".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
"'": "t_dirt",
".": "t_region_groundcover_urban",
"'": "t_region_groundcover_urban",
"D": "t_door_metal_c",
"P": "t_concrete",
"S": "t_chainfence",
Expand All @@ -214,6 +185,36 @@
"4": "t_gutter_downspout",
"=": "t_door_c"
},
"furniture": {
"'": "f_street_light",
"#": "f_table",
"&": "f_trashcan",
"C": "f_chair",
"P": "f_sign",
"S": "f_sign",
"a": "f_desk",
"b": "f_bench",
"d": "f_recycle_bin",
"s": "f_sign",
"{": "f_recycle_bin",
"R": "f_sink"
},
"place_items": [
{ "chance": 50, "repeat": [ 20, 60 ], "item": "recycle_copper", "x": [ 8, 9 ], "y": 19 },
{ "chance": 50, "repeat": [ 80, 220 ], "item": "recycle_plastic", "x": [ 4, 5 ], "y": [ 6, 11 ] },
{ "chance": 50, "repeat": [ 80, 220 ], "item": "recycle_iron", "x": [ 8, 9 ], "y": [ 6, 11 ] },
{ "chance": 30, "repeat": 2, "item": "trash", "x": 12, "y": 7 },
{ "chance": 30, "repeat": 2, "item": "trash", "x": 13, "y": 5 },
{ "chance": 50, "repeat": [ 100, 350 ], "item": "recycle_paper", "x": [ 18, 19 ], "y": [ 9, 19 ] },
{ "chance": 50, "repeat": [ 20, 120 ], "item": "recycle_battery", "x": [ 13, 15 ], "y": [ 18, 19 ] },
{ "chance": 25, "item": "office", "x": 14, "y": 5 },
{ "chance": 25, "item": "office", "x": 12, "y": 5 },
{ "chance": 50, "repeat": [ 80, 250 ], "item": "recycle_steel", "x": [ 4, 5 ], "y": [ 14, 19 ] },
{ "chance": 50, "repeat": [ 20, 100 ], "item": "recycle_aluminum", "x": [ 8, 9 ], "y": [ 14, 15 ] },
{ "chance": 50, "repeat": [ 20, 120 ], "item": "recycle_electronic", "x": [ 13, 15 ], "y": [ 14, 15 ] },
{ "chance": 50, "repeat": [ 20, 150 ], "item": "recycle_glass", "x": [ 13, 15 ], "y": [ 10, 11 ] }
],
"place_vehicles": [ { "chance": 75, "fuel": 0, "rotation": 270, "status": -1, "vehicle": "forklift", "x": 16, "y": [ 7, 16 ] } ],
"toilets": { "T": { } },
"place_signs": [
{ "signage": "GLASS", "x": 15, "y": 9 },
Expand All @@ -228,10 +229,7 @@
{ "signage": "<given_name>'s Recycling", "x": 8, "y": 3 },
{ "signage": "Drop off 7am to 6pm Monday thru Friday", "x": 11, "y": 3 }
]
},
"om_terrain": "recyclecenter_1",
"type": "mapgen",
"weight": 100
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -283,36 +281,11 @@
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "recyclecenter_2",
"object": {
"fill_ter": "t_thconc_floor",
"furniture": {
"'": "f_street_light",
"#": "f_counter",
"&": "f_trashcan",
"P": "f_sign",
"c": "f_chair",
"d": "f_desk",
"s": "f_sign",
"{": "f_recycle_bin",
"S": "f_sink"
},
"toilets": { "T": { } },
"place_items": [
{ "chance": 15, "item": "office", "x": [ 4, 5 ], "y": 14 },
{ "chance": 30, "item": "trash", "x": 3, "y": 14 },
{ "chance": 20, "item": "tools_home", "x": 3, "y": [ 19, 20 ] },
{ "chance": 50, "repeat": [ 80, 280 ], "item": "recycle_plastic", "x": [ 15, 16 ], "y": [ 7, 12 ] },
{ "chance": 50, "repeat": [ 80, 280 ], "item": "recycle_glass", "x": [ 19, 20 ], "y": [ 7, 12 ] },
{ "chance": 50, "repeat": [ 80, 350 ], "item": "recycle_paper", "x": [ 3, 9 ], "y": [ 7, 8 ] },
{ "chance": 50, "repeat": [ 30, 150 ], "item": "recycle_electronic", "x": [ 3, 5 ], "y": [ 10, 11 ] },
{ "chance": 50, "repeat": [ 20, 120 ], "item": "recycle_battery", "x": [ 8, 9 ], "y": [ 10, 11 ] },
{ "chance": 50, "repeat": [ 80, 350 ], "item": "recycle_iron", "x": [ 9, 15 ], "y": [ 15, 16 ] },
{ "chance": 50, "repeat": [ 80, 350 ], "item": "recycle_steel", "x": [ 9, 15 ], "y": [ 19, 20 ] },
{ "chance": 50, "repeat": [ 50, 180 ], "item": "recycle_aluminum", "x": [ 18, 20 ], "y": [ 15, 16 ] },
{ "chance": 50, "repeat": [ 50, 180 ], "item": "recycle_copper", "x": [ 18, 20 ], "y": [ 19, 20 ] }
],
"place_loot": [ { "item": "television", "x": 4, "y": 14, "chance": 100 }, { "item": "stepladder", "x": 8, "y": 13, "chance": 100 } ],
"rows": [
"__________ppppp________'",
"__________ppppp_________",
Expand Down Expand Up @@ -343,21 +316,48 @@
"+": "t_chaingate_c",
"-": "t_concrete_wall",
".": "t_concrete",
"4": "t_tree_pine",
"7": "t_tree",
"4": "t_region_tree_evergreen",
"7": "t_region_tree",
"D": "t_door_c",
"P": "t_concrete",
"R": "t_recycler",
"_": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
"'": "t_dirt",
"_": "t_region_groundcover_urban",
"'": "t_region_groundcover_urban",
"p": "t_pavement",
"s": "t_grass",
"s": "t_region_groundcover_urban",
"t": "t_thconc_floor",
"w": "t_window",
"{": "t_concrete",
"|": "t_chainfence",
"5": "t_gutter_downspout"
},
"furniture": {
"'": "f_street_light",
"#": "f_counter",
"&": "f_trashcan",
"P": "f_sign",
"c": "f_chair",
"d": "f_desk",
"s": "f_sign",
"{": "f_recycle_bin",
"S": "f_sink"
},
"toilets": { "T": { } },
"place_items": [
{ "chance": 15, "item": "office", "x": [ 4, 5 ], "y": 14 },
{ "chance": 30, "item": "trash", "x": 3, "y": 14 },
{ "chance": 20, "item": "tools_home", "x": 3, "y": [ 19, 20 ] },
{ "chance": 50, "repeat": [ 80, 280 ], "item": "recycle_plastic", "x": [ 15, 16 ], "y": [ 7, 12 ] },
{ "chance": 50, "repeat": [ 80, 280 ], "item": "recycle_glass", "x": [ 19, 20 ], "y": [ 7, 12 ] },
{ "chance": 50, "repeat": [ 80, 350 ], "item": "recycle_paper", "x": [ 3, 9 ], "y": [ 7, 8 ] },
{ "chance": 50, "repeat": [ 30, 150 ], "item": "recycle_electronic", "x": [ 3, 5 ], "y": [ 10, 11 ] },
{ "chance": 50, "repeat": [ 20, 120 ], "item": "recycle_battery", "x": [ 8, 9 ], "y": [ 10, 11 ] },
{ "chance": 50, "repeat": [ 80, 350 ], "item": "recycle_iron", "x": [ 9, 15 ], "y": [ 15, 16 ] },
{ "chance": 50, "repeat": [ 80, 350 ], "item": "recycle_steel", "x": [ 9, 15 ], "y": [ 19, 20 ] },
{ "chance": 50, "repeat": [ 50, 180 ], "item": "recycle_aluminum", "x": [ 18, 20 ], "y": [ 15, 16 ] },
{ "chance": 50, "repeat": [ 50, 180 ], "item": "recycle_copper", "x": [ 18, 20 ], "y": [ 19, 20 ] }
],
"place_loot": [ { "item": "television", "x": 4, "y": 14, "chance": 100 }, { "item": "stepladder", "x": 8, "y": 13, "chance": 100 } ],
"place_signs": [
{ "signage": "GLASS", "x": 18, "y": 12 },
{ "signage": "ALUMINUM", "x": 18, "y": 14 },
Expand All @@ -371,10 +371,7 @@
{ "signage": "<city> Recycling", "x": 9, "y": 4 },
{ "signage": "Drop off 8am to 8pm, weekdays.", "x": 15, "y": 4 }
]
},
"om_terrain": "recyclecenter_2",
"type": "mapgen",
"weight": 100
}
},
{
"type": "mapgen",
Expand Down

0 comments on commit 63206ad

Please sign in to comment.