Workshop toolbox group and boxcutter knife (#42327)

CleverRaven · Jul 22, 2020 · 56ebb81 · 56ebb81
1 parent 3d3a9ef
commit 56ebb81
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -25,7 +25,7 @@
       [ "nailgun", 100 ],
       [ "chisel", 10 ],
       { "group": "tools_toolbox", "prob": 12 },
-      [ "toolbox_workshop", 3 ],
+      { "group": "tools_workshop", "prob": 3 },
       [ "sandpaper", 100 ]
     ]
   },
@@ -41,7 +41,7 @@
       [ "metal_smoother", 90 ],
       [ "jackhammer", 40 ],
       { "group": "tools_toolbox", "prob": 20 },
-      [ "toolbox_workshop", 5 ],
+      { "group": "tools_workshop", "prob": 5 },
       [ "recharge_station", 10 ],
       [ "angle_grinder", 30 ]
     ]
@@ -92,6 +92,29 @@
       [ "sandpaper", 65 ]
     ]
   },
+  {
+    "id": "tools_workshop",
+    "type": "item_group",
+    "//": "A typical toolbox filled with tools.",
+    "subtype": "collection",
+    "container-item": "toolbox_empty",
+    "items": [
+      [ "hammer", 80 ],
+      [ "screwdriver_set", 65 ],
+      [ "wrench", 75 ],
+      [ "funnel", 50 ],
+      [ "metal_file", 40 ],
+      [ "sandpaper", 65 ],
+      [ "hacksaw", 30 ],
+      [ "saw", 65 ],
+      [ "pin_reamer", 18 ],
+      [ "clamp", 30 ],
+      [ "boxcutter", 20 ],
+      [ "nailgun", 15 ],
+      [ "circsaw_off", 25 ],
+      [ "cordless_drill", 45 ]
+    ]
+  },
   {
     "id": "tools_general",
     "type": "item_group",
@@ -245,7 +268,7 @@
       { "group": "tools_lighting", "prob": 50 },
       { "group": "tools_tailor", "prob": 50 },
       { "group": "tools_toolbox", "prob": 4 },
-      [ "toolbox_workshop", 1 ]
+      { "group": "tools_workshop", "prob": 1 }
     ]
   },
   {

diff --git a/data/json/items/tool/knives.json b/data/json/items/tool/knives.json
@@ -93,6 +93,23 @@
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 11 ] ],
     "flags": [ "STAB", "SHEATH_KNIFE" ]
   },
+  {
+    "id": "boxcutter",
+    "type": "TOOL",
+    "name": { "str": "boxcutter knife", "str_pl": "boxcutter knives" },
+    "description": "This is a small knife, designed for opening boxes.  It could cause some damage, but it really should be used against inanimate objects.  It is too small to butcher corpses with.",
+    "weight": "23 g",
+    "volume": "20 ml",
+    "longest_side": "12 cm",
+    "price": 400,
+    "price_postapoc": 100,
+    "to_hit": -3,
+    "cutting": 3,
+    "material": [ "steel", "plastic" ],
+    "symbol": ";",
+    "color": "light_gray",
+    "qualities": [ [ "CUT", 1 ] ]
+  },
   {
     "type": "GENERIC",
     "id": "stone_chopper",