summaryrefslogtreecommitdiff
path: root/json/items/gun/45.json
diff options
context:
space:
mode:
Diffstat (limited to 'json/items/gun/45.json')
-rw-r--r--json/items/gun/45.json65
1 files changed, 46 insertions, 19 deletions
diff --git a/json/items/gun/45.json b/json/items/gun/45.json
index 99aa47e..7efc3d2 100644
--- a/json/items/gun/45.json
+++ b/json/items/gun/45.json
@@ -1,34 +1,48 @@
[
{
"id": "usp_45",
- "copy-from": "usp_45",
+ "//": "Overwrite the vanilla usp_45 to ensure the make sure the copy-from order is correct.",
+ "copy-from": "pistol_base",
"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.",
+ "name": { "str": "USP pistol" },
+ "description": "A semi-automatic pistol chambered in .45 ACP and accepting USP magazines.",
+ "variant_type": "gun",
+ "variants": [
+ {
+ "id": "usp_45",
+ "name": { "str": "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": 1
+ },
+ {
+ "id": "mk23",
+ "name": { "str": "MK 23 MOD 0" },
+ "description": "Jokingly referred to as \"The World's Only Crew-Served Pistol\", this massive pistol was designed as a primary weapon for select \"special operators\". Its cumbersome nature, the introduction of the derivative HK USP series, and the logistics of getting .45 ACP ammunition in theater doomed this behemoth to US SOCOM armories. Like the USP, the MK 23 is a remarkably reliable gun; someone could probably take out a nuclear-equipped walking tank with this in their holster."
+ }
+ ],
"weight": "789 g",
- "volume": "500 ml",
- "price": 68000,
+ "volume": "483 ml",
+ "longest_side": "241 mm",
+ "price": 70000,
"price_postapoc": 2500,
"to_hit": -2,
"bashing": 8,
"material": [ "steel", "plastic" ],
"symbol": "(",
"color": "dark_gray",
- "ammo": "45",
+ "ammo": [ "45" ],
"ranged_damage": { "damage_type": "bullet", "amount": -1 },
"dispersion": 400,
"durability": 9,
"blackpowder_tolerance": 48,
"min_cycle_recoil": 450,
- "magazine_well": "250 ml",
- "magazines": [ [ "45", [ "usp45mag" ] ] ],
- "delete": { "built_in_mods": [ "match_trigger" ] }
+ "weapon_category": [ "AUTOMATIC_PISTOLS" ],
+ "pocket_data": [ { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "usp45mag" ] } ]
},
{
"id": "hk_45",
"copy-from": "usp_45",
- "looks_like": "glock_17",
"type": "GUN",
"name": { "str_sp": "H&K HK45" },
"description": "Originally intended to replace the US military's aging M9 pistol, the HK45 combines the famed durability of the USP series with a more ergonomic design based on the P2000 to allow for greater control during operation.",
@@ -36,33 +50,44 @@
"price": 75000,
"price_postapoc": 3000,
"min_cycle_recoil": 400,
- "magazines": [ [ "45", [ "hk45mag" ] ] ],
+ "pocket_data": [ { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "hk45mag" ] } ],
"built_in_mods": [ "pistol_grip" ]
},
{
"id": "hk_ump45",
+ "//": "Overwrite the vanilla ump45 to ensure the ump9 and ump40 load based on this one.",
"looks_like": "hk_mp5",
"type": "GUN",
"reload_noise_volume": 10,
- "name": { "str_sp": "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",
- "volume": "1250 ml",
+ "name": { "str": "UMP45 SMG" },
+ "description": "A submachine gun chambered in .45 ACP and accepting UMP45 magazines.",
+ "variant_type": "gun",
+ "variants": [
+ {
+ "id": "hk_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": 1
+ }
+ ],
+ "ascii_picture": "hk_ump",
+ "weight": "2300 g",
+ "volume": "4451 ml",
+ "longest_side": "452 mm",
"price": 290000,
"price_postapoc": 3000,
"to_hit": -2,
- "ascii_picture": "hk_ump",
"bashing": 11,
"material": [ "steel", "plastic" ],
"symbol": "(",
"color": "dark_gray",
- "ammo": "45",
+ "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 ] ],
+ "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"valid_mod_locations": [
[ "accessories", 3 ],
[ "barrel", 1 ],
@@ -78,6 +103,8 @@
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
- "magazines": [ [ "45", [ "ump45mag", "ump45_makeshiftmag" ] ] ]
+ "default_mods": [ "folding_stock" ],
+ "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ump45mag", "ump45_makeshiftmag" ] } ]
+ }
}
]