From 23a8fd7942e8ba0bf634e38671a940b55436b858 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 27 May 2020 15:39:41 -0700
Subject: Rewrite UCP description. Add USP 40 drops.

---
 json/itemgroups/Weapons_Mods_Ammo/guns.json      | 10 +++++-----
 json/itemgroups/Weapons_Mods_Ammo/magazines.json | 18 ++++++++++++++++++
 json/itemgroups/military.json                    |  3 ++-
 json/items/gun/46.json                           |  2 +-
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 json/itemgroups/Weapons_Mods_Ammo/magazines.json

(limited to 'json')

diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 1eeecf9..9c40135 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -4,7 +4,7 @@
     "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 }
+      { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 13 }
     ]
   },
   {
@@ -12,7 +12,7 @@
     "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 }
+      { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 0 }
     ]
   },
  {
@@ -20,7 +20,7 @@
     "id": "guns_pistol_milspec",
     "//": "Military specification pistols only ever found at military sites.",
     "items": [
-      { "item": "hk_ucp", "prob": 35, "charges-min": 0, "charges-max": 20 }
+      { "item": "hk_ucp", "prob": 5, "charges-min": 0, "charges-max": 20 }
     ]
   },
   {
@@ -44,7 +44,7 @@
     "id": "guns_rifle_milspec",
     "//": "Military specification rifles only ever found at military sites.",
     "items": [
-      { "item": "hk_msg90a2", "prob": 50, "charges-min": 0, "charges-max": 20 }
+      { "item": "hk_msg90a2", "prob": 15, "charges-min": 0, "charges-max": 20 }
     ]
   },
   {
@@ -52,7 +52,7 @@
     "id": "guns_cop",
     "//": "Police issue weapons of all types",
     "items": [
-      { "item": "usp_40", "prob": 10, "charges-min": 0, "charges-max": 12 }
+      { "item": "usp_40", "prob": 10, "charges-min": 0, "charges-max": 13 }
     ]
   },
 ]
diff --git a/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
new file mode 100644
index 0000000..dc955d8
--- /dev/null
+++ b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -0,0 +1,18 @@
+[
+  {
+    "type": "item_group",
+    "id": "mags_military",
+    "//": "_DEPRECATED_ Older military magazines still in service.",
+    "items": [
+      [ "usp40mag", 9 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "mags_swat",
+    "//": "Magazines issued to paramilitary forces in addition to standard police issue.",
+    "items": [
+      [ "usp40mag", 12 ]
+    ]
+  }
+]
diff --git a/json/itemgroups/military.json b/json/itemgroups/military.json
index 2199b73..3ef6e21 100644
--- a/json/itemgroups/military.json
+++ b/json/itemgroups/military.json
@@ -4,7 +4,8 @@
     "id": "military",
     "subtype": "distribution",
     "entries": [ 
-      { "item": "hk_ucp", "prob": 6 },
+      { "item": "hk_ucp", "prob": 2 },
+      { "item": "hk_mp7", "prob": 5 },
       { "item": "46mm", "prob": 7 }
     ]
   },
diff --git a/json/items/gun/46.json b/json/items/gun/46.json
index b370979..1beae57 100644
--- a/json/items/gun/46.json
+++ b/json/items/gun/46.json
@@ -4,7 +4,7 @@
     "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.",
+    "description": "The H&K UCP is a small, very high capacity pistol designed to counter most common body armors. As production was cancelled during the prototype stage, this pistol is extremely rare.",
     "weight": "730 g",
     "volume": "500 ml",
     "price": 125000,
-- 
cgit v1.2.1