Gunmod test

data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json

@@ -58,7 +58,9 @@
       [ "rifle_scope_high_end_mount", 20 ],
       [ "modern_handguard", 20 ],
       [ "bipod_handguard", 10 ],
-      [ "high_end_folding_stock", 10 ]
+      [ "high_end_folding_stock", 10 ],
+      [ "stock_mauser", 5 ],
+      [ "muzzle_weight", 10 ]
     ]
   },
   {

data/json/items/gunmod/stock.json

@@ -156,6 +156,47 @@
     "handling_modifier": -10,
     "flags": [ "COLLAPSED_STOCK", "IRREMOVABLE" ]
   },
+  {
+    "id": "stock_mauser",
+    "type": "GUNMOD",
+    "name": { "str": "Mauser C96 stock" },
+    "description": "The hollow removable wooden pistol stock of the C96 Mauser pistol, which doubles as a holster.  It fits both the original clip-loaded C96 and later magazine-fed reproductions, but a gun with an extended magazine won't fit without modification.",
+    "copy-from": "pistol_stock",
+    "volume": "700 ml",
+    "integral_volume": "700 ml",
+    "integral_weight": "590 g",
+    "integral_longest_side": "35 cm",
+    "weight": "590 g",
+    "material": [ "wood" ],
+    "color": "brown",
+    "location": "stock mount",
+    "mod_targets": [ "mauser_c96", "mauser_m714" ],
+    "min_skills": [ [ "weapon", 1 ] ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "rigid": true,
+        "item_restriction": [ "mauser_c96", "mauser_m714" ],
+        "max_contains_volume": "650 ml",
+        "max_contains_weight": "1815 g",
+        "max_item_length": "32 cm",
+        "moves": 50
+      }
+    ],
+    "use_action": { "type": "holster" },
+    "flags": [ "BELTED", "BELT_CLIP", "OVERSIZE" ],
+    "armor_data": {
+      "armor": [
+        {
+          "material": [ { "type": "wood", "thickness": 5 } ],
+          "encumbrance": [ 3, 4 ],
+          "covers": [ "leg_l", "leg_r" ],
+          "specifically_covers": [ "leg_hip_r", "leg_hip_l" ]
+        }
+      ]
+    }
+  },
   {
     "id": "stock_none",
     "type": "GUNMOD",

data/json/items/gunmod/underbarrel.json

@@ -610,5 +610,26 @@
       "moves": 150
     },
     "flags": [ "BIPOD", "SLOW_WIELD", "ZERO_WEIGHT" ]
+  },
+  {
+    "id": "muzzle_weight",
+    "type": "GUNMOD",
+    "name": { "str": "muzzle weight" },
+    "description": "A small weight attached below the barrel of a firearm to reduce muzzle climb, increasing bulk but reducing shot spread.  Mainly used on competition handguns, but it can be added to combat pistols, too.",
+    "//": "Based on https://stores.sjcguns.com/sjc-full-size-m-p-frame-weight/, which was selected as an 'average' WRT weight.  This model does not extend beyond the barrel or the slide, and so is compatible with compensators, suppressors, etc.  Realistically every distinct model and chambering of pistol would need a custom-made weight, but that level of granularity doesn't seem to square with that of existing gunmods.",
+    "weight": "179 g",
+    "volume": "68 ml",
+    "longest_side": "68 mm",
+    "integral_longest_side": "0 cm",
+    "handling_modifier": 2,
+    "price": "175 USD",
+    "price_postapoc": "5 USD",
+    "install_time": "1 m",
+    "material": [ "aluminum" ],
+    "symbol": ":",
+    "color": "white",
+    "location": "underbarrel",
+    "mod_targets": [ "smg", "pistol" ],
+    "min_skills": [ [ "weapon", 3 ], [ "gun", 1 ] ]
   }
 ]

data/json/recipes/weapon/mods.json

@@ -1473,5 +1473,33 @@
     "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 20 ] ],
     "tools": [ [ [ "m240", -1 ] ], [ [ "small_repairkit", 40 ], [ "large_repairkit", 40 ] ] ],
     "components": [ [ [ "sheet_metal_small", 5 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "muzzle_weight",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_MODS",
+    "skill_used": "fabrication",
+    "skills_required": [ [ "pistol", 4 ], [ "gun", 3 ], [ "mechanics", 1 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking" },
+      { "proficiency": "prof_blacksmithing" },
+      { "proficiency": "prof_toolsmithing" },
+      { "proficiency": "prof_gunsmithing_basic" }
+    ],
+    "difficulty": 7,
+    "time": "5 h",
+    "book_learn": [ [ "manual_pistol", 6 ], [ "text_gunsmith", 6 ] ],
+    "qualities": [
+      { "id": "ANVIL", "level": 1 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "HAMMER_FINE", "level": 1 },
+      { "id": "SAW_M", "level": 2 },
+      { "id": "SAW_M_FINE", "level": 1 },
+      { "id": "SCREW", "level": 1 }
+    ],
+    "tools": [ [ [ "forge", 150 ], [ "oxy_torch", 150 ] ], [ [ "metalworking_tongs_any", 1, "LIST" ] ] ],
+    "components": [ [ [ "material_aluminium_ingot", 1 ] ] ]
   }
 ]