Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(content): Stuffed animals, wool pillows & mattresses #4496

Merged
merged 7 commits into from
Apr 19, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions data/json/construction.json
Original file line number Diff line number Diff line change
@@ -1976,7 +1976,7 @@
"required_skills": [ [ "fabrication", 4 ] ],
"time": "60 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
"components": [ [ [ "2x4", 12 ] ], [ [ "nail", 10 ] ], [ [ "mattress", 1 ], [ "down_mattress", 1 ] ] ],
"components": [ [ [ "2x4", 12 ] ], [ [ "nail", 10 ] ], [ [ "mattress", 1 ], [ "down_mattress", 1 ], [ "wool_mattress", 1 ] ] ],
"pre_special": "check_empty",
"post_furniture": "f_bed"
},
@@ -1992,7 +1992,7 @@
[ [ "2x4", 16 ], [ "wood_panel", 4 ] ],
[ [ "2x4", 14 ] ],
[ [ "nail", 30 ] ],
[ [ "mattress", 2 ], [ "down_mattress", 2 ] ]
[ [ "mattress", 2 ], [ "down_mattress", 2 ], [ "wool_mattress", 2 ] ]
],
"pre_special": "check_empty",
"post_furniture": "f_bunkbed"
@@ -2016,7 +2016,7 @@
"category": "FURN",
"required_skills": [ [ "fabrication", 0 ] ],
"time": "5 m",
"components": [ [ [ "mattress", 1 ], [ "down_mattress", 1 ] ] ],
"components": [ [ [ "mattress", 1 ], [ "down_mattress", 1 ], [ "wool_mattress", 1 ] ] ],
"pre_furniture": "f_bed_frame",
"dark_craftable": true,
"post_furniture": "f_bed"
@@ -3462,7 +3462,14 @@
"time": "15 m",
"pre_special": "check_empty",
"components": [
[ [ "pillow", 19 ], [ "down_pillow", 19 ], [ "mattress", 4 ] ],
[
[ "pillow", 19 ],
[ "down_pillow", 19 ],
[ "wool_pillow", 19 ],
[ "mattress", 4 ],
[ "down_mattress", 4 ],
[ "wool_mattress", 4 ]
],
[ [ "down_blanket", 3 ], [ "blanket", 3 ], [ "fur_blanket", 3 ] ]
],
"pre_terrain": "t_floor",
@@ -3477,7 +3484,7 @@
"time": "15 m",
"pre_special": "check_empty",
"components": [
[ [ "pillow", 4 ], [ "down_pillow", 4 ] ],
[ [ "pillow", 4 ], [ "down_pillow", 4 ], [ "wool_pillow", 4 ] ],
[ [ "down_blanket", 2 ], [ "blanket", 2 ], [ "fur_blanket", 2 ] ],
[ [ "box_large", 1 ] ],
[ [ "plastic_sheet", 1 ] ],
24 changes: 24 additions & 0 deletions data/json/furniture_and_terrain/furniture-sleep.json
Original file line number Diff line number Diff line change
@@ -225,5 +225,29 @@
],
"ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" }
}
},
{
"type": "furniture",
"id": "f_wool_mattress",
"name": "wool mattress",
"description": "A comfortable wool mattress has been tossed on the floor for sleeping here. It's not quite as comfy as a real bed, but it's pretty close.",
"symbol": "0",
"color": "magenta",
"move_cost_mod": 3,
"coverage": 20,
"comfort": 4,
"floor_bedding_warmth": 800,
"required_str": 7,
"deployed_item": "wool_mattress",
"examine_action": "deployed_furniture",
"flags": [ "TRANSPARENT", "SHORT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "MOUNTABLE" ],
"deconstruct": { "items": [ { "item": "wool_mattress", "count": 1 } ] },
"bash": {
"str_min": 8,
"str_max": 30,
"sound": "rrrrip!",
"sound_fail": "whump.",
"items": [ { "item": "felt_patch", "count": [ 40, 55 ] }, { "item": "yarn", "count": [ 500, 650 ] } ]
}
}
]
2 changes: 2 additions & 0 deletions data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
@@ -249,6 +249,7 @@
[ "down_blanket", 10 ],
[ "pillow", 50 ],
[ "down_pillow", 15 ],
[ "wool_pillow", 15 ],
[ "smoxygen_tank", 10 ],
[ "antiparasitic", 3 ],
[ "diazepam", 3 ],
@@ -2273,6 +2274,7 @@
[ "down_blanket", 10 ],
[ "pillow", 20 ],
[ "down_pillow", 15 ],
[ "wool_pillow", 15 ],
[ "emer_blanket", 20 ],
[ "flyer", 10 ],
[ "gasoline_lantern", 5 ],
1 change: 1 addition & 0 deletions data/json/itemgroups/furniture.json
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@
{ "item": "down_blanket", "prob": 13 },
{ "item": "pillow", "prob": 30 },
{ "item": "down_pillow", "prob": 15 },
{ "item": "wool_pillow", "prob": 15 },
{ "item": "electric_blanket", "prob": 4 }
]
},
11 changes: 10 additions & 1 deletion data/json/items/generic.json
Original file line number Diff line number Diff line change
@@ -2376,7 +2376,7 @@
"symbol": "o",
"color": "brown",
"name": { "str": "teddy bear" },
"description": "A mass-produced plush teddy bear. It is wearing a little red tshirt but no pants.",
"description": "A cuddly plush teddy bear. It is wearing a little red tshirt but no pants.",
"price": "2 USD",
"price_postapoc": "10 cent",
"material": [ "cotton" ],
@@ -3152,5 +3152,14 @@
"name": { "str": "broken longrange milspec turret" },
"weight": "50 kg",
"copy-from": "broken_turret"
},
{
"type": "GENERIC",
"id": "wool_pillow",
"copy-from": "pillow",
"looks_like": "pillow",
"name": { "str": "wool pillow" },
"description": "A pillow to rest your head on when sleeping. This one is made entirely of fluffy wool!",
"material": [ "wool" ]
}
]
9 changes: 9 additions & 0 deletions data/json/items/resources/misc.json
Original file line number Diff line number Diff line change
@@ -217,5 +217,14 @@
"to_hit": -5,
"flags": [ "TRADER_AVOID" ],
"bashing": 15
},
{
"type": "GENERIC",
"id": "wool_mattress",
"copy-from": "down_mattress",
"looks_like": "down_mattress",
"name": { "str": "wool mattress", "str_pl": "wool mattresses" },
"description": "A mattress made of wool. It is quite soft and comfortable.",
"material": [ "wool" ]
}
]
3 changes: 2 additions & 1 deletion data/json/mapgen/mall/mall_ground.json
Original file line number Diff line number Diff line change
@@ -1351,7 +1351,8 @@
{ "item": "microwave", "x": 4, "y": 10, "chance": 100 },
{ "item": "toaster", "x": 4, "y": 11, "chance": 100 },
{ "item": "mattress", "x": [ 13, 15 ], "y": 20, "chance": 90, "repeat": [ 2, 6 ] },
{ "item": "down_mattress", "x": [ 13, 15 ], "y": 22, "chance": 70, "repeat": [ 2, 6 ] }
{ "item": "down_mattress", "x": [ 13, 15 ], "y": 22, "chance": 70, "repeat": [ 2, 6 ] },
{ "item": "wool_mattress", "x": [ 13, 15 ], "y": 22, "chance": 70, "repeat": [ 2, 6 ] }
],
"place_vendingmachines": [ { "item_group": "vending_drink", "x": 4, "y": 12 }, { "item_group": "vending_food", "x": 4, "y": 13 } ],
"items": {
40 changes: 39 additions & 1 deletion data/json/recipes/other/other.json
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@
"difficulty": 2,
"autolearn": true,
"using": [ [ "sewing_standard", 12 ], [ "drawing_tool", 20 ] ],
"components": [ [ [ "sheet", 1 ] ], [ [ "cotton_ball", 20 ] ] ]
"components": [ [ [ "sheet", 1 ] ], [ [ "cotton_ball", 20 ], [ "yarn", 330 ] ] ]
},
{
"type": "recipe",
@@ -533,5 +533,43 @@
"autolearn": true,
"reversible": true,
"components": [ [ [ "withered", 12 ], [ "straw_pile", 12 ] ] ]
},
{
"type": "recipe",
"result": "teddy_bear",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_OTHER",
"skill_used": "tailor",
"difficulty": 3,
"time": "15 m",
"reversible": true,
"autolearn": true,
"using": [ [ "sewing_standard", 12 ] ],
"components": [ [ [ "rag", 4 ] ], [ [ "cotton_ball", 8 ], [ "yarn", 130 ] ] ]
},
{
"type": "recipe",
"result": "wool_mattress",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_OTHER",
"skill_used": "tailor",
"difficulty": 6,
"time": "240 m",
"reversible": true,
"autolearn": true,
"using": [ [ "sewing_standard", 12 ] ],
"components": [ [ [ "felt_patch", 60 ] ], [ [ "yarn", 650 ] ] ]
},
{
"type": "recipe",
"result": "wool_pillow",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_OTHER",
"skill_used": "tailor",
"time": "10 m",
"reversible": true,
"autolearn": true,
"using": [ [ "sewing_standard", 12 ] ],
"components": [ [ [ "felt_patch", 4 ] ], [ [ "yarn", 130 ] ] ]
}
]
9 changes: 8 additions & 1 deletion data/json/uncraft/generic.json
Original file line number Diff line number Diff line change
@@ -1690,7 +1690,7 @@
"type": "uncraft",
"time": "6 m",
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "yarn", 50 ] ] ]
"components": [ [ [ "yarn", 80 ] ] ]
},
{
"result": "file",
@@ -4483,5 +4483,12 @@
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "plastic_scrap", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "wool_pillow",
"type": "uncraft",
"time": "1 m",
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "felt_patch", 4 ] ], [ [ "yarn", 130 ] ] ]
}
]
Loading