More MP5 and USP9 magazines.

Also optimizations and bugfixes.

1 files changed, 157 insertions, 6 deletions

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",