Adding Kevlar Shears (#53366)

* Adding Kevlar Shears This adds kevlar shears to the game, as well as putting them in appropriate spawn groups and giving them a crafting recipe. This also updates the tailoring requirements for kevlar to include cutting 2, which is the shears. * Update data/json/itemgroups/Locations_MapExtras/mansion.json Updating with I-am-Erk's suggestions Co-authored-by: I-am-Erk <[email protected]> * Update data/json/itemgroups/SUS/clothes_store.json Updating with I-am-Erk's suggestions Co-authored-by: I-am-Erk <[email protected]> * Update data/json/itemgroups/SUS/domestic.json Updating with I-am-Erk's suggestions Co-authored-by: I-am-Erk <[email protected]> * Update data/json/itemgroups/tools.json Updating with I-am-Erk's suggestions Co-authored-by: I-am-Erk <[email protected]> * Update data/json/items/tool/tailoring.json Updating with I-am-Erk's suggestions Co-authored-by: I-am-Erk <[email protected]> * Adding fabric_cut to kevlar shears Now that fabric_cut exists, i added it to the kevlar shears Co-authored-by: I-am-Erk <[email protected]>
CleverRaven · Dec 17, 2021 · e467981 · e467981
1 parent 9c06314
commit e467981
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 4 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -1302,7 +1302,8 @@
       [ "rag", 30 ],
       [ "lycra_patch", 15 ],
       [ "nylon", 10 ],
-      { "item": "tailors_kit", "prob": 20, "charges": [ 0, 100 ] }
+      { "item": "tailors_kit", "prob": 20, "charges": [ 0, 100 ] },
+      [ "kevlar_shears", 5 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/SUS/clothes_store.json b/data/json/itemgroups/SUS/clothes_store.json
@@ -69,7 +69,8 @@
               { "item": "needle_curved", "prob": 75 },
               { "item": "scissors", "prob": 90 },
               { "item": "knitting_needles", "prob": 20 },
-              { "item": "sewing_kit", "prob": 85, "charges-min": 0 }
+              { "item": "sewing_kit", "prob": 85, "charges-min": 0 },
+              { "item": "kevlar_shears", "prob": 5 }
             ],
             "prob": 25
           },

diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -306,6 +306,7 @@
       { "item": "stapler", "prob": 25 },
       { "item": "soldering_iron", "prob": 25, "charges": [ 5, 45 ] },
       { "item": "xacto", "prob": 25 },
+      { "item": "kevlar_shears", "prob": 10 },
       { "item": "wristwatch", "prob": 25 },
       { "item": "light_disposable_cell", "count": 4, "prob": 25, "charges": 300 },
       { "item": "old_key", "prob": 20, "count": [ 1, 6 ] },

diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -552,7 +552,8 @@
       { "item": "sewing_kit", "prob": 120, "charges-min": 0 },
       { "item": "shed_stick", "prob": 5 },
       { "item": "tailors_kit", "prob": 10, "charges-min": 0 },
-      [ "knitting_needles", 20 ]
+      [ "knitting_needles", 20 ],
+      [ "kevlar_shears", 100 ]
     ]
   },
   {
@@ -563,7 +564,8 @@
       [ "needle_curved", 30 ],
       [ "scissors", 1000 ],
       { "item": "sewing_kit", "prob": 10, "charges-min": 0 },
-      { "item": "tailors_kit", "prob": 120, "charges-min": 0 }
+      { "item": "tailors_kit", "prob": 120, "charges-min": 0 },
+      [ "kevlar_shears", 40 ]
     ]
   },
   {

diff --git a/data/json/items/tool/tailoring.json b/data/json/items/tool/tailoring.json
@@ -255,6 +255,25 @@
     "symbol": ";",
     "color": "yellow"
   },
+  {
+    "id": "kevlar_shears",
+    "type": "TOOL",
+    "name": { "str": "pair of Kevlar shears", "str_pl": "pairs of Kevlar shears" },
+    "description": "These are a pair of heavy-duty shears with a blade suitable for cutting particularly tough materials, from polyaramid fabrics to tough plastics and thin metals.  The blades feature a flat shearing edge and a fine serration.",
+    "ascii_picture": "scissors",
+    "weight": "113 g",
+    "volume": "145 ml",
+    "price": 3500,
+    "price_postapoc": 350,
+    "to_hit": -1,
+    "cutting": 10,
+    "material": [ "steel", "plastic" ],
+    "symbol": ",",
+    "color": "yellow",
+    "qualities": [ [ "CUT", 2 ], [ "BUTCHER", 5 ], [ "FABRIC_CUT", 2 ] ],
+    "flags": [ "STAB", "BELT_CLIP", "SHEATH_KNIFE" ],
+    "weapon_category": [ "SHIVS" ]
+  },
   {
     "id": "tailors_kit",
     "type": "TOOL",

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -5759,5 +5759,13 @@
     "time": "30 s",
     "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [ [ [ "nylon", 3 ] ], [ [ "scrap", 1 ] ] ]
+  },
+  {
+    "result": "kevlar_shears",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "12 s",
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "components": [ [ [ "scrap", 2 ] ] ]
   }
 ]
diff --git a/data/json/recipes/tools/tool.json b/data/json/recipes/tools/tool.json
@@ -1193,5 +1193,25 @@
     "reversible": true,
     "autolearn": true,
     "components": [ [ [ "talking_doll", 1 ], [ "creepy_doll", 1 ] ], [ [ "mannequin", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "BRISK_EXERCISE",
+    "result": "kevlar_shears",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "6 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking" },
+      { "proficiency": "prof_blacksmithing" },
+      { "proficiency": "prof_toolsmithing", "required": false, "time_multiplier": 1.5 },
+      { "proficiency": "prof_bladesmith", "required": false, "time_multiplier": 2 }
+    ],
+    "qualities": [ { "id": "GRIND", "level": 2 } ],
+    "tools": [ [ [ "hotcut", -1 ], [ "metal_file", -1 ] ] ]
   }
 ]