Unarmed weapons expansion

data/json/items/melee/unarmed_weapons.json

@@ -119,5 +119,58 @@
     "flags": [ "STAB", "UNARMED_WEAPON", "DURABLE_MELEE", "SHEATH_KNIFE" ],
     "price": 10000,
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 14 ] ]
+  },
+  {
+    "id": "katar",
+    "type": "GENERIC",
+    "category": "weapons",
+    "name": { "str": "katar" },
+    "copy-from": "knuckle_katar",
+    "description": "A steel brace with a metal blade at the end, designed to allow the user to stab and slash with the same motions as a punch.",
+    "material": [ "steel" ],
+    "volume": "750 ml",
+    "cutting": 20,
+    "price": "500 USD",
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 12 ] ],
+    "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "SHEATH_KNIFE" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "spiked_boxing",
+    "category": "weapons",
+    "weapon_category": [ "FIST_WEAPONS" ],
+    "name": { "str": "spiked boxing gloves" },
+    "description": "Boxing gloves with nails driven through the inside.  Not exactly ring-legal, but there are no more referees.",
+    "weight": "464 g",
+    "volume": "1 L",
+    "price": "45 USD",
+    "price_postapoc": "450 cent",
+    "bashing": 4,
+    "cutting": 4,
+    "material": [ "cotton", "steel" ],
+    "symbol": "b",
+    "color": "red",
+    "looks_like": "cestus",
+    "flags": [ "DURABLE_MELEE", "UNARMED_WEAPON", "BELT_CLIP", "NONCONDUCTIVE", "STAB" ]
+  },
+  {
+    "id": "sai",
+    "type": "GENERIC",
+    "name": "sai",
+    "description": "A pointed metal baton with two curved prongs projecting from the handle.  It's primarily used for disarming opponents, but can also make your punches puncture your foes.",
+    "weight": 775,
+    "volume": "750 ml",
+    "price": "220 USD",
+    "price_postapoc": "4 USD",
+    "weapon_category": [ "FIST_WEAPONS" ],
+    "bashing": 6,
+    "cutting": 7,
+    "material": [ "steel" ],
+    "looks_like": "tanto",
+    "symbol": "/",
+    "color": "light_gray",
+    "techniques": [ "WBLOCK_2", "DEF_DISARM" ],
+    "qualities": [ [ "COOK", 1 ] ],
+    "flags": [ "STAB", "DURABLE_MELEE", "UNARMED_WEAPON" ]
   }
 ]

data/json/recipes/weapon/bashing.json

@@ -180,6 +180,7 @@
     "skills_required": [ "bashing", 1 ],
     "difficulty": 2,
     "time": "20 m",
+    "autolearn": true,
     "book_learn": [ [ "recipe_melee", 1 ], [ "textbook_weapeast", 7 ] ],
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "components": [ [ [ "leather", 4 ] ], [ [ "scrap", 8 ] ] ]
@@ -413,5 +414,18 @@
     "using": [ [ "soldering_standard", 10 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [ [ [ "i_staff", 1 ] ], [ [ "tazer", 1 ] ], [ [ "cable", 10 ] ] ]
+  },
+  {
+    "result": "spiked_boxing",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_BASHING",
+    "skill_used": "tailor",
+    "difficulty": 4,
+    "skills_required": [ "unarmed", 1 ],
+    "time": "20 m",
+    "autolearn": true,
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "rag", 8 ] ], [ [ "filament", 12, "LIST" ] ], [ [ "nail", 8 ] ] ]
   }
 ]

data/json/recipes/weapon/cutting.json

@@ -126,6 +126,7 @@
     "skills_required": [ "bashing", 1 ],
     "difficulty": 4,
     "time": "30 m",
+    "autolearn": true,
     "book_learn": [ [ "recipe_melee", 3 ], [ "textbook_weapeast", 8 ] ],
     "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ],
     "components": [ [ [ "2x4", 4 ], [ "stick", 8 ] ], [ [ "rebar", 5 ] ] ]
@@ -665,5 +666,17 @@
       ],
       [ [ "scrap_bronze", 5 ] ]
     ]
+  },
+  {
+    "type": "recipe",
+    "result": "katar",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "skill_used": "fabrication",
+    "difficulty": 7,
+    "time": "4 h",
+    "autolearn": true,
+    "book_learn": [ [ "textbook_weapeast", 3 ], [ "recipe_melee", 4 ] ],
+    "using": [ [ "blacksmithing_standard", 12 ], [ "steel_standard", 3 ] ]
   }
 ]

data/json/recipes/weapon/piercing.json

@@ -792,5 +792,19 @@
       [ [ "stick_long", 1 ] ],
       [ [ "rag", 2 ], [ "felt_patch", 2 ], [ "leather", 2 ], [ "fur", 2 ] ]
     ]
+  },
+  {
+    "result": "sai",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "time": "1 h 8 m",
+    "autolearn": true,
+    "book_learn": [ [ "textbook_weapeast", 5 ] ],
+    "qualities": [ { "id": "HAMMER", "level": 3 } ],
+    "using": [ [ "blacksmithing_standard", 12 ], [ "steel_standard", 2 ] ],
+    "components": [ [ [ "fur", 2 ], [ "leather", 2 ] ] ]
   }
 ]