Magazine Audit - 12g, .30-06, .338LM, .38 Super, .410, .460 Rowland, …

….50BMG (CleverRaven#70912) * Correct .410 Magazine Dimensions/Weight * Correct 12G Magazine Dimensions/Weight * Correct .338LM Magazine Dimensions/Weight * Correct .50BMG Magazine Dimensions/Weight * Correct .38 Super Magazine Dimensions/Weight * Correct .30-06 Magazine Dimensions/Weight * Correct .460 Rowland Magazine Dimensions/Weight This also includes .45 1911 magazines. * Fix wrong values in .338LM
ANickelN · Jan 14, 2024 · b89e0cd · b89e0cd
1 parent 1f15f20
commit b89e0cd
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 57 deletions.
diff --git a/data/json/items/magazine/3006.json b/data/json/items/magazine/3006.json
@@ -1,13 +1,14 @@
 [
   {
     "id": "3006_clip",
+    "//": "Copied from 7.62x54R Clip values.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": ".30-06 5-round clip" },
     "description": "A tiny piece of grooved metal designed to allow a shooter to quickly load five .30-06 rounds into a compatible firearm.",
-    "weight": "40 g",
-    "volume": "10 ml",
-    "longest_side": "9 cm",
+    "weight": "9 g",
+    "volume": "3 ml",
+    "longest_side": "74 mm",
     "price": 500,
     "price_postapoc": 50,
     "material": [ "steel" ],
@@ -19,6 +20,7 @@
   },
   {
     "id": "blrmag",
+    "//": "Previous PR, looks mostly accurate.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "Browning BLR 4-round magazine" },
@@ -37,6 +39,7 @@
   },
   {
     "id": "garandclip",
+    "//": "Previous PR, looks mostly accurate.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "M1 Garand 8-round clip" },
@@ -60,9 +63,9 @@
     "type": "MAGAZINE",
     "name": { "str": "BAR 30-round magazine" },
     "description": "An aftermarket magazine for use with the Browning Automatic Rifle, holds 30 rounds.",
-    "weight": "300 g",
-    "volume": "500 ml",
-    "longest_side": "24 cm",
+    "weight": "239 g",
+    "volume": "415 ml",
+    "longest_side": "188 mm",
     "price": 8500,
     "price_postapoc": 250,
     "material": [ "steel" ],
@@ -80,9 +83,9 @@
     "name": { "str": "BAR 20-round magazine" },
     "//": "Compatible magazines made for reproductions exist, and the standard-capacity mags are fairly cheap compared to variants.",
     "description": "A standard capacity magazine for use with the Browning Automatic Rifle, holds 20 rounds.",
-    "weight": "200 g",
-    "volume": "350 ml",
-    "longest_side": "15 cm",
+    "weight": "184 g",
+    "volume": "319 ml",
+    "longest_side": "145 mm",
     "price": 3600,
     "price_postapoc": 100,
     "material": [ "steel" ],

diff --git a/data/json/items/magazine/338lapua.json b/data/json/items/magazine/338lapua.json
@@ -1,12 +1,14 @@
 [
   {
     "id": "ai_338mag",
+    "//": "Audited with dimensions/weight from vendor.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "AI .338 Lapua 5-round magazine" },
     "description": "A single-stack, 5-round steel box magazine, produced by the British precision rifle company, Accuracy International.  Magazines such as this one have been regarded as the gold standard for marksman rifle magazines, with this particular one being compatible with both the .338 Lapua and .300 Winchester Magnum cartridges.",
-    "weight": "78 g",
-    "volume": "250 ml",
+    "weight": "215 g",
+    "volume": "164 ml",
+    "longest_side": "94 mm",
     "price": 10614,
     "price_postapoc": 150,
     "material": [ "steel" ],
@@ -18,12 +20,14 @@
   },
   {
     "id": "ai_338mag_10",
+    "//": "Audited with ImageJ.  Weight from ratio method.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "AI .338 Lapua 10-round magazine" },
-    "description": "A single-stack, 10-round steel box magazine, produced by the British precision rifle company, Accuracy International.  Magazines such as this one have been regarded as the gold standard for marksman rifle magazines, with this particular one being compatible with both the .338 Lapua and .300 Winchester Magnum cartridges.",
-    "weight": "160 g",
-    "volume": "400 ml",
+    "description": "A double-stack, 10-round steel box magazine, produced by the British precision rifle company, Accuracy International.  Magazines such as this one have been regarded as the gold standard for marksman rifle magazines, with this particular one being compatible with both the .338 Lapua and .300 Winchester Magnum cartridges.",
+    "weight": "298 g",
+    "volume": "233 ml",
+    "longest_side": "95 mm",
     "price": 16856,
     "price_postapoc": 150,
     "material": [ "steel" ],
@@ -35,15 +39,17 @@
   },
   {
     "id": "mrad_338lapua_mag",
+    "//": "Audited with ImageJ.  Weight from vendor.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "Barrett .338 Lapua 10-round magazine" },
     "description": "A standard 10-round box magazine which can hold up to 10 .338 Lapua rounds, and is compatible with appropriately chambered Barrett rifles.",
-    "weight": "200 g",
-    "volume": "400 ml",
+    "weight": "195 g",
+    "volume": "245 ml",
+    "longest_side": "10 cm",
     "price": 8000,
     "price_postapoc": 250,
-    "material": [ "steel" ],
+    "material": [ "plastic" ],
     "symbol": "#",
     "color": "light_gray",
     "ammo_type": [ "338lapua" ],

diff --git a/data/json/items/magazine/38super.json b/data/json/items/magazine/38super.json
@@ -1,12 +1,14 @@
 [
   {
     "id": "af2011a1mag",
+    "//": "Volume and weight through comparison.",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "AF2011A1 16-round double magazine" },
     "description": "Two .38 Super 8-round box magazines attached to a single base plate, holding up to 16 rounds in total, used by the AF2011A1 double-barrel pistol.",
-    "weight": "140 g",
-    "volume": "500 ml",
+    "weight": "113 g",
+    "volume": "60 ml",
+    "longest_side": "10 cm",
     "price": 10000,
     "price_postapoc": 100,
     "material": [ "plastic", "steel" ],
@@ -18,12 +20,14 @@
   },
   {
     "id": "m1911mag_10rd_38super",
+    "//": "Audited with ImageJ.  Weight from comparison.",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "M1911 .38 Super 9-round magazine" },
     "description": "A compact, single stack box magazine for an M1911 chambered in .38 Super.",
-    "weight": "80 g",
-    "volume": "250 ml",
+    "weight": "62 g",
+    "volume": "33 ml",
+    "longest_side": "11 cm",
     "price": 3400,
     "price_postapoc": 100,
     "material": [ "steel" ],

diff --git a/data/json/items/magazine/410shot.json b/data/json/items/magazine/410shot.json
@@ -1,12 +1,13 @@
 [
   {
     "id": "saiga410mag_10rd",
+    "//": "Audited with ImageJ.  Weight from comparison.",
     "looks_like": "shotbelt_20",
     "type": "MAGAZINE",
     "name": { "str": "Saiga-410 10-round magazine" },
     "description": "A removable plastic box magazine for the Saiga-410 shotgun.  Holds 10 shells.",
-    "weight": "210 g",
-    "volume": "500 ml",
+    "weight": "178 g",
+    "volume": "407 ml",
     "price": 4500,
     "price_postapoc": 100,
     "material": [ "plastic" ],
@@ -18,12 +19,13 @@
   },
   {
     "id": "saiga410mag_30rd",
+    "//": "Audited with ImageJ.  Weight from comparison.",
     "looks_like": "shotbelt_20",
     "type": "MAGAZINE",
     "name": { "str": "Saiga-410 30-round drum magazine" },
     "description": "A removable plastic drum magazine for the Saiga-410 shotgun.  Holds 30 shells.",
-    "weight": "460 g",
-    "volume": "1 L",
+    "weight": "340 g",
+    "volume": "777 ml",
     "price": 11000,
     "price_postapoc": 500,
     "material": [ "plastic" ],

diff --git a/data/json/items/magazine/460.json b/data/json/items/magazine/460.json
@@ -1,11 +1,13 @@
 [
   {
     "id": "m1911bigmag",
+    "//": "Audited from IRL measurements.",
     "type": "MAGAZINE",
     "name": { "str": "M1911 10-round magazine" },
     "description": "An extended 10-round magazine for use with the M1911 handgun.",
-    "weight": "100 g",
-    "volume": "500 ml",
+    "weight": "79 g",
+    "volume": "74 ml",
+    "longest_side": "155 mm",
     "price": 3720,
     "price_postapoc": 250,
     "material": [ "steel" ],
@@ -17,6 +19,7 @@
   },
   {
     "id": "m1911mag",
+    "//": "Previous PR, looks good.",
     "type": "MAGAZINE",
     "name": { "str": "M1911 7-round magazine" },
     "description": "A military issue 7-round magazine for use with the M1911 handgun.",

diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json
@@ -12,13 +12,15 @@
   },
   {
     "id": "m107a1mag",
+    "//": "Audited with ImageJ.  Weight from previous PR.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "Barrett 10-round magazine" },
-    "//": "Fully loaded 10 magazine, presumably loaded with the 114.7 gram M33 Ball cartridge, weighs 1868.801 grams. Source inetres.com",
+    "//2": "Fully loaded 10 magazine, presumably loaded with the 114.7 gram M33 Ball cartridge, weighs 1868.801 grams. Source inetres.com",
     "description": "A standard 10-round box magazine for the Barrett M107A1 anti-materiel rifle.",
     "weight": "727 g",
-    "volume": "500 ml",
+    "volume": "858 ml",
+    "longest_side": "15 cm",
     "price": 10000,
     "price_postapoc": 250,
     "material": [ "steel" ],
@@ -31,12 +33,14 @@
   },
   {
     "id": "as50mag",
+    "//": "Audited with ImageJ.  Weight compared with M107A1.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
-    "name": { "str": "AS50 10-round magazine" },
-    "description": "A 10-round box magazine for the Accuracy International AS50 anti-materiel rifle.",
-    "weight": "750 g",
-    "volume": "500 ml",
+    "name": { "str": "AS50 5-round magazine" },
+    "description": "A 5-round box magazine for the Accuracy International AS50 anti-materiel rifle.",
+    "weight": "386 g",
+    "volume": "455 ml",
+    "longest_side": "133 mm",
     "price": 12000,
     "price_postapoc": 250,
     "material": [ "steel" ],
@@ -45,16 +49,18 @@
     "ammo_type": [ "50" ],
     "reload_time": 110,
     "flags": [ "MAG_BULKY" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "50": 10 } } ]
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "50": 5 } } ]
   },
   {
     "id": "tac50mag",
+    "//": "No audit, just copied AS-50 magazine.",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "TAC-50 5-round magazine" },
     "description": "A 5-round box magazine for the McMillan TAC-50 anti-materiel rifle.",
-    "weight": "730 g",
-    "volume": "500 ml",
+    "weight": "386 g",
+    "volume": "455 ml",
+    "longest_side": "133 mm",
     "price": 15000,
     "price_postapoc": 250,
     "material": [ "steel" ],