Gunmod test

data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json

@@ -21,7 +21,12 @@
       [ "cheek_pad", 25 ],
       [ "rail_laser_sight", 40 ],
       [ "red_dot_sight", 70 ],
-      [ "choke", 50 ]
+      [ "choke", 50 ],
+      [ "stock_ammo_loops_canvas", 40 ],
+      [ "stock_ammo_loops_plastic", 40 ],
+      [ "stock_mag_pouch", 30 ],
+      [ "side_carrier_shotgun_cloth", 30 ],
+      [ "side_carrier_shotgun_plastic", 30 ]
     ]
   },
   {
@@ -58,7 +63,11 @@
       [ "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 ],
+      [ "stock_ammo_loops_leather", 40 ],
+      [ "muzzle_weight", 10 ],
+      [ "side_carrier_rifle", 30 ]
     ]
   },
   {

data/json/items/gunmod/rail.json

@@ -95,5 +95,95 @@
     "mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "launcher" ],
     "flags": [ "LASER_SIGHT" ],
     "min_skills": [ [ "weapon", 2 ], [ "gun", 1 ] ]
+  },
+  {
+    "id": "side_carrier_rifle",
+    "type": "GUNMOD",
+    "name": "2-shot side carrier",
+    "//": "https://www.amazon.com/dp/B076HR8WPC?th=1",
+    "description": "A pair of Neoprene loops on a small velcro belt to hold bullets or shells for easy access.  The belt wraps around the body of a longarm, holding the bullets parallel with the gun.",
+    "weight": "9 g",
+    "integral_longest_side": "0 cm",
+    "volume": "65 ml",
+    "price": "14 USD 65 cent",
+    "price_postapoc": "2 USD",
+    "install_time": "10 second",
+    "material": [ "neoprene" ],
+    "symbol": ":",
+    "color": "black",
+    "location": "rail",
+    "mod_targets": [ "rifle", "shotgun" ],
+    "min_skills": [ [ "weapon", 0 ] ],
+    "pocket_mods": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": false,
+        "ammo_restriction": {
+          "20x66mm": 2,
+          "22": 2,
+          "223": 2,
+          "270win": 2,
+          "300blk": 2,
+          "545x39": 2,
+          "3006": 2,
+          "123ln": 2,
+          "303": 2,
+          "77mm_arisaka": 2,
+          "308": 2,
+          "300": 2,
+          "762": 2,
+          "762R": 2,
+          "8x40mm": 2,
+          "4570": 2,
+          "50beowulf": 2,
+          "450": 2,
+          "410shot": 2,
+          "338lapua": 2,
+          "50": 2,
+          "458wm": 2,
+          "shot": 2
+        },
+        "moves": 20
+      }
+    ]
+  },
+  {
+    "id": "side_carrier_shotgun_cloth",
+    "copy-from": "side_carrier_rifle",
+    "type": "GUNMOD",
+    "name": "fabric side carrier",
+    "//": "https://www.amazon.com/dp/B0CVV6J1PS?th=1",
+    "description": "Six nylon loops on a small strap, to hold shotgun shells for easy access.  The strap adheres to the receiver of a shotgun, holding the shells perpendicular with the gun.",
+    "weight": "40 g",
+    "volume": "164 ml",
+    "price": "3 USD 50 cent",
+    "material": [ "nylon" ],
+    "pocket_mods": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": false,
+        "ammo_restriction": { "20x66mm": 6, "410shot": 6, "shot": 6 },
+        "moves": 20
+      }
+    ]
+  },
+  {
+    "id": "side_carrier_shotgun_plastic",
+    "copy-from": "side_carrier_shotgun_cloth",
+    "type": "GUNMOD",
+    "name": "plastic side carrier",
+    "//": "https://www.amazon.com/dp/B09PDJQ6PN",
+    "description": "A piece of plastic with six clips to hold shotgun shells for easy access.  The holder adheres to the receiver of a shotgun, holding the shells perpendicular with the gun.",
+    "volume": "290 ml",
+    "price": "5 USD",
+    "material": [ "plastic" ],
+    "pocket_mods": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "ammo_restriction": { "20x66mm": 6, "410shot": 6, "shot": 6 },
+        "moves": 20
+      }
+    ]
   }
 ]

data/json/items/gunmod/stock.json

@@ -111,6 +111,41 @@
     "handling_modifier": -10,
     "flags": [ "FOLDED_STOCK" ]
   },
