Crude weapons 2020

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -2361,6 +2361,7 @@
       [ "ashot", 4 ],
       [ "pickaxe", 1 ],
       [ "makeshift_machete", 4 ],
+      [ "machete_gimmick", 3 ],
       [ "flamethrower_crude", 6 ],
       [ "fungicide", 10 ],
       [ "insecticide", 10 ],

data/json/itemgroups/Clothing_Gear/gear_civilian.json

@@ -23,6 +23,7 @@
       [ "pockknife", 50 ],
       [ "knife_folding", 30 ],
       [ "knife_swissarmy", 10 ],
+      [ "machete_gimmick", 5 ],
       [ "teleumbrella", 20 ],
       [ "umbrella", 20 ],
       [ "aspirin", 100 ],

data/json/itemgroups/Locations_MapExtras/mansion.json

@@ -728,6 +728,7 @@
       [ "bondage_mask", 10 ],
       [ "zentai", 2 ],
       [ "bullwhip", 10 ],
+      [ "bullwhip_razor", 10 ],
       [ "leather_cat_ears", 5 ],
       [ "leather_cat_tail", 5 ],
       [ "leather_collar", 5 ],

data/json/itemgroups/activities_hobbies.json

@@ -196,6 +196,7 @@
       [ "knife_hunting", 18 ],
       [ "knife_rambo", 20 ],
       [ "machete", 5 ],
+      [ "machete_gimmick", 5 ],
       [ "vest", 15 ],
       [ "backpack", 38 ],
       [ "backpack_leather", 18 ],

data/json/itemgroups/art_antiques_crafts.json

@@ -95,6 +95,7 @@
       { "item": "baldric", "prob": 4 },
       { "item": "nodachi", "prob": 1 },
       { "item": "nodachi_inferior", "prob": 2 },
+      { "item": "knife_churl", "prob": 2 },
       { "item": "gambeson", "prob": 3 },
       { "item": "tunic", "prob": 1 },
       { "item": "armor_lamellar", "prob": 2 },
@@ -253,7 +254,8 @@
       { "item": "dao", "prob": 3 },
       { "item": "sword_xiphos", "prob": 4 },
       { "item": "khopesh", "prob": 4 },
-      { "item": "spear_dory", "prob": 3 }
+      { "item": "spear_dory", "prob": 3 },
+      { "item": "knife_churl", "prob": 3 }
     ]
   },
   {

data/json/items/melee/bludgeons.json

@@ -867,19 +867,20 @@
   },
   {
     "type": "GENERIC",
-    "id": "sharp_toothbrush",
+    "id": { "str": "sharp_toothbrush" },
     "symbol": ",",
     "color": "light_blue",
-    "name": { "str": "sharpened toothbrush", "str_pl": "sharpened toothbrushes" },
-    "description": "A personal hygiene item turned into a shank.",
+    "name": { "str": "plastic shank", "str_pl": "plastic shanks" },
+    "description": "An oblong plastic trinket with the far end ground down into a stabbing point.",
     "category": "weapons",
     "price": 400,
+    "price_postapoc": 0,
     "material": [ "plastic" ],
     "weight": "49 g",
     "volume": "250 ml",
-    "bashing": 2,
-    "cutting": 1,
-    "price_postapoc": 10,
+    "bashing": 1,
+    "cutting": 3,
+    "to_hit": -3,
     "flags": [ "STAB", "SHEATH_KNIFE", "CONDUCTIVE" ]
   },
   {

data/json/items/melee/misc.json

@@ -15,6 +15,24 @@
     "cutting": 3,
     "category": "weapons"
   },
+  {  
+    "id:": "bullwhip_razor",
+    "name": { "str: ""scourge" },
+    "type": "TOOL",
+    "description": "The \"cat 'o nine tails\", a handle with nine short leather whips each sporting a razor-sharp metal tip. This ancient instrument of torture causes massive bleeding but is an ineffecient weapon by design.",
+    "symbol": "/",
+    "color": "brown",
+    "weight": "3496",
+    "volume": 9,
+    "price": 4800,
+    "price_postapoc": 5200,
+    "to_hit": 2,
+    "//": "There's no way you can swing this thing without hitting SOMETHING.",
+    "bashing": 0,
+    "cutting": 10,
+    "material": [ "leather", "steel" ],
+    "flags": [ "REACHATTACK", "WHIP", "NONCONDUCTIVE" ]    
+  },
   {
     "id": "lobotomizer",
     "type": "TOOL",

data/json/items/melee/swords_and_blades.json

@@ -246,6 +246,42 @@
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 11 ] ],
     "flags": [ "STAB", "SHEATH_KNIFE" ]
   },
