Add USP .40

Tweak masses

8 files changed, 64 insertions, 11 deletions

diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json
index c9d1f4a..1eeecf9 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -1,10 +1,26 @@
 [
+  {
+    "type": "item_group",
+    "id": "guns_pistol_rare",
+    "//": "Less common pistols including those only used by police/paramilitary forces.",
+    "items": [
+      { "item": "usp_40", "prob": 70, "charges-min": 0, "charges-max": 12 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "guns_pistol_rare_display",
+    "//": "Empty uncommon pistols found exclusively at gun stores.",
+    "items": [
+      { "item": "usp_40", "prob": 70, "charges-min": 0, "charges-max": 0 }
+    ]
+  },
  {
     "type": "item_group",
     "id": "guns_pistol_milspec",
     "//": "Military specification pistols only ever found at military sites.",
     "items": [
-      { "item": "hk_ucp", "prob": 35, "charges-min": 0, "charges-max": 10 }
+      { "item": "hk_ucp", "prob": 35, "charges-min": 0, "charges-max": 20 }
     ]
   },
   {
@@ -20,7 +36,7 @@
     "id": "guns_rifle_rare_display",
     "//": "Less common rifles found exclusively in gun stores.",
     "items": [
-      { "item": "hk_psg1a1", "prob": 15, "charges-min": 0, "charges-max": 20 }
+      { "item": "hk_psg1a1", "prob": 15, "charges-min": 0, "charges-max": 0 }
     ]
   },
   {
@@ -30,5 +46,13 @@
     "items": [
       { "item": "hk_msg90a2", "prob": 50, "charges-min": 0, "charges-max": 20 }
     ]
-  }
+  },
+  {
+    "type": "item_group",
+    "id": "guns_cop",
+    "//": "Police issue weapons of all types",
+    "items": [
+      { "item": "usp_40", "prob": 10, "charges-min": 0, "charges-max": 12 }
+    ]
+  },
 ]
diff --git a/json/itemgroups/military.json b/json/itemgroups/military.json
index ecf974f..2199b73 100644
--- a/json/itemgroups/military.json
+++ b/json/itemgroups/military.json
@@ -12,8 +12,8 @@
     "type": "item_group",
     "id": "military_standard_sniper_rifles",
     "subtype": "distribution",
-    "entries": [ { "item": "m2010", "prob": 20, "charges": [ 0, 5 ] },
-    { "item": "m110a1", "prob": 70, "charges": [ 0, 20 ] },
-    { "item": "hk_msg90a2", "prob": 10, "charges": [ 0, 20]} ]
+    "entries": [
+      { "item": "hk_msg90a2", "prob": 10, "charges": [ 0, 20] }
+    ]
   }
 ]
diff --git a/json/items/gun/40.json b/json/items/gun/40.json
new file mode 100644
index 0000000..3ff0b63
--- /dev/null
+++ b/json/items/gun/40.json
@@ -0,0 +1,11 @@
+[
+  {
+    "id": "usp_40",
+    "copy-from": "usp_9mm",
+    "type": "GUN",
+    "name": { "str": "H&K USP .40" },
+    "weight": "748 g",
+    "ammo": "45",
+    "magazines": [ [ "40", [ "usp40mag" ] ] ]
+}
+]
diff --git a/json/items/gun/45.json b/json/items/gun/45.json
index 1170609..10e8ad9 100644
--- a/json/items/gun/45.json
+++ b/json/items/gun/45.json
@@ -4,9 +4,8 @@
     "copy-from": "usp_9mm",
     "type": "GUN",
     "name": { "str": "H&K USP .45" },
-    "weight": "930 g",
+    "weight": "789 g",
     "ammo": "45",
-    "ranged_damage": 0,
     "built_in_mods": [ "match_trigger" ],
     "magazines": [ [ "45", [ "usp45mag" ] ] ]
 }
diff --git a/json/items/gun/9mm.json b/json/items/gun/9mm.json
index 6dd6786..e3171f0 100644
--- a/json/items/gun/9mm.json
+++ b/json/items/gun/9mm.json
@@ -6,7 +6,7 @@
     "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",
+    "weight": "748 g",
     "volume": "500 ml",
     "price": 68000,
     "to_hit": -2,
@@ -15,7 +15,6 @@
     "symbol": "(",
     "color": "dark_gray",
     "ammo": "9mm",
-    "ranged_damage": -1,
     "dispersion": 400,
     "durability": 9,
     "blackpowder_tolerance": 48,
diff --git a/json/items/magazine/40.json b/json/items/magazine/40.json
new file mode 100644
index 0000000..6eaba74
--- /dev/null
+++ b/json/items/magazine/40.json
@@ -0,0 +1,19 @@
+[
+  {
+    "id": "usp40mag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP .40 magazine" },
+    "description": "A standard capacity magazine for use with the H&K USP .40 handgun.",
+    "weight": "60 g",
+    "volume": "250 ml",
+    "price": 5900,
+    "material": "plastic",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "45",
+    "capacity": 13,
+    "reliability": 10,
+    "flags": [ "MAG_COMPACT" ]
+}
+]
diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json
index 297f6a4..63695b3 100644
--- a/json/items/magazine/45.json
+++ b/json/items/magazine/45.json
@@ -4,7 +4,7 @@
     "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.",
+    "description": "A standard capacity magazine for use with the H&K USP .45 handgun.",
     "weight": "60 g",
     "volume": "250 ml",
     "price": 5900,
diff --git a/json/martialarts.json b/json/martialarts.json
index e1bd988..8f689c2 100644
--- a/json/martialarts.json
+++ b/json/martialarts.json
@@ -65,6 +65,7 @@
       "sig_mosquito",
       "tokarev",
       "usp_45",
+      "usp_40",
       "usp_9mm",
       "hk_ucp",
       "walther_ppk",