1 files changed, 49 insertions, 16 deletions
diff --git a/json/items/gun/9mm.json b/json/items/gun/9mm.json
index 1961e2b..a6bcee9 100644
--- a/json/items/gun/9mm.json
+++ b/json/items/gun/9mm.json
@@ -1,10 +1,36 @@
 [
   {
     "id": "usp_9mm",
-    "copy-from": "usp_9mm",
+    "//": "Overwrite vanilla version to ensure proper copy-from ordering.",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
     "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",
+    "longest_side": "230 mm",
+    "price": 68000,
+    "price_postapoc": 2500,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "9mm" ],
+    "ranged_damage": { "damage_type": "bullet", "amount": -1 },
+    "dispersion": 400,
+    "durability": 9,
+    "blackpowder_tolerance": 48,
+    "min_cycle_recoil": 450,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
+    "pocket_data": [
+      {
+        "magazine_well": "250 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "usp9mag", "usp9mag_10rd", "usp9mag_18rd", "usp9mag_20rd", "usp9mag_32rd" ]
+      }
+    ]
   },
   {
     "id": "hk_p30_9",
@@ -16,7 +42,13 @@
     "price": 75000,
     "price_postapoc": 3000,
     "min_cycle_recoil": 400,
-    "magazines": [ [ "9mm", [ "p309mag" ] ] ],
+    "pocket_data": [
+      {
+        "magazine_well": "250 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "p309mag" ]
+      }
+    ],
     "built_in_mods": [ "pistol_grip" ]
   },
   {
@@ -24,23 +56,19 @@
     "copy-from": "hk_mp5",
     "type": "GUN",
     "name": { "str_sp": "H&K MP5A4" },
-    "weight": "2540 g",
-    "volume": "1750 ml"
+    "weight": "2540 g"
   },
   {
-    "id": "hk_mp5k",
-    "copy-from": "hk_mp5k",
+    "id": "hk_mp5sd",
+    "copy-from": "hk_mp5sd",
     "type": "GUN",
-    "name": { "str_sp": "H&K MP5K-PDW" },
-    "weight": "2530 g",
-    "volume": "1250 ml"
+    "name": { "str_sp": "H&K MP5SD" }
   },
   {
-    "id": "hk_mp5sd",
-    "copy-from": "hk_mp5sd",
+    "id": "hk_mp5k",
+    "copy-from": "hk_mp5k",
     "type": "GUN",
-    "name": { "str_sp": "H&K MP5SD" },
-    "volume": "2000 ml"
+    "name": { "str_sp": "H&K MP5K-PDW" }
   },
   {
     "id": "hk_ump9",
@@ -49,9 +77,14 @@
     "name": { "str_sp": "H&K UMP9" },
     "description": "Developed as a successor to the MP5 submachine gun, the UMP9 retains the earlier model's supreme accuracy and low recoil, but with reduced size and weight.",
     "weight": "2300 g",
-    "ammo": "9mm",
+    "ammo": [ "9mm" ],
     "min_cycle_recoil": 450,
-    "magazines": [ [ "9mm", [ "ump9mag" ] ] ],
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "ump9mag" ]
+      }
+    ],
     "modes": [ [ "DEFAULT", "semi", 1 ], [ "BURST", "burst", 2 ],  [ "AUTO", "auto", 4 ] ]
   }
 ]