Add cordless drills to "power tools" itemgroup, create corded power drills

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 },

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 ] },

data/json/items/tool/workshop.json

@@ -316,6 +316,36 @@
     ],
     "melee_damage": { "bash": 3, "cut": 1 }
   },
+  {
+    "id": "corded_powerdrill",
+    "type": "TOOL",
+    "name": { "str": "power drill"  },
+    "description": "A power drill with a selection of bits, with a cord for power. ",
+    "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",

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 ],

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 ] ] ]
   },
   {

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 ] ]
     ]
   },

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",

data/json/vehicleparts/modular_tools.json

@@ -107,6 +107,7 @@
       "con_mix",
       "copper_pan",
       "cordless_drill",
+      "corded_powerdrill",
       "elec_hairtrimmer",
       "elec_shears",
       "electric_spinwheel",

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 },