More MP5 and USP9 magazines.

Also optimizations and bugfixes.

13 files changed, 330 insertions, 94 deletions

diff --git a/Readme.txt b/Readme.txt
index 09a1c9a..3b159a3 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -12,6 +12,8 @@ PSG1 A1
 MSG90 A2
 G11 K2 and magazine and ammo and ammo recipes
 CAWS and magazine and ammo and ammo recipes
+More USP9 magainzes
+More MP5 magaxines
 
 Item Names tweaked:
 USP 9mm and magazine
diff --git a/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index 122117f..c0e5b54 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -14,7 +14,12 @@
     "id": "mags_military",
     "//": "_DEPRECATED_ Older military magazines still in service.",
     "items": [
+      [ "usp9mag_10rd", 10 ],
+      [ "usp9mag_18rd", 10 ],
+      [ "usp9mag_20rd", 10 ],
+      [ "usp9mag_32rd", 10 ],
       [ "usp40mag", 10 ]
+      
     ]
   },
   {
@@ -22,8 +27,18 @@
     "id": "mags_swat",
     "//": "Magazines issued to paramilitary forces in addition to standard police issue.",
     "items": [
+      [ "mp5mag_100rd", 15 ],
+      [ "mp5mag_40rd", 20 ],
+      [ "mp5mag_38rd", 20 ],
+      [ "mp5mag_20rd", 20 ],
+      [ "mp5mag_15rd", 20 ],
+      [ "mp5mag_10rd", 20 ],
       [ "ump9mag", 20 ],
       [ "ump40mag", 20 ],
+      [ "usp9mag_10rd", 10 ],
+      [ "usp9mag_18rd", 10 ],
+      [ "usp9mag_20rd", 10 ],
+      [ "usp9mag_32rd", 10 ],
       [ "usp40mag", 10 ],
       [ "p309mag", 10 ],
       [ "p3040mag", 10 ],
@@ -35,6 +50,12 @@
     "id": "mags_smg_common",
     "//": "Factory specification SMG magazines commonly owned by citizens.",
     "items": [
+      [ "mp5mag_100rd", 5 ],
+      [ "mp5mag_40rd", 5 ],
+      [ "mp5mag_38rd", 5 ],
+      [ "mp5mag_20rd", 5 ],
+      [ "mp5mag_15rd", 5 ],
+      [ "mp5mag_10rd", 5 ],
       [ "ump9mag", 5 ],
       [ "ump40mag", 5 ]
     ]
diff --git a/json/items/gun/45.json b/json/items/gun/45.json
index 99aa47e..22176ff 100644
--- a/json/items/gun/45.json
+++ b/json/items/gun/45.json
@@ -1,14 +1,13 @@
 [
   {
     "id": "usp_45",
-    "copy-from": "usp_45",
-    "looks_like": "glock_17",
+    "copy-from": "pistol_base",
     "type": "GUN",
     "name": { "str_sp": "H&K USP .45" },
     "description": "A popular pistol, widely used among law enforcement.  Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.",
     "weight": "789 g",
-    "volume": "500 ml",
-    "price": 68000,
+    "volume": "483 ml",
+    "price": 70000,
     "price_postapoc": 2500,
     "to_hit": -2,
     "bashing": 8,
@@ -22,8 +21,7 @@
     "blackpowder_tolerance": 48,
     "min_cycle_recoil": 450,
     "magazine_well": "250 ml",
-    "magazines": [ [ "45", [ "usp45mag" ] ] ],
-    "delete": { "built_in_mods": [ "match_trigger" ] }
+    "magazines": [ [ "45", [ "usp45mag" ] ] ]
   },
   {
     "id": "hk_45",
@@ -41,12 +39,11 @@
   },
   {
     "id": "hk_ump45",
-    "looks_like": "hk_mp5",
+    "copy-from": "smg_base",
     "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str_sp": "H&K UMP45" },
+    "name": { "str": "H&K UMP45" },
     "description": "Developed as a successor to the MP5 submachine gun, the UMP45 retains the earlier model's supreme accuracy and low recoil, but in the higher .45 caliber.",
-    "weight": "2500 g",
+    "weight": "2300 g",
     "volume": "1250 ml",
     "price": 290000,
     "price_postapoc": 3000,
@@ -57,27 +54,11 @@
     "symbol": "(",
     "color": "dark_gray",
     "ammo": "45",
-    "skill": "smg",
     "ranged_damage": { "damage_type": "bullet", "amount": 1 },
     "dispersion": 240,
     "durability": 8,
     "min_cycle_recoil": 540,
     "modes": [ [ "DEFAULT", "semi", 1 ], [ "BURST", "burst", 2 ],  [ "AUTO", "auto", 4 ] ],
-    "valid_mod_locations": [
-      [ "accessories", 3 ],
-      [ "barrel", 1 ],
-      [ "bore", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 4 ],
-      [ "muzzle", 1 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "stock", 1 ],
-      [ "underbarrel", 1 ]
-    ],
-    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
     "magazines": [ [ "45", [ "ump45mag", "ump45_makeshiftmag" ] ] ]
   }
 ]
diff --git a/json/items/gun/46.json b/json/items/gun/46.json
index 72d4f2e..05dc0dd 100644
--- a/json/items/gun/46.json
+++ b/json/items/gun/46.json
@@ -6,7 +6,7 @@
     "name": { "str_sp": "H&K UCP" },
     "description": "The Heckler & Koch UCP is a small, very high capacity pistol designed to counter most common body armors.",
     "weight": "730 g",
-    "volume": "500 ml",
+    "volume": "460 ml",
     "price": 125000,
     "price_postapoc": 2150,
     "to_hit": -2,
@@ -38,14 +38,42 @@
   },
   {
     "id": "hk_mp7",
-    "copy-from": "hk_mp7",
+    "copy-from": "smg_base",
     "type": "GUN",
-    "name": { "str_sp": "H&K MP7A2" },
+    "name": { "str": "H&K MP7A2" },
+    "description": "Designed as a personal defense weapon, the MP7 fires the high-powered 4.6x30mm round while being lightweight, compact in size, and practically recoil-free.",
     "weight": "1960 g",
     "volume": "1000 ml",
-    "bashing": 10,
+    "barrel_length": "250 ml",
+    "price": 175000,
+    "price_postapoc": 3000,
+    "to_hit": -2,
+    "bashing": 7,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "46" ],
+    "skill": "smg",
     "ranged_damage": { "damage_type": "bullet", "amount": 1 },
