Merge pull request #36537 from RarkGrames/Toolbox-qualities-fix

Toolbox qualities fix
CleverRaven · Dec 30, 2019 · c532fc4 · c532fc4
2 parents beef170 + b4eab76
commit c532fc4
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 3 deletions.
diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -16,7 +16,8 @@
       [ "hand_drill", 20 ],
       [ "nailgun", 100 ],
       [ "chisel", 10 ],
-      [ "toolbox", 15 ]
+      [ "toolbox", 12 ],
+      [ "toolbox_workshop", 3 ]
     ]
   },
   {
@@ -30,7 +31,8 @@
       [ "elec_jackhammer", 40 ],
       [ "metal_smoother", 90 ],
       [ "jackhammer", 40 ],
-      [ "toolbox", 25 ],
+      [ "toolbox", 20 ],
+      [ "toolbox_workshop", 5 ],
       [ "recharge_station", 10 ],
       [ "angular_grinder", 30 ]
     ]
@@ -193,7 +195,8 @@
       { "group": "tools_common", "prob": 100 },
       { "group": "tools_lighting", "prob": 50 },
       { "group": "tools_tailor", "prob": 50 },
-      [ "toolbox", 5 ]
+      [ "toolbox", 4 ],
+      [ "toolbox_workshop", 1 ]
     ]
   },
   {

diff --git a/data/json/items/tools.json b/data/json/items/tools.json
@@ -6335,6 +6335,38 @@
     "material": "steel",
     "symbol": ";",
     "color": "red",
+    "qualities": [
+      [ "CUT", 1 ],
+      [ "HAMMER", 3 ],
+      [ "SAW_M", 2 ],
+      [ "SAW_W", 2 ],
+      [ "AXE", 1 ],
+      [ "WRENCH", 2 ],
+      [ "SCREW", 1 ],
+      [ "PRY", 1 ],
+      [ "HAMMER_FINE", 1 ],
+      [ "SAW_M_FINE", 1 ],
+      [ "WRENCH_FINE", 1 ],
+      [ "SCREW_FINE", 1 ],
+      [ "BUTCHER", 11 ]
+    ],
+    "use_action": [ "HAMMER", "CROWBAR" ]
+  },
+  {
+    "id": "toolbox_workshop",
+    "type": "TOOL",
+    "name": "workshop toolbox",
+    "name_plural": "workshop toolboxes",
+    "description": "This is a stout metal box containing a complete tool kit suitable for most household maintenance and construction activities, as well as additional tools used in workshops for advanced fabrication jobs.",
+    "looks_like": "toolbox",
+    "weight": "3994 g",
+    "volume": "2500 ml",
+    "price": 14099,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": "steel",
+    "symbol": ";",
+    "color": "red",
     "qualities": [
       [ "CUT", 1 ],
       [ "HAMMER", 3 ],

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -3250,6 +3250,32 @@
       [ [ "hammer", 1 ] ]
     ]
   },
+  {
+    "type": "recipe",
+    "result": "toolbox_workshop",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "skills_required": [ "mechanics", 3 ],
+    "difficulty": 4,
+    "time": "4 m",
+    "reversible": true,
+    "autolearn": true,
+    "components": [
+      [ [ "sheet_metal_small", 5 ] ],
+      [ [ "nail", 11 ] ],
+      [ [ "wire", 1 ] ],
+      [ [ "pockknife", 1 ], [ "primitive_knife", 1 ], [ "copper_knife", 1 ] ],
+      [ [ "screwdriver_set", 1 ] ],
+      [ [ "hacksaw", 1 ] ],
+      [ [ "wrench", 1 ] ],
+      [ [ "saw", 1 ] ],
+      [ [ "hammer", 1 ] ],
+      [ [ "metal_file", 1 ] ],
+      [ [ "pin_reamer", 1 ] ],
+      [ [ "hand_vice", 1 ] ]
+    ]
+  },
   {
     "type": "recipe",
     "result": "vacutainer",