diff --git a/data/json/construction.json b/data/json/construction.json index cc2852d3f2b9e..434db9cde2c30 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -3199,6 +3199,18 @@ "post_special": "done_appliance", "activity_level": "BRISK_EXERCISE" }, + { + "type": "construction", + "id": "app_chain_hoist", + "group": "place_chain_hoist", + "category": "APPLIANCE", + "required_skills": [ [ "fabrication", 3 ] ], + "time": "5 m", + "qualities": [ [ { "id": "WRENCH", "level": 1 } ], [ { "id": "DRILL", "level": 2 } ], [ { "id": "SCREW", "level": 1 } ] ], + "components": [ [ [ "chain_hoist", 1 ] ] ], + "pre_special": "check_support", + "post_special": "done_appliance" + }, { "type": "construction", "id": "app_stereo", diff --git a/data/json/construction_group.json b/data/json/construction_group.json index 25b3d5586ec8b..7cbd9e44021f0 100644 --- a/data/json/construction_group.json +++ b/data/json/construction_group.json @@ -1329,6 +1329,11 @@ "id": "place_anvil", "name": "Place Anvil" }, + { + "type": "construction_group", + "id": "place_chain_hoist", + "name": "Place Chain Hoist" + }, { "type": "construction_group", "id": "place_forge", diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json index fe2f9d46df79c..fcfd7b412e2e3 100644 --- a/data/json/furniture_and_terrain/appliances.json +++ b/data/json/furniture_and_terrain/appliances.json @@ -235,6 +235,31 @@ "item": "kiln", "copy-from": "veh_kiln" }, + { + "type": "vehicle_part", + "id": "ap_chain_hoist", + "name": { "str": "chain hoist" }, + "looks_like": "f_machinery_light", + "symbol": "7", + "color": "yellow_red", + "categories": [ "utility" ], + "location": "center", + "description": "Manual lifting equipment featuring a chain and hook. It could be used to lift heavy loads up to 1.5 metric tons.", + "broken_color": "yellow_red", + "broken_symbol": "x", + "damage_modifier": 10, + "damage_reduction": { "all": 30 }, + "durability": 50, + "breaks_into": [ { "item": "pipe", "count": [ 2, 20 ] }, { "item": "scrap", "count": [ 2, 12 ] } ], + "qualities": [ [ "LIFT", 3 ] ], + "requirements": { + "install": { "skills": [ [ "mechanics", 5 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, + "removal": { "skills": [ [ "mechanics", 3 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] } + }, + "item": "chain_hoist", + "flags": [ "APPLIANCE" ] + }, { "type": "vehicle_part", "id": "ap_drill_press", diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index 6d6c01ead3af7..be4b2594b848f 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/data/json/furniture_and_terrain/furniture-appliances.json @@ -82,6 +82,39 @@ ] } }, + { + "type": "furniture", + "id": "f_chain_hoist", + "name": "chain hoist", + "looks_like": "f_machinery_light", + "description": "Manual lifting equipment featuring a chain and hook. It could be used to lift heavy loads up to 1.5 metric tons when converted into an appliance.", + "symbol": "7", + "color": "yellow_red", + "move_cost_mod": -1, + "coverage": 65, + "required_str": -1, + "examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "chain_hoist" }, + "deconstruct": { + "items": [ + { "item": "pipe", "count": [ 18, 20 ] }, + { "item": "chain", "prob": 80 }, + { "item": "grip_hook", "count": [ 1, 2 ] }, + { "item": "steel_chunk", "count": [ 1, 4 ] } + ] + }, + "bash": { + "str_min": 16, + "str_max": 80, + "sound": "clang!", + "sound_fail": "ting.", + "items": [ + { "item": "pipe", "count": 2, "prob": 80 }, + { "item": "chain", "prob": 40 }, + { "item": "scrap", "count": [ 3, 8 ] }, + { "item": "steel_chunk", "count": [ 1, 2 ] } + ] + } + }, { "type": "furniture", "id": "f_dishwasher", diff --git a/data/json/items/vehicle/engineering.json b/data/json/items/vehicle/engineering.json index aa1bf7ac2aa83..95891bbe754fd 100644 --- a/data/json/items/vehicle/engineering.json +++ b/data/json/items/vehicle/engineering.json @@ -1,4 +1,18 @@ [ + { + "id": "chain_hoist", + "type": "GENERIC", + "category": "veh_parts", + "name": { "str": "chain hoist" }, + "description": "Manual lifting equipment featuring a chain and hook. It could be used to lift heavy loads up to 1.5 metric tons.", + "price": 13400, + "price_postapoc": 2000, + "weight": "14600 g", + "volume": "10500 ml", + "material": [ "steel" ], + "symbol": "&", + "color": "dark_gray" + }, { "id": "cantilever_medium", "type": "GENERIC", diff --git a/data/json/mapgen/garage.json b/data/json/mapgen/garage.json index 3c18dfcb649f8..ea14e7d89aadb 100644 --- a/data/json/mapgen/garage.json +++ b/data/json/mapgen/garage.json @@ -20,7 +20,7 @@ " |c..M#MM#M....M#MM#M.|,", " |c..M#MM#M....M#MM#M.|,", " |K..MMMMMMMMMMMMMMMM.|,", - " |m...................|,", + " |m..................á|,", " |---l...........HHHHH|,", " |ts|c...........HLLLL|,", " |-+|p...........Hbbbb|,", @@ -56,6 +56,7 @@ }, "furniture": { "6": "f_console_broken", + "á": "f_chain_hoist", "A": "f_air_conditioner", "L": "f_locker", "b": "f_bench", @@ -263,7 +264,7 @@ " |..MMMMMM..|-+-|f6ddd|X", " |m.........|&.s|-----|X", " |---....---|---|LLLLL|X", - " |..............|bbbbb|X", + " |á.............|bbbbb|X", " |WWWW..WWWW|...+.....|X", " |c........c|-------+-|X", " |c.xx..xx.p|xx.+T|<..OX", @@ -298,6 +299,7 @@ }, "toilets": { "&": { } }, "furniture": { + "á": "f_chain_hoist", "6": "f_console_broken", "A": "f_air_conditioner", "L": "f_locker", diff --git a/data/json/recipes/other/vehicle.json b/data/json/recipes/other/vehicle.json index 52705ccd6b4c6..b4475df3e4e1b 100644 --- a/data/json/recipes/other/vehicle.json +++ b/data/json/recipes/other/vehicle.json @@ -1,4 +1,19 @@ [ + { + "result": "chain_hoist", + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_VEHICLE", + "skill_used": "mechanics", + "skills_required": [ "fabrication", 3 ], + "difficulty": 5, + "time": "360 m", + "book_learn": [ [ "textbook_fabrication", 6 ], [ "textbook_mechanics", 5 ] ], + "using": [ [ "welding_standard", 5 ], [ "steel_standard", 1 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ [ [ "pipe", 20 ] ], [ [ "chain", 1 ] ], [ [ "grip_hook", 2 ] ] ] + }, { "result": "cantilever_medium", "type": "recipe",