+    "dispersion": 260,
+    "durability": 8,
+    "min_cycle_recoil": 81,
+    "modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 5 ] ],
     "built_in_mods": [ "folding_stock" ],
+    "valid_mod_locations": [
+      [ "accessories", 3 ],
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "magazine_well": "250 ml",
     "magazines": [ [ "46", [ "hk46bigmag", "hk46midmag", "hk46mag" ] ] ]
   }
 ]
diff --git a/json/items/gun/9mm.json b/json/items/gun/9mm.json
index 1961e2b..4c8fc0d 100644
--- a/json/items/gun/9mm.json
+++ b/json/items/gun/9mm.json
@@ -1,10 +1,25 @@
 [
   {
     "id": "usp_9mm",
-    "copy-from": "usp_9mm",
+    "copy-from": "pistol_base",
     "type": "GUN",
     "name": { "str_sp": "H&K USP 9mm" },
-    "weight": "748 g"
+    "description": "A popular pistol, widely used among law enforcement.  Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.",
+    "weight": "748 g",
+    "volume": "460 ml",
+    "price": 68000,
+    "price_postapoc": 2500,
+    "to_hit": -2,
+    "material": [ "steel", "plastic" ],
+    "color": "dark_gray",
+    "ammo": "9mm",
+    "ranged_damage": { "damage_type": "bullet", "amount": -1 },
+    "dispersion": 400,
+    "durability": 9,
+    "blackpowder_tolerance": 48,
+    "min_cycle_recoil": 450,
+    "magazine_well": "250 ml",
+    "magazines": [ [ "9mm", [ "usp9mag", "usp9mag_10rd", "usp9mag_18rd", "usp9mag_20rd", "usp9mag_32rd" ] ] ]
   },
   {
     "id": "hk_p30_9",
@@ -25,7 +40,16 @@
     "type": "GUN",
     "name": { "str_sp": "H&K MP5A4" },
     "weight": "2540 g",
-    "volume": "1750 ml"
+    "volume": "1750 ml",
+    "magazines": [ [ "9mm", [ "mp5mag", "mp5mag_10rd", "mp5mag_15rd", "mp5mag_20rd", "mp5mag_38rd", "mp5mag_40rd", "mp5bigmag", "mp5mag_100rd" ] ] ]
+  },
+  {
+    "id": "hk_mp5sd",
+    "copy-from": "hk_mp5sd",
+    "type": "GUN",
+    "name": { "str_sp": "H&K MP5SD" },
+    "volume": "2000 ml",
+    "magazines": [ [ "9mm", [ "mp5mag", "mp5mag_10rd", "mp5mag_15rd", "mp5mag_20rd", "mp5mag_38rd", "mp5mag_40rd", "mp5bigmag", "mp5mag_100rd" ] ] ]
   },
   {
     "id": "hk_mp5k",
@@ -33,14 +57,8 @@
     "type": "GUN",
     "name": { "str_sp": "H&K MP5K-PDW" },
     "weight": "2530 g",
-    "volume": "1250 ml"
-  },
-  {
-    "id": "hk_mp5sd",
-    "copy-from": "hk_mp5sd",
-    "type": "GUN",
-    "name": { "str_sp": "H&K MP5SD" },
-    "volume": "2000 ml"
+    "volume": "1250 ml",
+    "magazines": [ [ "9mm", [ "mp5mag", "mp5mag_10rd", "mp5mag_15rd", "mp5mag_20rd", "mp5mag_38rd", "mp5mag_40rd", "mp5bigmag", "mp5mag_100rd" ] ] ]
   },
   {
     "id": "hk_ump9",
diff --git a/json/items/gun/shot.json b/json/items/gun/shot.json
index 0c1a329..321c4c6 100644
--- a/json/items/gun/shot.json
+++ b/json/items/gun/shot.json
@@ -13,10 +13,11 @@
     "to_hit": -1,
     "bashing": 12,
     "material": [ "steel", "plastic" ],
-    "ranged_damage": 5,
-    "dispersion": 300,
-    "durability": 8,
+    "ranged_damage": { "damage_type": "bullet", "amount": 5 },
     "ammo": [ "shot" ],
+    "dispersion": 350,
+    "durability": 8,
+    "modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 2 ] ],
     "barrel_length": "81 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
@@ -31,7 +32,6 @@
       [ "underbarrel mount", 1 ]
     ],
     "magazine_well": "250 ml",
-    "modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 2 ] ],
     "magazines": [ [ "shot", [ "hk_caws_mag" ] ] ]
   }
 ]
