Impact and Skewer Knuckles

Update data/json/items/melee/unarmed_weapons.json Update data/json/items/melee/unarmed_weapons.json astyle monmove even though its unrelated Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com>
CleverRaven · Aug 2, 2021 · 0cc5361 · 0cc5361
1 parent b69f4b0
commit 0cc5361
Show file tree

Hide file tree

Showing 7 changed files with 142 additions and 70 deletions.
diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json
@@ -1042,25 +1042,5 @@
     "material_thickness": 5,
     "flags": [ "STURDY", "OUTER", "RAINPROOF", "ONLY_ONE" ],
     "armor": [ { "encumbrance": 20, "coverage": 100, "covers": [ "hand_l", "hand_r" ] } ]
-  },
-  {
-    "id": "gloves_studded",
-    "type": "ARMOR",
-    "name": { "str": "pair of studded gloves", "str_pl": "pairs of studded gloves" },
-    "description": "A pair of gloves with studded metal knuckles.",
-    "weight": "218 g",
-    "volume": "250 ml",
-    "price": 1100,
-    "price_postapoc": 250,
-    "bashing": 2,
-    "cutting": 1,
-    "material": [ "steel", "leather", "cotton" ],
-    "symbol": "[",
-    "looks_like": "gloves_leather",
-    "color": "light_gray",
-    "warmth": 5,
-    "material_thickness": 2,
-    "flags": [ "WATER_FRIENDLY", "STAB", "DURABLE_MELEE" ],
-    "armor": [ { "encumbrance": 5, "coverage": 100, "covers": [ "hand_l", "hand_r" ] } ]
   }
 ]
diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
@@ -1731,5 +1731,57 @@
     "qualities": [ [ "AXE", 3 ] ],
     "use_action": [ "E_COMBATSAW_ON" ],
     "flags": [ "MESSY", "FRAGILE_MELEE", "TRADER_AVOID", "POWERED", "ALWAYS_TWOHAND" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "punch_dagger",
+    "name": { "str": "punch dagger" },
+    "description": "A short and sharp double-edged dagger made to be gripped in the palm, with the blade protruding between the fingers.",
+    "weight": "168 g",
+    "to_hit": -1,
+    "price_postapoc": 50,
+    "color": "dark_gray",
+    "symbol": "{",
+    "material": [ "steel" ],
+    "volume": "250 ml",
+    "bashing": 2,
+    "cutting": 14,
+    "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_KNIFE" ],
+    "price": 10000,
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 14 ] ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "knuckle_katar",
+    "symbol": "!",
+    "color": "dark_gray",
+    "name": { "str": "razorbar katar" },
+    "description": "Five pieces of rebar sharpened to cruel points and strapped to a brace fastened at wrist and forearm on both arms.  The next bub better watch out.",
+    "material": [ "steel" ],
+    "volume": "500 ml",
+    "weight": "1150 g",
+    "bashing": 3,
+    "cutting": 14,
+    "price_postapoc": 500,
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
+    "flags": [ "STAB" ],
+    "techniques": [ "WBLOCK_1" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "bagh_nakha",
+    "name": { "str_sp": "tiger claws" },
+    "description": "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon from India designed to be concealed under and against the palm.",
+    "weight": "92 g",
+    "volume": "11 ml",
+    "color": "dark_gray",
+    "symbol": "{",
+    "material": [ "steel" ],
+    "bashing": 2,
+    "cutting": 15,
+    "flags": [ "DURABLE_MELEE" ],
+    "price": 20000,
+    "price_postapoc": 250,
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 14 ] ]
   }
 ]
diff --git a/data/json/items/melee/unarmed_weapons.json b/data/json/items/melee/unarmed_weapons.json
@@ -1,21 +1,4 @@
 [
-  {
-    "type": "GENERIC",
-    "id": "bagh_nakha",
-    "name": { "str_sp": "tiger claws" },
-    "description": "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon from India designed to be concealed under and against the palm.",
-    "weight": "92 g",
-    "volume": "11 ml",
-    "color": "dark_gray",
-    "symbol": "{",
-    "material": [ "steel" ],
-    "bashing": 2,
-    "cutting": 15,
-    "flags": [ "DURABLE_MELEE" ],
-    "price": 20000,
-    "price_postapoc": 250,
-    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 14 ] ]
-  },
   {
     "type": "ARMOR",
     "id": "cestus",
@@ -47,23 +30,6 @@
     "price_postapoc": 250,
     "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE" ]
   },
