6 files changed, 175 insertions, 0 deletions
diff --git a/json/items/gun/45.json b/json/items/gun/45.json
new file mode 100644
index 0000000..1170609
--- /dev/null
+++ b/json/items/gun/45.json
@@ -0,0 +1,13 @@
+[
+  {
+    "id": "usp_45",
+    "copy-from": "usp_9mm",
+    "type": "GUN",
+    "name": { "str": "H&K USP .45" },
+    "weight": "930 g",
+    "ammo": "45",
+    "ranged_damage": 0,
+    "built_in_mods": [ "match_trigger" ],
+    "magazines": [ [ "45", [ "usp45mag" ] ] ]
+}
+]
diff --git a/json/items/gun/46.json b/json/items/gun/46.json
new file mode 100644
index 0000000..b2f762b
--- /dev/null
+++ b/json/items/gun/46.json
@@ -0,0 +1,35 @@
+[
+  {
+    "id": "hk_ucp",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "H&K UCP" },
+    "description": "Designed to work with H&K's proprietary 4.6x30mm round, the UCP is a small pistol with a very high capacity, best used against armored opponents.",
+    "weight": "730 g",
+    "volume": "500 ml",
+    "price": 125000,
+    "to_hit": -2,
+    "bashing": 6,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "light_gray",
+    "ammo": "46",
+    "skill": "pistol",
+    "ranged_damage": -1,
+    "dispersion": 440,
+    "durability": 8,
+    "valid_mod_locations": [
+      [ "accessories", 2 ],
+      [ "barrel", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "stock", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "magazine_well": 1,
+    "magazines": [ [ "46", [ "hk46mag", "hk46bigmag" ] ] ]
+  }
+]
diff --git a/json/items/gun/9mm.json b/json/items/gun/9mm.json
new file mode 100644
index 0000000..6dd6786
--- /dev/null
+++ b/json/items/gun/9mm.json
@@ -0,0 +1,26 @@
+[
+  {
+    "id": "usp_9mm",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "name": { "str": "H&K USP 9mm", "str_pl": "H&K USP 9mm" },
+    "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": "770 g",
+    "volume": "500 ml",
+    "price": 68000,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "9mm",
+    "ranged_damage": -1,
+    "dispersion": 400,
+    "durability": 9,
+    "blackpowder_tolerance": 48,
+    "min_cycle_recoil": 450,
+    "magazine_well": 1,
+    "magazines": [ [ "9mm", [ "usp9mag" ] ] ]
+}
+]
diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json
new file mode 100644
index 0000000..297f6a4
--- /dev/null
+++ b/json/items/magazine/45.json
@@ -0,0 +1,36 @@
+[
+  {
+    "id": "usp45mag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP .45 magazine" },
+    "description": "A standard capacity magazine for use with the H&K USP handgun.",
+    "weight": "60 g",
+    "volume": "250 ml",
+    "price": 5900,
+    "material": "plastic",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "45",
+    "capacity": 12,
+    "reliability": 10,
+    "flags": [ "MAG_COMPACT" ]
+},
+  {
+    "id": "ump45mag",
+    "looks_like": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K UMP45 magazine" },
+    "description": "A standard 25-round box magazine for use with the H&K UMP45 SMG.",
+    "weight": "200 g",
+    "volume": "500 ml",
+    "price": 4950,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "45",
+    "capacity": 25,
+    "reliability": 9,
+    "flags": [ "MAG_COMPACT" ]
+}
+]
diff --git a/json/items/magazine/9mm.json b/json/items/magazine/9mm.json
new file mode 100644
index 0000000..14e46c5
--- /dev/null
+++ b/json/items/magazine/9mm.json
@@ -0,0 +1,54 @@
+[
+  {
+    "id": "usp9mag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP 9mm magazine" },
+    "description": "A factory specification 15-round box magazine for use with the dependable H&K USP 9x19mm pistol.",
+    "weight": "75 g",
+    "volume": "250 ml",
+    "price": 3850,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "9mm",
+    "capacity": 15,
+    "reliability": 10,
+    "flags": [ "MAG_COMPACT" ]
+},
+  {
+    "id": "mp5mag",
+    "//": "Tileset whitelist for SMG magazines",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 magazine" },
+    "description": "A standard capacity curved magazine for use with the H&K MP5 SMG.",
+    "weight": "210 g",
+    "volume": "500 ml",
+    "price": 4100,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "9mm",
+    "capacity": 30,
+    "reliability": 9,
+    "flags": [ "MAG_COMPACT" ]
+},
+  {
+    "id": "mp5bigmag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 extended magazine" },
+    "description": "A drum magazine for use with the H&K MP5 SMG.  Much greater capacity but less reliable the factory specification magazine.",
+    "weight": "350 g",
+    "volume": "750 ml",
+    "price": 6920,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "9mm",
+    "capacity": 50,
+    "reliability": 8,
+    "reload_time": 160,
+    "flags": [ "MAG_BULKY" ]
+}
+]
diff --git a/modinfo.json b/modinfo.json
new file mode 100644
index 0000000..fc1c434
--- /dev/null
+++ b/modinfo.json
@@ -0,0 +1,11 @@
+[
+  {
+    "type": "MOD_INFO",
+    "ident": "hk_naming_hotfix",
+    "name": "H&K Naming Hotfix",
+    "authors": ["jc_gargma"],
+    "description": "Fix the naming of several Heckler & Koch items to actually use the H&K prefix. Also restore the H&K UCP that was removed in 0.E",
+    "category": "rebalance",
+    "dependencies": [ "dda" ]
+  }
+]