More MP5 and USP9 magazines.

Also optimizations and bugfixes.

1 files changed, 22 insertions, 12 deletions

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
   }