diff --git a/json/items/magazine/223.json b/json/items/magazine/223.json
index 1129624..2bb0ca0 100644
--- a/json/items/magazine/223.json
+++ b/json/items/magazine/223.json
@@ -5,9 +5,9 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "H&K G36 30-round magazine" },
+    "description": "A standard capacity box magazine for use with the H&K G36 assault rifle.",
     "weight": "127 g", 
     "material": [ "plastic" ],
-    "description": "A standard capacity box magazine for use with the H&K G36 assault rifle.",
     "ammo_type": [ "223" ],
     "reliability": 9
   },
diff --git a/json/items/magazine/308.json b/json/items/magazine/308.json
index 50a4d02..c6b83fe 100644
--- a/json/items/magazine/308.json
+++ b/json/items/magazine/308.json
@@ -1,35 +1,47 @@
 [
   {
     "id": "hk417mag_20rd",
-    "copy-from": "hk417mag_20rd",
+    "looks_like": "stanag30",
     "type": "MAGAZINE",
-    "name": { "str": "H&K HK417 magazine" },
-    "description": "A 20 round double stack box magazine for the Heckler & Koch HK417 rifle.",
+    "name": { "str": "H&K HK417 20-round magazine" },
+    "description": "A 20-round double stack box magazine for the H&K HK417 rifle.",
+    "weight": "90 g",
+    "volume": "500 ml",
+    "price": 5600,
+    "price_postapoc": 250,
     "material": [ "plastic" ],
-    "weight": "90 g"
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "308" ],
+    "flags": [ "MAG_COMPACT" ],
+    "capacity": 20
   },
   {
     "id": "hk417mag_10rd",
-    "copy-from": "hk417mag_10rd",
+    "copy-from": "hk417mag_20rd",
     "type": "MAGAZINE",
-    "name": { "str": "H&K HK417 compact magazine" },
-    "description": "A 10 round double stack box magazine for the Heckler & Koch HK417 rifle.",
+    "name": { "str": "H&K HK417 10-round magazine" },
+    "description": "A 10-round double stack box magazine for the Heckler & Koch HK417 rifle.",
+    "weight": "55 g",
+    "volume": "250 ml",
+    "price": 5000,
+    "price_postapoc": 100,
     "material": [ "plastic" ],
-    "weight": "55 g"
+    "capacity": 10
   },
   {
     "id": "hk417_makeshiftmag",
     "copy-from": "hk417_makeshiftmag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K HK417 makeshift magazine" },
