diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json index 7a015630e9f62..85ef1f8350ce4 100644 --- a/data/json/itemgroups/activities_hobbies.json +++ b/data/json/itemgroups/activities_hobbies.json @@ -85,6 +85,7 @@ [ "knee_pads", 40 ], [ "roller_blades", 20 ], [ "rollerskates", 10 ], + [ "wheel_skate", 50 ], [ "manual_throw", 12 ], { "item": "protein_powder", diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json index c6f2b617eb2f5..2abfedeef2956 100644 --- a/data/json/items/vehicle/wheel.json +++ b/data/json/items/vehicle/wheel.json @@ -289,6 +289,24 @@ "diameter": 10, "width": 3 }, + { + "id": "wheel_skate", + "type": "WHEEL", + "category": "veh_parts", + "name": { "str": "skate wheel" }, + "description": "A very small plastic wheel with a punk attitude. This wheel was made for skating.", + "weight": "200 g", + "volume": "200 ml", + "price": 1400, + "price_postapoc": 10, + "bashing": 1, + "to_hit": -2, + "material": [ "steel", "plastic" ], + "symbol": "]", + "color": "dark_gray", + "diameter": 3, + "width": 1 + }, { "id": "wheel_tricycle", "category": "veh_parts", diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index dc008d5acaa43..f715c2c8ea8ae 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -555,5 +555,39 @@ "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], "using": [ [ "chainmail_standard", 2 ] ], "components": [ [ [ "link_sheet", 2 ] ], [ [ "chain_link", 50 ] ], [ [ "wire", 1 ] ], [ [ "rag", 4 ] ] ] + }, + { + "result": "roller_blades", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_FEET", + "skill_used": "fabrication", + "skills_required": [ "tailor", 2 ], + "difficulty": 5, + "time": "3 h", + "book_learn": [ [ "textbook_tailor", 5 ], [ "textbook_fabrication", 5 ] ], + "using": [ [ "blacksmithing_standard", 6 ] ], + "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ], [ [ "swage", -1 ] ] ], + "components": [ + [ [ "pipe", 1 ] ], + [ [ "wheel_skate", 6 ] ], + [ [ "plastic_chunk", 8 ] ], + [ [ "rag", 8 ] ], + [ [ "scrap", 10 ] ], + [ [ "bearing", 6 ] ] + ] + }, + { + "result": "rollerskates", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_FEET", + "skill_used": "fabrication", + "difficulty": 5, + "time": "3 h", + "book_learn": [ [ "textbook_tailor", 5 ], [ "textbook_fabrication", 5 ] ], + "using": [ [ "blacksmithing_standard", 6 ] ], + "tools": [ [ [ "swage", -1 ] ] ], + "components": [ [ [ "wheel_skate", 8 ] ], [ [ "boots", 1 ] ], [ [ "pipe", 1 ] ], [ [ "scrap", 12 ] ], [ [ "bearing", 8 ] ] ] } ] diff --git a/data/json/uncraft/armor/boots.json b/data/json/uncraft/armor/boots.json new file mode 100644 index 0000000000000..55a8efa39e7aa --- /dev/null +++ b/data/json/uncraft/armor/boots.json @@ -0,0 +1,20 @@ +[ + { + "result": "roller_blades", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 2, + "time": "600 s", + "qualities": [ { "id": "PRY", "level": 1 } ], + "components": [ [ [ "wheel_skate", 6 ] ], [ [ "rag", 6 ] ], [ [ "plastic_chunk", 6 ] ], [ [ "scrap", 18 ] ], [ [ "bearing", 6 ] ] ] + }, + { + "result": "rollerskates", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 2, + "time": "600 s", + "qualities": [ { "id": "PRY", "level": 1 } ], + "components": [ [ [ "wheel_skate", 8 ] ], [ [ "scrap_leather", 6 ] ], [ [ "scrap", 20 ] ], [ [ "bearing", 8 ] ] ] + } +]