+  {
+    "id": "bone_knife",
+    "name": { "str": "bone shiv" },
+    "type": "TOOL",
+    "description": "A femur or other bone, at least 30 cm long, which has been broken at one end and sharpened into a cutting tool. Its jagged edge is wicked but fragile.",
+    "symbol": "/",
+    "color": "white",
+    "weight": 169,
+    "//": "literally 75% of a bone.",
+    "volume": "188 ml",
+    "price": 0,
+    "price_postapoc": 0,
+    "to_hit": 0,
+    "bashing": 4,
+    "cutting": 20,
+    "material": "bone",
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 12 ] ],
+    "flags": [ "STAB", "SHEATH_KNIFE", "FRAGILE_MELEE" ]
+  },
+  {
+    "id": "knife_churl",
+    "type": "TOOL",
+    "name": { "str": "baselard" },
+    "description": "A medieval dagger forged from rough iron. It is not the sharpest tool in the shed, but it is certainly one of the largest.",
+    "weight": "420 g",
+    "volume": "250 ml",
+    "price": 19590,
+    "to_hit": 1,
+    "bashing": 5,
+    "cutting": 20,
+    "material": [ "iron" ],
+    "symbol": ";",
+    "color": "dark_gray",
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 15 ] ],
+    "flags": [ "STAB", "SHEATHE_KNIFE" ]
+  },
   {
     "id": "makeshift_machete",
     "type": "TOOL",
@@ -286,6 +322,25 @@
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 15 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ]
   },
+  {
+    "id": "machete_gimmick",
+    "name": { "str": "machete multitool" },
+    "type": "TOOL",
+    "description": "A thin, wobbly steel blade with sawteeth on one side and a flat chisel tip for digging. A jack of many trades and a master of none.",
+    "symbol": "/",
+    "color": "green",
+    "weight": 522,
+    "volume": 1,
+    "price": 2300,
+    "price_postapoc": 1800,
+    "to_hit": -1,
+    "bashing": 8,
+    "cutting": 15,
+    "to_hit": 1,
+    "material": "steel",
+    "qualiies": [ [ "CUT", 1 ], [ "BUTCHER", 8 ], [ "SAW_W", 1 ], [ "DIG", 1 ], [ "PRY", 1 ] ],
+    "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ]
+  },
   {
     "id": "cavalry_sabre",
     "type": "TOOL",

data/json/recipes/recipe_weapon.json

@@ -92,6 +92,20 @@
       [ [ "spike", 1 ] ]
     ]
   },
+  {
+    "type": "recipe",
+    "result": "knife_churl",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "5 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ "swage", -1 ] ],
+    "components": [ [ "fur", 1 ], [ "leather", 1 ] ]
+  },
   {
     "type": "recipe",
     "result": "pointy_stick",
@@ -215,6 +229,19 @@
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "leather", 20 ] ], [ [ "rope_superior_short", 2, "LIST" ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "bullwhip_razor",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_RANGED",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "time": "4 h",
+    "reversible": true,
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
+    "components": [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ]
+  },
   {
     "type": "recipe",
     "result": "spear_wood",
@@ -1922,6 +1949,30 @@
     "tools": [  ],
     "components": [ [ [ "glass_shard", 1 ] ], [ [ "rag", 1 ], [ "duct_tape", 10 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "bone_knife",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "skill_required": [ "survival", 1 ],
+    "time": "2 m",
+    "autolearn": true,
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "components": [ [ "bone", 1 ], "bone_human", 1 ]
+  },
+  {
+    "type": "recipe",
+    "result": "sharp_toothbrush",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "time": "30 sec",
+    "autolearn": true,
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "//": "In the absence of walls or floors being valid ways to grind a sharp point onto an object, sandpaper/files not being fully implemented, and this being a prison shank, just pick up a rock and rub it on the toothbrush.",
+    "components": [ [ "toothbrush_plain", 1 ], [ "hairbrush", 1 ], [ "comb_pocket", 1 ], [ "plastic_chunk", 1 ] ]
+  },
   {
     "type": "recipe",
     "result": "sword_crude",