-  {
-    "type": "GENERIC",
-    "id": "knuckle_katar",
-    "symbol": "!",
-    "color": "dark_gray",
-    "name": { "str": "razorbar katar" },
-    "description": "Five pieces of rebar sharpened to cruel points and strapped to a brace fastened at wrist and forearm on both arms.  The next bub better watch out.",
-    "material": [ "steel" ],
-    "volume": "500 ml",
-    "weight": "1150 g",
-    "bashing": 3,
-    "cutting": 14,
-    "price_postapoc": 500,
-    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
-    "flags": [ "STAB" ],
-    "techniques": [ "WBLOCK_1" ]
-  },
   {
     "type": "GENERIC",
     "id": "knuckle_nail",
@@ -114,21 +80,61 @@
     "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE" ]
   },
   {
-    "type": "GENERIC",
-    "id": "punch_dagger",
-    "name": { "str": "punch dagger" },
-    "description": "A short and sharp double-edged dagger made to be gripped in the palm, with the blade protruding between the fingers.",
-    "weight": "168 g",
-    "to_hit": -1,
-    "price_postapoc": 50,
-    "color": "dark_gray",
-    "symbol": "{",
-    "material": [ "steel" ],
+    "id": "gloves_studded",
+    "type": "ARMOR",
+    "name": { "str": "pair of studded gloves", "str_pl": "pairs of studded gloves" },
+    "description": "A pair of gloves with studded metal knuckles.",
+    "weight": "218 g",
     "volume": "250 ml",
+    "price": 1100,
+    "price_postapoc": 250,
+    "bashing": 2,
+    "cutting": 1,
+    "material": [ "steel", "leather", "cotton" ],
+    "symbol": "[",
+    "looks_like": "gloves_leather",
+    "color": "light_gray",
+    "warmth": 5,
+    "material_thickness": 2,
+    "flags": [ "WATER_FRIENDLY", "STAB", "DURABLE_MELEE" ],
+    "armor": [ { "encumbrance": 5, "coverage": 100, "covers": [ "hand_l", "hand_r" ] } ]
+  },
+  {
+    "id": "knuckle_impact",
+    "type": "ARMOR",
+    "name": { "str_sp": "impact knuckles" },
+    "description": "A pair of thick steel plates covering your proximal phalange.  They are strapped to your hands with metal braces.",
+    "weight": "500 g",
+    "volume": "300 ml",
+    "price": 1100,
+    "price_postapoc": 250,
+    "bashing": 12,
+    "material": [ "steel" ],
+    "symbol": "[",
+    "color": "light_gray",
+    "warmth": 0,
+    "material_thickness": 3,
+    "flags": [ "WATER_FRIENDLY", "DURABLE_MELEE", "OUTER" ],
+    "armor": [ { "encumbrance": 5, "coverage": 40, "covers": [ "hand_l", "hand_r" ] } ]
+  },
+  {
+    "id": "knuckle_skewer",
+    "type": "ARMOR",
+    "name": { "str_sp": "skewer knuckles" },
+    "description": "A single sturdy spike protrudes 5cm from the back of your hand.  They are strapped to your hands with metal braces.",
+    "weight": "250 g",
+    "volume": "300 ml",
+    "price": 1100,
+    "price_postapoc": 250,
     "bashing": 2,
-    "cutting": 14,
-    "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_KNIFE" ],
-    "price": 10000,
-    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 14 ] ]
+    "cutting": 10,
+    "to_hit": 1,
+    "material": [ "steel" ],
+    "symbol": "[",
+    "color": "light_gray",
+    "warmth": 0,
+    "material_thickness": 2,
+    "flags": [ "WATER_FRIENDLY", "DURABLE_MELEE", "STAB", "OUTER" ],
+    "armor": [ { "encumbrance": 5, "coverage": 20, "covers": [ "hand_l", "hand_r" ] } ]
   }
 ]
diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
@@ -767,7 +767,7 @@
     "using": [ [ "sewing_standard", 4 ] ],
     "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ],
-    "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ], [ "toolset", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ],
+    "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ], [ "toolset", -1 ] ] ],
     "components": [ [ [ "gloves_light", 1 ], [ "gloves_liner", 1 ] ], [ [ "gloves_leather", 1 ] ], [ [ "scrap", 4 ] ] ]
   }
 ]
diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json
@@ -507,5 +507,22 @@
       { "proficiency": "prof_toolsmithing" }
     ],
     "components": [ [ [ "q_staff", 1 ] ] ]
+  },
+  {
+    "result": "knuckle_impact",
+    "type": "recipe",
+    "activity_level": "BRISK_EXERCISE",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_BASHING",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "time": "4h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 5 ], [ "steel_standard", 1 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking" },
+      { "proficiency": "prof_blacksmithing" },
+      { "proficiency": "prof_articulation" }
+    ]
   }
 ]
diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json
@@ -947,5 +947,22 @@
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "hotcut", -1 ] ] ],
     "components": [ [ [ "2x4", 1 ], [ "stick", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
+  },
+  {
+    "result": "knuckle_skewer",
+    "type": "recipe",
+    "activity_level": "BRISK_EXERCISE",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "time": "4h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 5 ], [ "steel_standard", 1 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking" },
+      { "proficiency": "prof_blacksmithing" },
+      { "proficiency": "prof_articulation" }
+    ]
   }
 ]
diff --git a/src/monmove.cpp b/src/monmove.cpp
@@ -1755,7 +1755,7 @@ bool monster::move_to( const tripoint &p, bool force, bool step_on_critter,
         }
     }
 
-    if( has_flag ( MF_SMALLSLUDGETRAIL ) ) {
+    if( has_flag( MF_SMALLSLUDGETRAIL ) ) {
         if( one_in( 2 ) ) {
             here.add_field( pos(), fd_sludge, 1 );
         }