Magazine Audit - 66mm, 40mm, .357SIG, .40S&W, .380, .303, .300WM

data/json/items/armor/ammo_pouch.json

@@ -563,7 +563,6 @@
         "magazine_well": "350 ml",
         "pocket_type": "CONTAINER",
         "holster": true,
-        "min_item_volume": "300 ml",
         "max_contains_volume": "1000 ml",
         "max_contains_weight": "2 kg",
         "max_item_length": "30 cm",
@@ -573,51 +572,41 @@
       {
         "pocket_type": "CONTAINER",
         "max_item_length": "300 mm",
-        "min_item_volume": "250 ml",
         "max_contains_volume": "1 L",
         "max_contains_weight": "2 kg",
-        "flag_restriction": [ "MAG_COMPACT", "MAG_BULKY" ],
-        "moves": 60,
+        "moves": 100,
         "volume_encumber_modifier": 0.25
       },
       {
         "pocket_type": "CONTAINER",
         "max_item_length": "300 mm",
-        "min_item_volume": "250 ml",
         "max_contains_volume": "1 L",
         "max_contains_weight": "2 kg",
-        "flag_restriction": [ "MAG_COMPACT", "MAG_BULKY" ],
-        "moves": 60,
+        "moves": 100,
         "volume_encumber_modifier": 0.25
       },
       {
         "pocket_type": "CONTAINER",
         "max_item_length": "250 mm",
-        "min_item_volume": "200 ml",
         "max_contains_volume": "800 ml",
         "max_contains_weight": "1600 g",
-        "flag_restriction": [ "MAG_COMPACT", "MAG_BULKY" ],
-        "moves": 60,
+        "moves": 100,
         "volume_encumber_modifier": 0.25
       },
       {
         "pocket_type": "CONTAINER",
         "max_item_length": "250 mm",
-        "min_item_volume": "200 ml",
         "max_contains_volume": "800 ml",
         "max_contains_weight": "1600 g",
-        "flag_restriction": [ "MAG_COMPACT", "MAG_BULKY" ],
-        "moves": 60,
+        "moves": 100,
         "volume_encumber_modifier": 0.25
       },
       {
         "pocket_type": "CONTAINER",
         "max_item_length": "250 mm",
-        "min_item_volume": "200 ml",
         "max_contains_volume": "800 ml",
         "max_contains_weight": "1600 g",
-        "flag_restriction": [ "MAG_COMPACT", "MAG_BULKY" ],
-        "moves": 60,
+        "moves": 100,
         "volume_encumber_modifier": 0.25
       },
       {

data/json/items/magazine/10mm.json

@@ -1,15 +1,16 @@
 [
   {
     "id": "40_speedloader6",
+    "//": "Values copied from .44 Speedloader.",
     "looks_like": "38_speedloader",
     "type": "MAGAZINE",
     "name": { "str": "10mm 6-round speedloader" },
     "description": "This speedloader can hold 6 rounds of .40 S&W or 10mm Auto and quickly reload a compatible revolver.",
-    "weight": "92 g",
-    "volume": "250 ml",
+    "weight": "28 g",
+    "volume": "25 ml",
     "price": 1500,
     "price_postapoc": 100,
-    "material": "steel",
+    "material": [ "plastic", "steel" ],
     "symbol": "#",
     "color": "light_gray",
     "ammo_type": [ "40", "10mm" ],

data/json/items/magazine/300.json

@@ -1,12 +1,14 @@
 [
   {
     "id": "m2010mag",
+    "//": "Dimensions and weight from manufacturer of a .300WM Long Action Magazine.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "M2010 5-round magazine" },
     "description": "A 5-round box magazine used with the M2010 ESR sniper rifle.",
-    "weight": "78 g",
-    "volume": "250 ml",
+    "weight": "207 g",
+    "volume": "186 ml",
+    "longest_side": "102 mm",
     "price": 3500,
     "price_postapoc": 100,
     "material": [ "steel" ],
@@ -18,13 +20,14 @@
   },
   {
     "id": "ruger_pr_mag",
+    "//": "Dimension from ImageJ, weight is ratio of M2010 magazine: 1.11 g/ml.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "Ruger Precision Rifle 5-round magazine" },
     "description": "A single-stack, 5-round, detachable magazine compatible with the Ruger Precision Rifle.  Holding five rounds of.300 Winchester Magnum, the magazine is styled along the lines of Accuracy International’s magnum magazines, the latter of which has become the gold standard for precision weapon magazines.",
-    "weight": "78 g",
-    "volume": "250 ml",
-    "longest_side": "98 mm",
+    "weight": "188 g",
+    "volume": "169 ml",
+    "longest_side": "101 mm",
     "price": 9099,
     "price_postapoc": 100,
     "material": [ "steel" ],

data/json/items/magazine/303.json

@@ -1,14 +1,14 @@
 [
   {
     "id": "enfield_303mag",
+    "//": "Dimensions from Royal Armory blueprints, weight from vendor.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "10-round Enfield magazine" },
     "description": "A steel 10-round magazine, for use in .303 caliber Enfield rifles.",
-    "weight": "157 g",
-    "volume": "300 ml",
-    "//": "Couldn’t find exact length/ size information for Enfield rifle magazines, so had to do some estimations based on comparable mags.",
-    "longest_side": "100 mm",
+    "weight": "160 g",
+    "volume": "138 ml",
+    "longest_side": "85 mm",
     "price": 6445,
     "price_postapoc": 500,
     "material": [ "steel" ],
@@ -27,13 +27,14 @@
   },
   {
     "id": "clip303_5rd",
+    "//": "Copied from 7.62x54R Clip.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": ".303 5-round charger clip" },
     "description": "A tiny piece of grooved metal designed to allow a shooter to quickly load five .303 British rounds into a magazine.",
     "weight": "9 g",
-    "volume": "10 ml",
-    "longest_side": "10 cm",
+    "volume": "3 ml",
+    "longest_side": "74 mm",
     "material": [ "steel" ],
     "symbol": "#",
     "color": "light_gray",

data/json/items/magazine/357sig.json

@@ -1,12 +1,14 @@
 [
   {
     "id": "p226mag_12rd_357sig",
+    "//": "Copied from Beretta 12rd .40S&W magazine.",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "P226 .357 SIG 12-round magazine" },
     "description": "A 12-round double stack box magazine for a SIG P226 chambered for .357 SIG rounds.",
-    "weight": "150 g",
-    "volume": "250 ml",
+    "weight": "95 g",
+    "volume": "77 ml",
+    "longest_side": "12 cm",
     "price": 3000,
     "price_postapoc": 100,
     "material": [ "steel" ],
@@ -18,15 +20,17 @@
   },
   {
     "id": "p320mag_13rd_357sig",
+    "//": "Copied from Beretta 12rd .40S&W magazine.",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "P320 .357 SIG 13-round magazine" },
     "description": "A 13-round double stack box magazine for the SIG Sauer P320.",
-    "weight": "105 g",
-    "volume": "250 ml",
+    "weight": "95 g",
+    "volume": "77 ml",
+    "longest_side": "12 cm",
     "price": 2900,
     "price_postapoc": 100,
-    "material": [ "plastic" ],
+    "material": [ "plastic", "steel" ],
     "symbol": "#",
     "color": "light_gray",
     "ammo_type": [ "357sig" ],

data/json/items/magazine/380.json

@@ -1,12 +1,14 @@
 [
   {
     "id": "kp3atmag",
+    "//": "Previously audited, longest_side estimated.",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "P-3AT 6-round magazine" },
     "description": "A standard 6-round steel box magazine for the Kel-Tec P-3AT.",
     "weight": "60 g",
     "volume": "44 ml",
+    "longest_side": "9 cm",
     "price": 1900,
     "price_postapoc": 100,
     "material": [ "steel" ],
@@ -18,12 +20,14 @@
   },
   {
     "id": "fn1910mag",
+    "//": "Audited with ImageJ, weight estimated.",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "FN 1910 6-round magazine" },
     "description": "A standard 6-round steel box magazine for the FN 1910.  It looks a bit old.",
-    "weight": "80 g",
-    "volume": "60ml",
+    "weight": "40 g",
+    "volume": "33 ml",
+    "longest_side": "93 mm",
     "price": 3500,
     "price_postapoc": 100,
     "material": [ "steel" ],
@@ -35,12 +39,14 @@
   },
   {
     "id": "rugerlcpmag",
+    "//": "Audited with ImageJ, weight estimated.",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "LCP 6-round magazine" },
     "description": "A standard 6-round capacity magazine for the Ruger LCP pistol.",
-    "weight": "65 g",
-    "volume": "60ml",
+    "weight": "35 g",
+    "volume": "29 ml",
+    "longest_side": "86 mm",
     "price": 2200,
     "price_postapoc": 100,
     "material": [ "steel" ],
@@ -52,12 +58,14 @@
   },
   {
     "id": "mac11mag",
+    "//": "Values copied from Mac10 magazine.",
     "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": { "str": "MAC-11 32-round magazine" },
     "description": "A cheap 32-round steel box magazine for use with the MAC-11 SMG.",
-    "weight": "200 g",
-    "volume": "737ml",
+    "weight": "221 g",
+    "volume": "184 ml",
+    "longest_side": "21 cm",
     "price": 4500,
     "price_postapoc": 100,
     "material": [ "steel" ],
@@ -69,12 +77,14 @@
   },
   {
     "id": "hptcf380mag_8rd",
+    "//": "Audited with ImageJ, weight estimated.",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "CF-380 8-round magazine" },
     "description": "An 8-round steel box magazine for use with the Hi-Point CF-380.  Does not fit the Hi-Point 3895 carbine.",
-    "weight": "110 g",
-    "volume": "236 ml",
+    "weight": "40 g",
+    "volume": "33 ml",
+    "longest_side": "9 cm",
     "price": 2500,
     "price_postapoc": 100,
     "material": [ "steel" ],
@@ -86,12 +96,14 @@
   },
   {
     "id": "hptcf380mag_10rd",
+    "//": "Audited with ImageJ, weight estimated.",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "CF-380 10-round magazine" },
     "description": "A 10-round steel box magazine for use with the Hi-Point CF-380.  Does not fit the Hi-Point 3895 carbine.",
-    "weight": "110 g",
-    "volume": "236 ml",
+    "weight": "77 g",
+    "volume": "64 ml",
+    "longest_side": "12 cm",
     "price": 2500,
     "price_postapoc": 100,
     "material": [ "steel" ],
@@ -111,12 +123,14 @@
   },
   {
     "id": "taurus_spectrum_mag",
+    "//": "Audited with comparison.",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "Taurus Spectrum 6-round magazine" },
     "description": "A compact, 6-round steel box magazine for use with the Taurus Spectrum.",
-    "weight": "65 g",
-    "volume": "74 ml",
+    "weight": "36 g",
+    "volume": "30 ml",
+    "longest_side": "9 cm",
     "price": 3400,
     "price_postapoc": 100,
     "material": [ "steel" ],