More MP5 and USP9 magazines.

Also optimizations and bugfixes.

1 files changed, 27 insertions, 15 deletions

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
   }
 ]