From 60f15cc59b888e9339548fc6ad016ab48d62fa8b Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 15 Mar 2023 21:29:49 -0700
Subject: More MP5 and USP9 magazines. Also optimizations and bugfixes.

---
 json/items/gun/45.json | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

(limited to 'json/items/gun/45.json')

diff --git a/json/items/gun/45.json b/json/items/gun/45.json
index 99aa47e..22176ff 100644
--- a/json/items/gun/45.json
+++ b/json/items/gun/45.json
@@ -1,14 +1,13 @@
 [
   {
     "id": "usp_45",
-    "copy-from": "usp_45",
-    "looks_like": "glock_17",
+    "copy-from": "pistol_base",
     "type": "GUN",
     "name": { "str_sp": "H&K USP .45" },
     "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": "789 g",
-    "volume": "500 ml",
-    "price": 68000,
+    "volume": "483 ml",
+    "price": 70000,
     "price_postapoc": 2500,
     "to_hit": -2,
     "bashing": 8,
@@ -22,8 +21,7 @@
     "blackpowder_tolerance": 48,
     "min_cycle_recoil": 450,
     "magazine_well": "250 ml",
-    "magazines": [ [ "45", [ "usp45mag" ] ] ],
-    "delete": { "built_in_mods": [ "match_trigger" ] }
+    "magazines": [ [ "45", [ "usp45mag" ] ] ]
   },
   {
     "id": "hk_45",
@@ -41,12 +39,11 @@
   },
   {
     "id": "hk_ump45",
-    "looks_like": "hk_mp5",
+    "copy-from": "smg_base",
     "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str_sp": "H&K UMP45" },
+    "name": { "str": "H&K UMP45" },
     "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",
+    "weight": "2300 g",
     "volume": "1250 ml",
     "price": 290000,
     "price_postapoc": 3000,
@@ -57,27 +54,11 @@
     "symbol": "(",
     "color": "dark_gray",
     "ammo": "45",
-    "skill": "smg",
     "ranged_damage": { "damage_type": "bullet", "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" ] ] ]
   }
 ]
-- 
cgit v1.2.1