Skip to content

Commit

Permalink
feat(content): picking up household trash cans as a container (#4718)
Browse files Browse the repository at this point in the history
* feat(content): picking up household trash cans as a container

* Update containers.json
  • Loading branch information
chaosvolt authored Jun 8, 2024
1 parent afd35a8 commit 66bb6ec
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 3 deletions.
6 changes: 4 additions & 2 deletions data/json/furniture_and_terrain/furniture-storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -721,18 +721,20 @@
"id": "f_trashcan",
"name": "trash can",
"symbol": "&",
"description": "One man's trash is another man's dinner.",
"description": "One man's trash is another man's dinner. Examine it to take down, if you need an improvised bucket.",
"color": "light_cyan",
"move_cost_mod": 1,
"required_str": 5,
"max_volume": "20 L",
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "SHORT" ],
"deployed_item": "trash_can_empty",
"examine_action": "deployed_furniture",
"bash": {
"str_min": 8,
"str_max": 30,
"sound": "smash!",
"sound_fail": "whump.",
"items": [ { "item": "plastic_chunk", "count": [ 1, 2 ] } ]
"items": [ { "item": "plastic_chunk", "count": [ 9, 18 ] } ]
}
},
{
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,7 @@
[ "canteen", 20 ],
[ "basket_laundry", 20 ],
[ "plastic_pot_flower", 35 ],
[ "trash_can_empty", 30 ],
[ "gloves_medical", 20 ],
[ "fitover_sunglasses", 20 ],
[ "goggles_swim", 20 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
"id": "dollar_kitchen",
"type": "item_group",
"items": [
[ "trash_can_empty", 10 ],
[ "cup_plastic", 20 ],
[ "bowl_plastic", 20 ],
[ "canteen", 10 ],
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/collections_domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
{ "item": "roller_blades", "prob": 20 },
{ "item": "duct_tape", "prob": 100 },
{ "item": "lawnmower", "prob": 25 },
{ "item": "trash_can_empty", "prob": 25 },
{ "item": "lawn_dart", "prob": 10 },
{ "item": "dehydrator", "prob": 15 },
{ "item": "jar_glass", "prob": 25, "count": [ 1, 12 ] },
Expand Down
3 changes: 2 additions & 1 deletion data/json/itemgroups/supplies.json
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,8 @@
[ "recharge_station", 10 ],
[ "tarp", 15 ],
[ "tempered_glass_sheet", 25 ],
[ "rigid_plastic_sheet", 30 ]
[ "rigid_plastic_sheet", 30 ],
[ "trash_can_empty", 25 ]
]
},
{
Expand Down
19 changes: 19 additions & 0 deletions data/json/items/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -1325,5 +1325,24 @@
"symbol": "0",
"contains": "200 L",
"color": "yellow"
},
{
"id": "trash_can_empty",
"type": "CONTAINER",
"category": "container",
"name": { "str": "plastic trash can" },
"description": "A small plastic wastebasket for offices and kitchens. Could be repurposed as an open-top container if you're desperate, or placed back down.",
"weight": "1 kg",
"volume": "20 L",
"price": "10 USD",
"price_postapoc": "10 cent",
"material": "plastic",
"symbol": ")",
"looks_like": "plastic_pot_flower",
"color": "white",
"contains": "20 L",
"watertight": true,
"qualities": [ [ "CONTAIN", 1 ] ],
"use_action": { "type": "deploy_furn", "furn_type": "f_trashcan" }
}
]
12 changes: 12 additions & 0 deletions data/json/recipes/other/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -588,5 +588,17 @@
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "cardboard", 90 ] ], [ [ "duct_tape", 100 ] ] ]
},
{
"type": "recipe",
"result": "trash_can_empty",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_CONTAINERS",
"skill_used": "fabrication",
"difficulty": 3,
"time": "45 m",
"autolearn": true,
"tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 40, "LIST" ] ] ],
"components": [ [ [ "plastic_chunk", 20 ] ] ]
}
]

0 comments on commit 66bb6ec

Please sign in to comment.