Unarmed crafting organization (#62564)

* New unarmed subcategory * Unarmed weapons file * Revert "Unarmed weapons file"
CleverRaven · Mar 5, 2023 · 799e0b1 · 799e0b1
1 parent 7762a54
commit 799e0b1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
@@ -1069,8 +1069,8 @@
     "result": "gloves_studded",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HANDS",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_UNARMED",
     "skill_used": "tailor",
     "difficulty": 3,
     "time": "30 m",

diff --git a/data/json/recipes/recipes.json b/data/json/recipes/recipes.json
@@ -13,6 +13,7 @@
       "CSC_WEAPON_BASHING",
       "CSC_WEAPON_CUTTING",
       "CSC_WEAPON_PIERCING",
+      "CSC_WEAPON_UNARMED",
       "CSC_WEAPON_RANGED",
       "CSC_WEAPON_EXPLOSIVE",
       "CSC_WEAPON_MODS",

diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json
@@ -291,7 +291,7 @@
     "activity_level": "LIGHT_EXERCISE",
     "result": "knuckle_steel",
     "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_BASHING",
+    "subcategory": "CSC_WEAPON_UNARMED",
     "skill_used": "fabrication",
     "skills_required": [ "bashing", 1 ],
     "proficiencies": [ { "proficiency": "prof_metalworking" } ],
@@ -322,7 +322,7 @@
     "activity_level": "BRISK_EXERCISE",
     "result": "knuckle_steel_forged",
     "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_BASHING",
+    "subcategory": "CSC_WEAPON_UNARMED",
     "skill_used": "fabrication",
     "skills_required": [ "bashing", 1 ],
     "proficiencies": [
@@ -364,7 +364,7 @@
     "activity_level": "BRISK_EXERCISE",
     "result": "knuckle_brass",
     "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_BASHING",
+    "subcategory": "CSC_WEAPON_UNARMED",
     "skill_used": "fabrication",
     "skills_required": [ "bashing", 1 ],
     "proficiencies": [
@@ -403,7 +403,7 @@
     "activity_level": "LIGHT_EXERCISE",
     "result": "knuckle_nail",
     "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_BASHING",
+    "subcategory": "CSC_WEAPON_UNARMED",
     "skill_used": "fabrication",
     "time": "10 m",
     "reversible": true,
@@ -439,7 +439,7 @@
     "activity_level": "MODERATE_EXERCISE",
     "result": "cestus",
     "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_BASHING",
+    "subcategory": "CSC_WEAPON_UNARMED",
     "skill_used": "fabrication",
     "skills_required": [ "bashing", 1 ],
     "difficulty": 2,
@@ -849,7 +849,7 @@
     "type": "recipe",
     "activity_level": "BRISK_EXERCISE",
     "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_BASHING",
+    "subcategory": "CSC_WEAPON_UNARMED",
     "skill_used": "fabrication",
     "difficulty": 6,
     "time": "4h",

diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json
@@ -1304,7 +1304,7 @@
     "type": "recipe",
     "activity_level": "BRISK_EXERCISE",
     "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_PIERCING",
+    "subcategory": "CSC_WEAPON_UNARMED",
     "skill_used": "fabrication",
     "difficulty": 6,
     "time": "4h",