Skip to content

Commit

Permalink
Increased recycle center mundane loot tenfold (#37388)
Browse files Browse the repository at this point in the history 
* Buffed mundane item weights

* Increased loot amount tenfold

* Increased recycle bin storage capacity

* Update data/json/itemgroups/locations.json

Co-Authored-By: I-am-Erk <[email protected]>

* Added some more items and fixed wrong ones

Co-authored-by: I-am-Erk <[email protected]>
  • Loading branch information
@RarkGrames @I-am-Erk
RarkGrames and I-am-Erk committed Jan 26, 2020
1 parent 0ef18c7 commit 94515f5
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 85 deletions.
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/furniture-storage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@
"move_cost_mod": -1,
"coverage": 40,
"required_str": 5,
"max_volume": "20 L",
"max_volume": "200 L",
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "SHORT" ],
"bash": {
"str_min": 8,
Expand Down
146 changes: 89 additions & 57 deletions data/json/itemgroups/locations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,19 +588,19 @@
[ "trailmap", 25 ],
[ "modern_tanner", 20 ],
[ "pocket_survival", 20 ],
[ "flyer", 40 ],
{ "item": "paper", "prob": 50, "charges-min": 1, "charges-max": 15 },
[ "wrapper", 35 ],
[ "phonebook", 55 ],
[ "box_small", 55 ],
[ "box_medium", 35 ],
[ "box_large", 15 ],
[ "one_year_old_newspaper", 45 ],
[ "months_old_newspaper", 50 ],
[ "weeks_old_newspaper", 50 ],
[ "one_year_old_newspaper", 45 ],
[ "years_old_newspaper", 40 ],
[ "many_years_old_newspaper", 40 ]
[ "flyer", 120 ],
{ "item": "paper", "prob": 500, "charges-min": 1 },
[ "wrapper", 150 ],
[ "phonebook", 110 ],
[ "box_small", 400 ],
[ "box_medium", 400 ],
[ "box_large", 200 ],
[ "one_year_old_newspaper", 200 ],
[ "months_old_newspaper", 250 ],
[ "weeks_old_newspaper", 250 ],
[ "one_year_old_newspaper", 200 ],
[ "years_old_newspaper", 200 ],
[ "many_years_old_newspaper", 200 ]
]
},
{
Expand Down Expand Up @@ -634,7 +634,14 @@
[ "e_scrap", 55 ],
[ "amplifier", 25 ],
[ "smart_lamp", 5 ],
[ "reading_light", 10 ]
[ "reading_light", 10 ],
[ "carver_off", 5 ],
[ "coffeemaker", 5 ],
[ "dehydrator", 5 ],
[ "food_processor", 5 ],
[ "hotplate", 5 ],
[ "multi_cooker", 5 ],
[ "vac_sealer", 5 ]
]
},
{
Expand All @@ -657,15 +664,18 @@
[ "gloves_medical", 20 ],
[ "fitover_sunglasses", 20 ],
[ "goggles_swim", 20 ],
[ "bag_plastic", 50 ],
[ "plastic_shopping_bag", 60 ],
[ "jug_plastic", 40 ],
[ "bottle_plastic", 45 ],
[ "bottle_plastic_small", 45 ],
[ "cup_plastic", 30 ],
[ "bowl_plastic", 30 ],
[ "plastic_chunk", 50 ],
[ "bag_body_bag", 10 ]
[ "bag_plastic", 150 ],
[ "plastic_shopping_bag", 200 ],
[ "jug_plastic", 120 ],
[ "jerrycan", 15 ],
[ "bottle_plastic", 150 ],
[ "bottle_plastic_small", 150 ],
[ "cup_plastic", 100 ],
[ "bowl_plastic", 100 ],
[ "plastic_chunk", 150 ],
[ "plastic_plate", 50 ],
[ "tumbler_plastic", 50 ],
[ "plastic_bowl_kids", 25 ]
]
},
{
Expand All @@ -678,18 +688,18 @@
[ "glasses_eye", 20 ],
{ "item": "marble", "prob": 20, "charges-min": 1, "charges-max": 3 },
[ "fish_bowl", 15 ],
[ "jar_3l_glass", 40 ],
[ "jar_3l_glass", 120 ],
[ "magnifying_glass", 20 ],
[ "mirror", 30 ],
{ "item": "glass_shard", "prob": 65, "count": [ 1, 8 ] },
{ "item": "glass_shard", "prob": 650, "count": [ 1, 8 ] },
[ "crackpipe", 5 ],
[ "glass", 35 ],
[ "glass_bowl", 30 ],
[ "glass_plate", 30 ],
[ "bottle_glass", 50 ],
[ "glass", 80 ],
[ "glass_bowl", 80 ],
[ "glass_plate", 80 ],
[ "bottle_glass", 150 ],
[ "pipe_glass", 10 ],
[ "jar_glass", 40 ],
[ "flask_glass", 20 ]
[ "jar_glass", 120 ],
[ "flask_glass", 60 ]
]
},
{
Expand All @@ -699,19 +709,22 @@
[ "teleumbrella", 15 ],
[ "cane", 30 ],
[ "toaster", 30 ],
[ "stethoscope", 20 ],
[ "stethoscope", 2 ],
{ "item": "spray_can", "prob": 45, "charges-min": 1, "charges-max": 3 },
[ "flask_hip", 25 ],
{ "item": "aluminum_foil", "prob": 40, "charges-min": 1, "charges-max": 10 },
[ "golf_club", 30 ],
[ "canister_empty", 45 ],
[ "golf_club", 3 ],
[ "antenna", 30 ],
[ "bat_metal", 20 ],
[ "can_drink", 65 ],
[ "can_drink_unsealed", 65 ],
[ "bat_metal", 2 ],
[ "can_drink", 130 ],
[ "can_drink_unsealed", 130 ],
[ "keg", 15 ],
[ "tongs", 30 ],
[ "material_aluminium_ingot", 25 ]
[ "material_aluminium_ingot", 25 ],
[ "xlframe", 10 ],
[ "survival_kit_box", 1 ],
[ "wearable_light", 5 ],
[ "rebreather", 1 ],
[ "small_scuba_tank", 1 ],
[ "pilot_light", 30 ]
]
},
{
Expand All @@ -721,9 +734,17 @@
[ "cu_pipe", 45 ],
{ "item": "cable", "prob": 50, "charges-min": 1, "charges-max": 20 },
[ "pot_copper", 30 ],
[ "pot_makeshift_copper", 15 ],
[ "copper_pan", 15 ],
{ "item": "copper", "prob": 40, "charges-min": 1, "charges-max": 20 },
[ "copper_ear", 25 ],
[ "copper_bracelet", 25 ]
[ "copper_bracelet", 25 ],
[ "copper_necklace", 25 ],
[ "copper_ring", 25 ],
[ "copper_hairpin", 25 ],
[ "copper_locket", 25 ],
[ "jumper_cable", 10 ],
[ "jumper_cable_heavy", 10 ]
]
},
{
Expand All @@ -734,23 +755,25 @@
{ "item": "oil_lamp", "prob": 20, "charges-min": 0, "charges-max": 3 },
[ "steam_triple_small", 1 ],
[ "steam_triple_medium", 1 ],
[ "waffleiron", 20 ],
[ "spring", 45 ],
[ "waffleiron", 60 ],
[ "spring", 150 ],
{ "item": "rebar_rail", "prob": 45, "charges-min": 1, "charges-max": 50 },
[ "pastaextruder", 25 ],
{ "item": "nail", "prob": 65, "charges-min": 1, "charges-max": 15 },
[ "well_pump", 15 ],
[ "pastaextruder", 75 ],
{ "item": "nail", "prob": 300, "charges-min": 1, "charges-max": 15 },
[ "well_pump", 50 ],
[ "manhole_cover", 20 ],
[ "hairpin", 40 ],
[ "pan", 30 ],
[ "cow_bell", 20 ]
[ "hairpin", 120 ],
[ "pan", 90 ],
[ "cow_bell", 20 ],
[ "flask_hip", 25 ],
[ "iron_pot", 20 ]
]
},
{
"id": "recycle_battery",
"type": "item_group",
"items": [
{ "group": "ammo_any_batteries", "prob": 70 },
{ "group": "ammo_any_batteries", "prob": 200 },
[ "storage_battery", 25 ],
[ "medium_storage_battery", 35 ],
[ "small_storage_battery", 45 ],
Expand Down Expand Up @@ -779,26 +802,35 @@
[ "pipe", 40 ],
[ "muffler", 30 ],
[ "pot", 30 ],
[ "pot_canning", 10 ],
[ "stock_pot", 10 ],
[ "steel_pan", 10 ],
[ "teapot", 25 ],
[ "kettle", 25 ],
[ "fishing_hook_basic", 35 ],
[ "spike", 30 ],
[ "wire_barbed", 25 ],
[ "wire", 40 ],
[ "sheet_metal", 25 ],
[ "sheet_metal_small", 40 ],
[ "frame", 20 ],
[ "basket", 25 ],
[ "wrench", 30 ],
[ "shovel", 30 ],
[ "claw_bar", 6 ],
[ "crowbar", 30 ],
[ "crucible", 25 ],
[ "beartrap", 15 ],
[ "wrench", 10 ],
[ "shovel", 10 ],
[ "claw_bar", 2 ],
[ "crowbar", 10 ],
[ "crucible", 3 ],
[ "beartrap", 5 ],
[ "blade", 35 ],
[ "spoon", 35 ],
[ "fork", 35 ],
[ "knife_butter", 35 ],
[ "knife_steak", 35 ],
[ "tourist_table", 10 ]
[ "tourist_table", 10 ],
[ "canister_empty", 45 ],
[ "tongs", 10 ],
[ "pressure_cooker", 10 ],
[ "sieve_steel", 10 ]
]
},
{
Expand Down
54 changes: 27 additions & 27 deletions data/json/mapgen/recycle_center.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
},
"toilets": { "T": { } },
"place_items": [
{ "chance": 50, "repeat": [ 12, 22 ], "item": "recycle_iron", "x": [ 10, 14 ], "y": [ 15, 16 ] },
{ "chance": 50, "repeat": [ 5, 12 ], "item": "recycle_electronic", "x": [ 18, 19 ], "y": [ 12, 14 ] },
{ "chance": 50, "repeat": [ 16, 40 ], "item": "recycle_paper", "x": [ 4, 5 ], "y": [ 11, 19 ] },
{ "chance": 50, "repeat": [ 8, 18 ], "item": "recycle_copper", "x": [ 10, 14 ], "y": [ 12, 13 ] },
{ "chance": 50, "repeat": [ 3, 10 ], "item": "recycle_battery", "x": [ 18, 19 ], "y": [ 17, 19 ] },
{ "chance": 50, "repeat": [ 8, 18 ], "item": "recycle_glass", "x": [ 18, 19 ], "y": [ 7, 9 ] },
{ "chance": 50, "repeat": [ 15, 25 ], "item": "recycle_steel", "x": [ 10, 14 ], "y": [ 18, 19 ] },
{ "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": [ 8, 18 ], "item": "recycle_aluminum", "x": [ 10, 14 ], "y": [ 9, 10 ] },
{ "chance": 50, "repeat": [ 18, 35 ], "item": "recycle_plastic", "x": [ 7, 8 ], "y": [ 11, 19 ] }
{ "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..............",
Expand Down Expand Up @@ -153,19 +153,19 @@
"R": "f_sink"
},
"place_items": [
{ "chance": 50, "repeat": [ 2, 6 ], "item": "recycle_copper", "x": [ 8, 9 ], "y": 19 },
{ "chance": 50, "repeat": [ 8, 22 ], "item": "recycle_plastic", "x": [ 4, 5 ], "y": [ 6, 11 ] },
{ "chance": 50, "repeat": [ 8, 22 ], "item": "recycle_iron", "x": [ 8, 9 ], "y": [ 6, 11 ] },
{ "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": [ 10, 35 ], "item": "recycle_paper", "x": [ 18, 19 ], "y": [ 9, 19 ] },
{ "chance": 50, "repeat": [ 2, 12 ], "item": "recycle_battery", "x": [ 13, 15 ], "y": [ 18, 19 ] },
{ "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": [ 8, 25 ], "item": "recycle_steel", "x": [ 4, 5 ], "y": [ 14, 19 ] },
{ "chance": 50, "repeat": [ 2, 10 ], "item": "recycle_aluminum", "x": [ 8, 9 ], "y": [ 14, 15 ] },
{ "chance": 50, "repeat": [ 2, 12 ], "item": "recycle_electronic", "x": [ 13, 15 ], "y": [ 14, 15 ] },
{ "chance": 50, "repeat": [ 2, 15 ], "item": "recycle_glass", "x": [ 13, 15 ], "y": [ 10, 11 ] }
{ "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": [
Expand Down Expand Up @@ -297,15 +297,15 @@
{ "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": [ 8, 28 ], "item": "recycle_plastic", "x": [ 15, 16 ], "y": [ 7, 12 ] },
{ "chance": 50, "repeat": [ 8, 28 ], "item": "recycle_glass", "x": [ 19, 20 ], "y": [ 7, 12 ] },
{ "chance": 50, "repeat": [ 8, 35 ], "item": "recycle_paper", "x": [ 3, 9 ], "y": [ 7, 8 ] },
{ "chance": 50, "repeat": [ 3, 15 ], "item": "recycle_electronic", "x": [ 3, 5 ], "y": [ 10, 11 ] },
{ "chance": 50, "repeat": [ 2, 12 ], "item": "recycle_battery", "x": [ 8, 9 ], "y": [ 10, 11 ] },
{ "chance": 50, "repeat": [ 8, 35 ], "item": "recycle_iron", "x": [ 9, 15 ], "y": [ 15, 16 ] },
{ "chance": 50, "repeat": [ 8, 35 ], "item": "recycle_steel", "x": [ 9, 15 ], "y": [ 19, 20 ] },
{ "chance": 50, "repeat": [ 5, 18 ], "item": "recycle_aluminum", "x": [ 18, 20 ], "y": [ 15, 16 ] },
{ "chance": 50, "repeat": [ 5, 18 ], "item": "recycle_copper", "x": [ 18, 20 ], "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": [
Expand Down

0 comments on commit 94515f5

Please sign in to comment.