-    "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with Heckler & Koch HK417 rifle."
+    "name": { "str": "H&K HK417 5-round makeshift magazine" },
+    "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Heckler & Koch HK417 rifle."
   },
   {
     "id": "g3smallmag",
-    "looks_like": "stanag30",
+    "looks_like": "g3mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K PSG1 magazine" },
-    "description": "A 10-round aluminum box magazine for the H&K PSG1A1 rifle.",
+    "name": { "str": "H&K G3 10 round magazine" },
+    "description": "A 10-round aluminum box magazine for the H&K G3 rifle.",
     "weight": "75 g",
     "volume": "250 ml",
     "price": 4500,
@@ -38,8 +50,8 @@
     "symbol": "#",
     "color": "light_gray",
     "ammo_type": [ "308" ],
-    "capacity": 10,
     "reliability": 9,
-    "flags": [ "MAG_COMPACT" ]
+    "flags": [ "MAG_COMPACT" ],
+    "capacity": 10
   }
 ]
diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json
index 344187d..ec295bd 100644
--- a/json/items/magazine/45.json
+++ b/json/items/magazine/45.json
@@ -3,39 +3,49 @@
     "id": "ump45mag",
     "looks_like": "mp5mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K UMP45 magazine" },
+    "name": { "str": "H&K UMP45 25-round magazine" },
     "description": "A standard 25-round box magazine for use with the Heckler & Koch UMP45 SMG.",
-    "weight": "400 g",
+    "weight": "200 g",
     "volume": "500 ml",
     "price": 4950,
     "price_postapoc": 100,
-    "material": "steel",
+    "material": [ "plastic", "steel" ],
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "45",
-    "capacity": 25,
-    "reliability": 9,
-    "flags": [ "MAG_COMPACT" ]
+    "ammo_type": [ "45" ],
+    "flags": [ "MAG_COMPACT" ],
+    "capacity": 25
   },
   {
     "id": "ump45_makeshiftmag",
     "copy-from": "ump45_makeshiftmag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K UMP45 makeshift magazine" },
+    "name": { "str": "H&K UMP45 20-round makeshift magazine" },
     "description": "An improvised 20-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Heckler & Koch UMP45 SMG."
   },
   {
     "id": "usp45mag",
-    "copy-from": "usp45mag",
+    "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": { "str": "H&K USP .45 magazine" },
-    "description": "A standard capacity magazine for use with the Heckler & Koch USP .45 handgun."
+    "name": { "str": "H&K USP .45 12-round magazine" },
+    "description": "A standard capacity magazine for use with the Heckler & Koch USP .45 handgun.",
+    "weight": "60 g",
+    "volume": "250 ml",
+    "price": 5900,
+    "price_postapoc": 100,
+    "material": [ "plastic" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "45" ],
+    "reliability": 10,
+    "flags": [ "MAG_COMPACT" ],
+    "capacity": 12
   },
   {
     "id": "hk45mag",
     "copy-from": "usp45mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K HK45 magazine" },
+    "name": { "str": "H&K HK45 10-round magazine" },
     "description": "A standard capacity magazine for use with the Heckler & Koch HK45 handgun.",
     "capacity": 10
   }
diff --git a/json/items/magazine/46.json b/json/items/magazine/46.json
index 856a12f..80bf0fc 100644
--- a/json/items/magazine/46.json
+++ b/json/items/magazine/46.json
@@ -1,28 +1,41 @@
 [
   {
     "id": "hk46mag",
-    "looks_like": "mp5mag",
-    "copy-from": "hk46mag",
+    "//": "Overwrite to ensure other 4.6mm mags are based on this.",
+    "looks_like": "usp9mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K 4.6mm magazine" },
+    "name": { "str": "H&K 4.6mm 20-round magazine" },
     "description": "A standard capacity 20-round magazine for use with H&K's proprietary 4.6x30mm round.",
-    "weight": "100 g"
+    "weight": "100 g",
+    "volume": "250 ml",
+    "price": 4700,
+    "price_postapoc": 100,
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "46" ],
+    "flags": [ "MAG_COMPACT" ],
+    "capacity": 20
   },
   {
     "id": "hk46bigmag",
     "looks_like": "mp5mag",
-    "copy-from": "hk46bigmag",
+    "copy-from": "hk46mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K 4.6mm extended magazine" },
+    "name": { "str": "H&K 4.6mm 40-round magazine" },
     "description": "An extended 40-round magazine for use with H&K's proprietary 4.6x30mm round.",