+  {
+    "id": "stock_mag_pouch",
+    "type": "GUNMOD",
+    "name": { "str": "buttstock magazine pouch", "str_pl": "buttstock magazine pouches" },
+    "description": "A pouch for one or two magazines that slips over the butt of a long arm.  Incompatible with bullpup weapons, whose actions are located in the stock.",
+    "weight": "91 g",
+    "volume": "250 ml",
+    "price": "25 USD",
+    "price_postapoc": "2 USD",
+    "install_time": "5 m",
+    "material": [ "nylon" ],
+    "symbol": "[",
+    "color": "green",
+    "location": "stock accessory",
+    "mod_targets": [ "rifle", "shotgun" ],
+    "min_skills": [ [ "weapon", 1 ] ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_item_length": "240 mm",
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "2 kg",
+        "moves": 40,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_item_length": "240 mm",
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "2 kg",
+        "moves": 40,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      }
+    ]
+  },
   {
     "id": "wire_stock",
     "type": "GUNMOD",
@@ -156,6 +191,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 reproductions that use magazines, but a gun with an extended magazine won't fit without modification.",
+    "copy-from": "pistol_stock",
+    "volume": "680 ml",
+    "integral_volume": "680 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",
@@ -431,5 +507,139 @@
         "max_contains_weight": "200 g"
       }
     ]
+  },
+  {
+    "id": "shotshell_stock",
+    "type": "GUNMOD",
+    "name": { "str": "speedload shotgun stock" },
+    "description": "A fixed stock with two spring-loaded tubes, each holding two shotshells.",
+    "weight": "350 g",
+    "volume": "500 ml",
+    "integral_volume": "0 ml",
+    "integral_weight": "0 g",
+    "price": "400 USD",
+    "price_postapoc": "5 USD",
+    "install_time": "10 m",
+    "to_hit": 1,
+    "material": [ "plastic" ],
+    "symbol": ":",
+    "color": "dark_gray",
+    "location": "stock",
+    "mod_targets": [ "shotgun" ],
+    "melee_damage": { "bash": 6 },
+    "pocket_mods": [
+      {
+        "description": "Shotshell tube.",
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "ammo_restriction": { "20x66mm": 2, "410shot": 2, "shot": 2 }
+      },
+      {
+        "description": "Shotshell tube.",
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "ammo_restriction": { "20x66mm": 2, "410shot": 2, "shot": 2 }
+      }
+    ],
+    "min_skills": [ [ "weapon", 2 ] ]
+  },
+  {
+    "id": "stock_ammo_loops_canvas",
+    "type": "GUNMOD",
+    "name": { "str": "buttstock ammunition loops" },
+    "description": "Cloth loops on the shoulder stock of a long arm holding five to 10 individual shotshells or rifle cartridges.",
+    "weight": "91 g",
+    "volume": "200 ml",
+    "price": "25 USD",
+    "price_postapoc": "2 USD",
+    "install_time": "5 m",
+    "material": [ "canvas" ],
+    "symbol": ":",
+    "color": "white",
+    "location": "stock accessory",
+    "mod_targets": [ "rifle", "shotgun" ],
+    "min_skills": [ [ "weapon", 0 ] ],
+    "pocket_mods": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": false,
+        "ammo_restriction": {
+          "20x66mm": 5,
+          "22": 10,
+          "223": 10,
+          "270win": 8,
+          "300blk": 7,
+          "545x39": 10,
+          "3006": 7,
+          "123ln": 7,
+          "303": 7,
+          "77mm_arisaka": 7,
+          "308": 7,
+          "300": 7,
+          "762": 7,
+          "762R": 7,
+          "8x40mm": 7,
+          "4570": 5,
+          "50beowulf": 5,
+          "450": 5,
+          "410shot": 5,
+          "338lapua": 6,
+          "50": 5,
+          "458wm": 5,
+          "shot": 5
+        },
+        "moves": 20
+      }
+    ]
+  },
+  {
+    "id": "stock_ammo_loops_leather",
+    "type": "GUNMOD",
+    "name": { "str": "buttstock ammunition loops" },
+    "description": "Leather loops on the shoulder stock of a long arm holding five to 10 individual shotshells or rifle cartridges.",
+    "copy-from": "stock_ammo_loops_canvas",
+    "material": [ "leather" ],
+    "color": "brown"
+  },
+  {
+    "id": "stock_ammo_loops_plastic",
+    "type": "GUNMOD",
+    "name": { "str": "buttstock ammunition clips" },
+    "description": "Plastic clips on the shoulder stock of a long arm holding five to 10 individual shotshells or rifle cartridges.",
+    "copy-from": "stock_ammo_loops_canvas",
+    "material": [ "plastic" ],
+    "color": "white",
+    "pocket_mods": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "ammo_restriction": {
+          "20x66mm": 5,
+          "22": 10,
+          "223": 10,
+          "270win": 8,
+          "300blk": 7,
+          "545x39": 10,
+          "3006": 7,
+          "123ln": 7,
+          "303": 7,
+          "77mm_arisaka": 7,
+          "308": 7,
+          "300": 7,
+          "762": 7,
+          "762R": 7,
+          "8x40mm": 7,
+          "4570": 5,
+          "50beowulf": 5,
+          "450": 5,
+          "410shot": 5,
+          "338lapua": 6,
+          "50": 5,
+          "458wm": 5,
+          "shot": 5
+        },
+        "moves": 20
+      }
+    ]
   }
 ]

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 handuns, 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 existing compensators, suppressors, etc.",
+    "weight": "179 g",
+    "volume": "66 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 ] ]
   }
 ]