Add the UMP9 and UMP40 plus magazines and itemgroups.

9 files changed, 141 insertions, 10 deletions

diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 9b8d511..af32d98 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -15,7 +15,25 @@
       { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 0 }
     ]
   },
- {
+  {
+    "type": "item_group",
+    "id": "guns_smg_rare",
+    "//": "Less common SMGs including those only used by police/paramilitary forces.",
+    "items": [
+      { "item": "hk_ump9", "prob": 30, "charges-min": 0, "charges-max": 30 },
+      { "item": "hk_ump40", "prob": 30, "charges-min": 0, "charges-max": 30 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "guns_smg_rare_display",
+    "//": "Less common SMGs found exclusively in gun stores.",
+    "items": [
+      { "item": "hk_ump9", "prob": 30, "charges-min": 0, "charges-max": 0 },
+      { "item": "hk_ump40", "prob": 30, "charges-min": 0, "charges-max": 0 }
+    ]
+  },
+  {
     "type": "item_group",
     "id": "guns_pistol_milspec",
     "//": "Military specification pistols only ever found at military sites.",
@@ -63,5 +81,14 @@
     "items": [
       { "item": "usp_40", "prob": 10, "charges-min": 0, "charges-max": 13 }
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "guns_swat",
+    "//": "Guns issued to paramilitary forces in addition to standard police issue.",
+    "items": [
+      { "item": "hk_ump9", "prob": 15, "charges-min": 0, "charges-max": 30 },
+      { "item": "hk_ump40", "prob": 15, "charges-min": 0, "charges-max": 30 }
+    ]
   }
 ]
diff --git a/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index 070ead9..0deb354 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -22,7 +22,18 @@
     "id": "mags_swat",
     "//": "Magazines issued to paramilitary forces in addition to standard police issue.",
     "items": [
+      [ "ump9mag", 20 ],
+      [ "ump40mag", 20 ],
       [ "usp40mag", 10 ]
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "mags_smg_common",
+    "//": "Factory specification SMG magazines commonly owned by citizens.",
+    "items": [
+      [ "ump9mag", 5 ],
+      [ "ump40mag", 5 ]
+    ]
   }
 ]
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 ] ]
   }
 ]
diff --git a/json/items/magazine/40.json b/json/items/magazine/40.json
index c0ee22a..5f2795c 100644
--- a/json/items/magazine/40.json
+++ b/json/items/magazine/40.json
@@ -7,5 +7,15 @@
     "description": "A standard capacity magazine for use with the Heckler & Koch USP .40 handgun.",
     "ammo_type": [ "40" ],
     "capacity": 13
+  },
+  {
+    "id": "ump40mag",
+    "copy-from": "ump45mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K UMP40 magazine" },
+    "description": "A standard 30-round box magazine for use with the Heckler & Koch UMP40 SMG.",
+    "weight": "200 g",
+    "ammo_type": [ "40" ],
+    "capacity": 30
   }
 ]
diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json
index b3b6f75..9722667 100644
--- a/json/items/magazine/45.json
+++ b/json/items/magazine/45.json
@@ -1,10 +1,21 @@
 [
   {
     "id": "ump45mag",
-    "copy-from": "ump45mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K UMP45 magazine" },
-    "description": "A standard 25-round box magazine for use with the Heckler & Koch UMP45 SMG."
+    "description": "A standard 25-round box magazine for use with the Heckler & Koch UMP45 SMG.",
+    "weight": "400 g",
+    "volume": "500 ml",
+    "price": 4950,
+    "price_postapoc": 100,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "45",
+    "capacity": 25,
+    "reliability": 9,
+    "flags": [ "MAG_COMPACT" ]
   },
   {
     "id": "ump45_makeshiftmag",
diff --git a/json/items/magazine/9mm.json b/json/items/magazine/9mm.json
index b338aeb..ffc0653 100644
--- a/json/items/magazine/9mm.json
+++ b/json/items/magazine/9mm.json
@@ -4,17 +4,27 @@
     "copy-from": "usp9mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K USP 9mm magazine" }
-},
+  },
   {
     "id": "mp5mag",
     "copy-from": "mp5mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K MP5 magazine" }
-},
+  },
   {
     "id": "mp5bigmag",
     "copy-from": "mp5bigmag",
     "type": "MAGAZINE",
     "name": { "str": "H&K MP5 extended magazine" }
-}
+  },
+  {
+    "id": "ump9mag",
+    "copy-from": "ump45mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K UMP9 magazine" },
+    "description": "A standard 30-round curved box magazine for use with the Heckler & Koch UMP9 SMG.",
+    "weight": "200 g",
+    "ammo_type": [ "9mm" ],
+    "capacity": 30
+  }
 ]
diff --git a/json/martialarts.json b/json/martialarts.json
index 172fd18..4eeeab2 100644
--- a/json/martialarts.json
+++ b/json/martialarts.json
@@ -8,6 +8,8 @@
         "usp_40",
         "hk_ucp",
         "hk_mp5",
+        "hk_ump9",
+        "hk_ump40",
         "hk_ump45",
         "hk_mp7",
         "hk_g11"