-    "weight": "200 g"
+    "weight": "200 g",
+    "volume": "500 ml",
+    "price": 6300,
+    "price_postapoc": 500,
+    "capacity": 40
   },
   {
     "id": "hk46midmag",
     "looks_like": "hk46bigmag",
-    "copy-from": "hk46bigmag",
+    "copy-from": "hk46mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K 4.6mm expanded magazine" },
+    "name": { "str": "H&K 4.6mm 30-round magazine" },
     "description": "An expanded 30-round magazine for use with H&K's proprietary 4.6x30mm round.",
     "weight": "150 g",
     "volume": "375 ml",
diff --git a/json/items/magazine/473.json b/json/items/magazine/473.json
index 94a53b0..2806ab0 100644
--- a/json/items/magazine/473.json
+++ b/json/items/magazine/473.json
@@ -5,7 +5,7 @@
     "type": "MAGAZINE",
     "name": { "str": "H&K G11 magazine" },
     "description": "A 50 round box magazine for use with the Heckler & Koch G11 caseless assault rifle.",
-    "weight": "5 g",
+    "weight": "100 g",
     "volume": "500 ml",
     "price": 20000,
     "price_postapoc": 400,
@@ -13,9 +13,9 @@
     "symbol": "#",
     "color": "dark_gray",
     "ammo_type": [ "473" ],
-    "capacity": 50,
     "reliability": 10,
     "reload_time": 50,
-    "flags": [ "MAG_COMPACT" ]
+    "flags": [ "MAG_COMPACT" ],
+    "capacity": 50
   }
 ]
diff --git a/json/items/magazine/9mm.json b/json/items/magazine/9mm.json
index 14644f2..afcc663 100644
--- a/json/items/magazine/9mm.json
+++ b/json/items/magazine/9mm.json
@@ -1,28 +1,179 @@
 [
   {
     "id": "usp9mag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP 9x19mm 15-round magazine" },
+    "description": "A factory specification 15-round box magazine for use with the dependable Heckler & Koch USP 9x19mm pistol.",
+    "weight": "75 g",
+    "volume": "250 ml",
+    "price": 3850,
+    "price_postapoc": 100,
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "9mm" ],
+    "reliability": 10,
+    "flags": [ "MAG_COMPACT" ],
+    "capacity": 15
+  },
+  {
+    "id": "usp9mag_10rd",
     "copy-from": "usp9mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K USP 9mm magazine" }
+    "name": { "str": "H&K USP 9x19mm 10-round magazine" },
+    "description": "A 10-round box magazine for use with the Heckler & Koch USP 9x19mm pistol, physically of the same size as a 15-round magazine.  It's made to comply with laws that limit maximum magazine capacity for firearms in some states.",
+    "price_postapoc": 80,
+    "capacity": 10
+  },
+  {
+    "id": "usp9mag_18rd",
+    "copy-from": "usp9mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP 9x19mm 18-round magazine" },
+    "description": "An extended 18-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.",
+    "weight": "90 g",
+    "volume": "270 ml",
+    "price": 4000,
+    "price_postapoc": 120,
+    "capacity": 18
+  },
+  {
+    "id": "usp9mag_20rd",
+    "copy-from": "usp9mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP 9x19mm 20-round magazine" },
+    "description": "An extended 20-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.",
+    "weight": "98 g",
+    "volume": "280 ml",
+    "price": 4200,
+    "price_postapoc": 130,
+    "capacity": 20
+  },
+  {
+    "id": "usp9mag_32rd",
+    "copy-from": "usp9mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP 9x19mm 32-round magazine" },
+    "description": "An extended 32-round box magazine for use with the H&K USP 9x19mm pistol.",
+    "weight": "140 g",
+    "volume": "420 ml",
+    "price": 4800,
+    "price_postapoc": 180,
+    "capacity": 32
   },
   {
     "id": "p309mag",
     "copy-from": "usp9mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K P30 9mm magazine" },
