diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json index 4d5647beaa2e9..3db1812beaece 100644 --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -306,6 +306,7 @@ { "item": "bottle_opener", "prob": 75 }, { "item": "pockknife", "prob": 75 }, { "item": "cordless_drill", "prob": 70 }, + { "item": "corded_powerdrill", "prob": 20 }, { "item": "scissors", "prob": 65 }, { "item": "pliers", "prob": 65 }, { "item": "permanent_marker", "prob": 70, "charges-min": 50 }, diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index 95d9cd6976b20..2f6ee7f44efd8 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -23,7 +23,8 @@ "items": [ { "group": "tools_common", "prob": 100 }, { "item": "circsaw_off", "prob": 100, "charges": [ 0, 500 ] }, - { "item": "cordless_drill", "prob": 100, "charges": [ 0, 500 ] }, + { "item": "cordless_drill", "prob": 80, "charges": [ 0, 500 ] }, + { "item": "corded_powerdrill", "prob": 80 }, { "item": "reciprocating_saw", "prob": 80, "charges": [ 0, 500 ] }, { "item": "cordless_impact_wrench", "prob": 20, "charges": [ 0, 500 ] }, [ "hand_drill", 20 ], @@ -150,7 +151,8 @@ { "item": "circsaw_off", "prob": 25, "charges": [ 0, 500 ] }, { "item": "reciprocating_saw", "prob": 20, "charges": [ 0, 500 ] }, { "item": "cordless_impact_wrench", "prob": 10, "charges": [ 0, 500 ] }, - { "item": "cordless_drill", "prob": 45, "charges": [ 0, 500 ] } + { "item": "cordless_drill", "prob": 20, "charges": [ 0, 500 ] }, + { "item": "corded_powerdrill", "prob": 20 } ] }, { @@ -842,6 +844,8 @@ { "item": "elec_jackhammer", "prob": 50, "charges": [ 0, 1320 ] }, { "item": "reciprocating_saw", "prob": 50, "charges": [ 0, 500 ] }, { "item": "cordless_impact_wrench", "prob": 30, "charges": [ 0, 500 ] }, + { "item": "cordless_drill", "prob": 20, "charges": [ 0, 500 ] }, + { "item": "corded_powerdrill", "prob": 30 }, { "item": "circsaw_off", "prob": 10, "charges": [ 0, 500 ] }, { "item": "angle_grinder", "prob": 20, "charges": [ 0, 500 ] }, { "item": "masonrysaw_off", "prob": 50, "charges": [ 0, 450 ] }, diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index c96615d4d8847..cae579f4ca5a3 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -316,6 +316,28 @@ ], "melee_damage": { "bash": 3, "cut": 1 } }, + { + "id": "corded_powerdrill", + "type": "TOOL", + "name": { "str": "power drill" }, + "description": "A black power drill with a selection of bits. Uses a power cord, so it will have to be plugged into a power grid or vehicle to function.", + "weight": "2721 g", + "volume": "750 ml", + "longest_side": "22 cm", + "price": 2000, + "price_postapoc": 250, + "to_hit": -2, + "material": [ "plastic", "steel" ], + "symbol": ";", + "color": "yellow", + "ammo": [ "battery" ], + "qualities": [ [ "SCREW", 1 ] ], + "charged_qualities": [ [ "DRILL", 3 ] ], + "charges_per_use": 5, + "use_action": [ { "type": "link_up", "menu_text": "Plug in / Unplug", "ammo_scale": 0, "cable_length": 3, "charge_rate": "2200 W" } ], + "flags": [ "NONCONDUCTIVE", "FRAGILE_MELEE", "NO_UNLOAD", "NO_RELOAD", "WATER_BREAK", "ELECTRONIC" ], + "melee_damage": { "bash": 3, "cut": 1 } + }, { "id": "cordless_impact_wrench", "type": "TOOL", diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index 24ad2824e78ad..9580673ec715d 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -477,6 +477,7 @@ [ "cooking_oil", 3 ], [ "cooking_oil2", 3 ], [ "cordless_drill", 2 ], + [ "corded_powerdrill", 2 ], [ "cornmeal", 3 ], { "group": "cotton_ball_bag_used", "prob": 3 }, [ "crack", 3 ], diff --git a/data/json/recipes/ammo/components.json b/data/json/recipes/ammo/components.json index 97ed12b9c3ec9..ee6f47e385055 100644 --- a/data/json/recipes/ammo/components.json +++ b/data/json/recipes/ammo/components.json @@ -146,7 +146,7 @@ "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "manual_pistol", 5 ], [ "recipe_bullets", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "DRILL", "level": 2 } ], - "tools": [ [ [ "press", -1 ] ], [ [ "cordless_drill", 2 ] ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "cordless_drill", 2 ], [ "corded_powerdrill", 2 ] ] ], "components": [ [ [ "308_casing", 1 ], [ "3006_casing", 1 ] ] ] }, { @@ -162,7 +162,7 @@ "batch_time_factors": [ 80, 5 ], "book_learn": [ [ "manual_pistol", 5 ], [ "recipe_bullets", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "DRILL", "level": 2 } ], - "tools": [ [ [ "press", -1 ] ], [ [ "cordless_drill", 2 ] ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "cordless_drill", 2 ], [ "corded_powerdrill", 2 ] ] ], "components": [ [ [ "223_casing", 1 ] ] ] }, { diff --git a/data/json/requirements/toolsets.json b/data/json/requirements/toolsets.json index 2d6fdd196952d..e230254d10d73 100644 --- a/data/json/requirements/toolsets.json +++ b/data/json/requirements/toolsets.json @@ -246,7 +246,7 @@ "type": "requirement", "//": "Construction of chainmail items", "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "ANVIL", "level": 3 }, { "id": "WRENCH", "level": 1 } ], - "tools": [ [ [ "boltcutters", -1 ] ], [ [ "cordless_drill", 10 ], [ "drill_press_tool", 5 ] ] ] + "tools": [ [ [ "boltcutters", -1 ] ], [ [ "cordless_drill", 10 ], [ "corded_powerdrill", 10 ], [ "drill_press_tool", 5 ] ] ] }, { "id": "soldering_standard", @@ -259,7 +259,7 @@ "id": "drilling_standard", "type": "requirement", "//": "Drilling holes in various materials, including metal", - "tools": [ [ [ "cordless_drill", 2 ], [ "drill_press_tool", 1 ], [ "hand_drill", -1 ] ] ] + "tools": [ [ [ "cordless_drill", 2 ], [ "corded_powerdrill", 2 ], [ "drill_press_tool", 1 ], [ "hand_drill", -1 ] ] ] }, { "id": "anesthetic", @@ -331,7 +331,7 @@ [ "hammer_sledge", -1 ] ], [ [ "masonrysaw_off", 100 ], [ "electric_masonrysaw_off", 1320 ] ], - [ [ "cordless_drill", 200 ] ], + [ [ "cordless_drill", 200 ], [ "corded_powerdrill", 200 ] ], [ [ "angle_grinder", 200 ] ] ] }, diff --git a/data/json/uncraft/tools.json b/data/json/uncraft/tools.json index 8bba6186bda6a..6100be246a610 100644 --- a/data/json/uncraft/tools.json +++ b/data/json/uncraft/tools.json @@ -73,6 +73,23 @@ [ [ "scrap", 1 ] ] ] }, + { + "result": "corded_powerdrill", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "skill_used": "fabrication", + "difficulty": 1, + "time": "30 m", + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ + [ [ "antenna", 1 ] ], + [ [ "plastic_chunk", 4 ] ], + [ [ "motor_tiny", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 100 ] ], + [ [ "scrap", 1 ] ] + ] + }, { "result": "trimmer_off", "type": "uncraft", diff --git a/data/json/vehicleparts/modular_tools.json b/data/json/vehicleparts/modular_tools.json index 75d560374db13..2fbfdcf7fd367 100644 --- a/data/json/vehicleparts/modular_tools.json +++ b/data/json/vehicleparts/modular_tools.json @@ -107,6 +107,7 @@ "con_mix", "copper_pan", "cordless_drill", + "corded_powerdrill", "elec_hairtrimmer", "elec_shears", "electric_spinwheel", diff --git a/gfx/tile_config_template.json b/gfx/tile_config_template.json index 63854b1a17183..4d26bd5f83784 100644 --- a/gfx/tile_config_template.json +++ b/gfx/tile_config_template.json @@ -1585,6 +1585,7 @@ { "id": "jar_meat_pickled", "fg": -1, "bg": -1, "rotates": false, "multitile": false }, { "id": "jar_human_pickled", "fg": -1, "bg": -1, "rotates": false, "multitile": false }, { "id": "cordless_drill", "fg": -1, "bg": -1, "rotates": false, "multitile": false }, + { "id": "corded_powerdrill", "fg": -1, "bg": -1, "rotates": false, "multitile": false }, { "id": "vac_sealer", "fg": -1, "bg": -1, "rotates": false, "multitile": false }, { "id": "plastic_bag_vac", "fg": -1, "bg": -1, "rotates": false, "multitile": false }, { "id": "medical_gauze", "fg": -1, "bg": -1, "rotates": false, "multitile": false },