summaryrefslogtreecommitdiff
path: root/json
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2022-04-06 19:14:30 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2022-04-06 19:14:30 -0700
commit4a5b3e64ace8321983080a5e0c0a3a955859e651 (patch)
tree9f022866aa0db8f537dbc908ee8697beebf9f0ec /json
parentAdd a -1/+1 damage modifier to the UCP/MP7 as is the norm for H&K handgun/SMG... (diff)
downloadcataclysm-dda-mod_hk-loadout-4a5b3e64ace8321983080a5e0c0a3a955859e651.tar.xz
Fix USP45 failing to properly override yet again.
Diffstat (limited to 'json')
-rw-r--r--json/items/gun/45.json20
1 files changed, 18 insertions, 2 deletions
diff --git a/json/items/gun/45.json b/json/items/gun/45.json
index e6535c0..6bb45dd 100644
--- a/json/items/gun/45.json
+++ b/json/items/gun/45.json
@@ -1,11 +1,27 @@
[
- {
+ {
"id": "usp_45",
- "copy-from": "usp_9mm",
+ "copy-from": "usp_45",
+ "looks_like": "glock_17",
"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,
+ "price_postapoc": 2500,
+ "to_hit": -2,
+ "bashing": 8,
+ "material": [ "steel", "plastic" ],
+ "symbol": "(",
+ "color": "dark_gray",
"ammo": "45",
+ "ranged_damage": { "damage_type": "stab", "amount": -1 },
+ "dispersion": 400,
+ "durability": 9,
+ "blackpowder_tolerance": 48,
+ "min_cycle_recoil": 450,
+ "magazine_well": "250 ml",
"magazines": [ [ "45", [ "usp45mag" ] ] ]
},
{