-    "description": "A standard capacity magazine for use with the Heckler & Koch P30 9mm handgun."
+    "name": { "str": "H&K P30 9mm 15-round magazine" },
+    "description": "A factory specification 15-round box magazine for use with the Heckler & Koch P30 9mm handgun."
   },
   {
     "id": "mp5mag",
+    "//": "Tileset whitelist for SMG magazines",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 30-round magazine" },
+    "description": "A standard capacity curved magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "210 g",
+    "volume": "500 ml",
+    "price": 4100,
+    "price_postapoc": 250,
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "9mm" ],
+    "flags": [ "MAG_COMPACT" ],
+    "capacity": 30
+  },
+  {
+    "id": "mp5mag_100rd",
     "copy-from": "mp5mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K MP5 magazine" }
+    "name": { "str": "H&K MP5 100-round double drum magazine" },
+    "description": "A bulky 100-round double drum magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "780 g",
+    "volume": "800 ml",
+    "price": 7000,
+    "price_postapoc": 700,
+    "material": [ "steel", "plastic" ],
+    "reload_time": 160,
+    "flags": [ "MAG_BULKY" ],
+    "capacity": 100
   },
   {
     "id": "mp5bigmag",
-    "copy-from": "mp5bigmag",
+    "copy-from": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 50-round drum magazine" },
+    "description": "A drum magazine for use with the Heckler & Koch MP5 SMG.  Much greater capacity, but less reliable than the factory specification magazine.",
+    "weight": "350 g",
+    "volume": "750 ml",
+    "price": 6920,
+    "price_postapoc": 500,
+    "reload_time": 160,
+    "flags": [ "MAG_BULKY" ],
+    "capacity": 50
+  },
+  {
+    "id": "mp5mag_40rd",
+    "copy-from": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 40-round magazine" },
+    "description": "An extended-capacity 40-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "280 g",
+    "volume": "667 ml",
+    "price": 4550,
+    "price_postapoc": 360,
+    "capacity": 40
+  },
+  {
+    "id": "mp5mag_38rd",
+    "copy-from": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 38-round magazine" },
+    "description": "An extended-capacity 38-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "266 g",
+    "volume": "633 ml",
+    "price": 4500,
+    "price_postapoc": 350,
+    "capacity": 38
+  },
+  {
+    "id": "mp5mag_20rd",
+    "copy-from": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 20-round magazine" },
+    "description": "A compact 20-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "128 g",
+    "volume": "172 ml",
+    "price": 3500,
+    "price_postapoc": 200,
+    "capacity": 20
+  },
+  {
+    "id": "mp5mag_15rd",
+    "copy-from": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 15-round magazine" },
+    "description": "A compact 15-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "96 g",
+    "volume": "129 ml",
+    "price": 3000,
+    "price_postapoc": 150,
+    "capacity": 15
+  },
+  {
+    "id": "mp5mag_10rd",
+    "copy-from": "mp5mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K MP5 extended magazine" }
+    "name": { "str": "H&K MP5 10-round magazine" },
+    "description": "A compact 10-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "64 g",
+    "volume": "86 ml",
+    "price": 2500,
+    "price_postapoc": 100,
+    "capacity": 10
   },
   {
     "id": "ump9mag",
diff --git a/json/items/magazine/shot.json b/json/items/magazine/shot.json
index ac22067..3095987 100644
--- a/json/items/magazine/shot.json
+++ b/json/items/magazine/shot.json
@@ -3,7 +3,7 @@
     "id": "hk_caws_mag",
     "looks_like": "saiga10mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K CAWS box magazine" },
+    "name": { "str": "H&K CAWS 10-round magazine" },
     "description": "A removable plastic box magazine for the H&K CAWS shotgun. Holds 10 shells.",
     "weight": "210 g",
     "volume": "500 ml",
@@ -13,8 +13,8 @@
     "symbol": "#",
     "color": "dark_gray",
     "ammo_type": [ "shot" ],
-    "capacity": 10,
     "reliability": 9,
-    "flags": [ "MAG_COMPACT" ]
+    "flags": [ "MAG_COMPACT" ],
+    "capacity": 10
   }
 ]