Add the UMP9 and UMP40 plus magazines and itemgroups.

3 files changed, 64 insertions, 4 deletions

diff --git a/json/items/gun/40.json b/json/items/gun/40.json
index f6a6947..011b97b 100644
--- a/json/items/gun/40.json
+++ b/json/items/gun/40.json
@@ -7,5 +7,17 @@
     "weight": "748 g",
     "ammo": "40",
     "magazines": [ [ "40", [ "usp40mag" ] ] ]
+  },
+  {
+    "id": "hk_ump40",
+    "copy-from": "hk_ump45",
+    "type": "GUN",
+    "name": { "str_sp": "H&K UMP40" },
+    "description": "Developed as a successor to the MP5 submachine gun, the UMP40 retains the earlier model's supreme accuracy and low recoil, but in the higher .40 caliber.",
+    "weight": "2300 g",
+    "ammo": "40",
+    "min_cycle_recoil": 500,
+    "magazines": [ [ "40", [ "ump40mag" ] ] ],
+    "modes": [ [ "DEFAULT", "semi", 1 ], [ "BURST", "burst", 2 ],  [ "AUTO", "auto", 4 ] ]
   }
 ]
diff --git a/json/items/gun/45.json b/json/items/gun/45.json
index 25b2dbc..e6535c0 100644
--- a/json/items/gun/45.json
+++ b/json/items/gun/45.json
@@ -1,16 +1,52 @@
 [
   { 
     "id": "usp_45",
-    "copy-from": "usp_45",
+    "copy-from": "usp_9mm",
     "type": "GUN",
     "name": { "str_sp": "H&K USP .45" },
-    "weight": "789 g"
+    "weight": "789 g",
+    "ammo": "45",
+    "magazines": [ [ "45", [ "usp45mag" ] ] ]
   },
   {
     "id": "hk_ump45",
-    "copy-from": "hk_ump45",
+    "looks_like": "hk_mp5",
     "type": "GUN",
+    "reload_noise_volume": 10,
     "name": { "str_sp": "H&K UMP45" },
-    "modes": [ [ "DEFAULT", "semi", 1 ], [ "BURST", "burst", 2 ],  [ "AUTO", "auto", 4 ] ]
+    "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",
+    "volume": "1250 ml",
+    "price": 290000,
+    "price_postapoc": 3000,
+    "to_hit": -2,
+    "ascii_picture": "hk_ump",
+    "bashing": 11,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "45",
+    "skill": "smg",
+    "ranged_damage": { "damage_type": "stab", "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/9mm.json b/json/items/gun/9mm.json
index 679e9e5..75f7980 100644
--- a/json/items/gun/9mm.json
+++ b/json/items/gun/9mm.json
@@ -21,5 +21,17 @@
     "name": { "str_sp": "H&K MP5K-PDW" },
     "weight": "2530 g",
     "volume": "1250 ml"
+  },
+  {
+    "id": "hk_ump9",
+    "copy-from": "hk_ump45",
+    "type": "GUN",
+    "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 weight and size.",
+    "weight": "2300 g",
+    "ammo": "9mm",
+    "min_cycle_recoil": 450,
+    "magazines": [ [ "9mm", [ "ump9mag" ] ] ],
+    "modes": [ [ "DEFAULT", "semi", 1 ], [ "BURST", "burst", 2 ],  [ "AUTO", "auto", 4 ] ]
   }
 ]