From 691fbc79f895672d9e7c3c8f69d492f142589602 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 6 Apr 2022 20:10:49 -0700 Subject: Add P30 9mm, P30 .40, and HK45 handguns, plus magazines and itemgroups. --- json/itemgroups/Weapons_Mods_Ammo/guns.json | 15 ++++++++++++--- json/itemgroups/Weapons_Mods_Ammo/magazines.json | 5 ++++- json/items/gun/40.json | 13 +++++++++++++ json/items/gun/45.json | 17 ++++++++++++++++- json/items/gun/9mm.json | 13 +++++++++++++ json/items/magazine/40.json | 7 +++++++ json/items/magazine/45.json | 8 ++++++++ json/items/magazine/9mm.json | 7 +++++++ 8 files changed, 80 insertions(+), 5 deletions(-) (limited to 'json') diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json index af32d98..6336f5e 100644 --- a/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -4,7 +4,10 @@ "id": "guns_pistol_rare", "//": "Less common pistols including those only used by police/paramilitary forces.", "items": [ - { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 13 } + { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 13 }, + { "item": "hk_p30_9", "prob": 90, "charges-min": 0, "charges-max": 15 }, + { "item": "hk_p30_40", "prob": 90, "charges-min": 0, "charges-max": 13 }, + { "item": "hk_45", "prob": 90, "charges-min": 0, "charges-max": 10 } ] }, { @@ -12,7 +15,10 @@ "id": "guns_pistol_rare_display", "//": "Empty uncommon pistols found exclusively at gun stores.", "items": [ - { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 0 } + { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 0 }, + { "item": "hk_p30_9", "prob": 90, "charges-min": 0, "charges-max": 0 }, + { "item": "hk_p30_40", "prob": 90, "charges-min": 0, "charges-max": 0 }, + { "item": "hk_45", "prob": 90, "charges-min": 0, "charges-max": 0 } ] }, { @@ -79,7 +85,10 @@ "id": "guns_cop", "//": "Police issue weapons of all types", "items": [ - { "item": "usp_40", "prob": 10, "charges-min": 0, "charges-max": 13 } + { "item": "usp_40", "prob": 10, "charges-min": 0, "charges-max": 13 }, + { "item": "hk_p30_9", "prob": 10, "charges-min": 0, "charges-max": 15 }, + { "item": "hk_p30_40", "prob": 10, "charges-min": 0, "charges-max": 13 }, + { "item": "hk_45", "prob": 10, "charges-min": 0, "charges-max": 10 } ] }, { diff --git a/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/json/itemgroups/Weapons_Mods_Ammo/magazines.json index 0deb354..122117f 100644 --- a/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -24,7 +24,10 @@ "items": [ [ "ump9mag", 20 ], [ "ump40mag", 20 ], - [ "usp40mag", 10 ] + [ "usp40mag", 10 ], + [ "p309mag", 10 ], + [ "p3040mag", 10 ], + [ "hk45mag", 10 ] ] }, { diff --git a/json/items/gun/40.json b/json/items/gun/40.json index 011b97b..e37b151 100644 --- a/json/items/gun/40.json +++ b/json/items/gun/40.json @@ -8,6 +8,19 @@ "ammo": "40", "magazines": [ [ "40", [ "usp40mag" ] ] ] }, + { + "id": "hk_p30_40", + "copy-from": "usp_9mm", + "type": "GUN", + "name": { "str_sp": "H&K P30 .40" }, + "description": "Developed as a successor to the USP .40 handgun, the P30 .49 retains the earlier model's famed durability, but with improved control and reduced weight.", + "weight": "647 g", + "price": 75000, + "price_postapoc": 3000, + "min_cycle_recoil": 400, + "magazines": [ [ "40", [ "p3040mag" ] ] ], + "built_in_mods": [ "pistol_grip" ] + }, { "id": "hk_ump40", "copy-from": "hk_ump45", diff --git a/json/items/gun/45.json b/json/items/gun/45.json index 6bb45dd..4084f04 100644 --- a/json/items/gun/45.json +++ b/json/items/gun/45.json @@ -22,7 +22,22 @@ "blackpowder_tolerance": 48, "min_cycle_recoil": 450, "magazine_well": "250 ml", - "magazines": [ [ "45", [ "usp45mag" ] ] ] + "magazines": [ [ "45", [ "usp45mag" ] ] ], + "delete": { "built_in_mods": [ "match_trigger" ] } + }, + { + "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.", + "weight": "770 g", + "price": 75000, + "price_postapoc": 3000, + "min_cycle_recoil": 400, + "magazines": [ [ "45", [ "hk45mag" ] ] ], + "built_in_mods": [ "pistol_grip" ] }, { "id": "hk_ump45", diff --git a/json/items/gun/9mm.json b/json/items/gun/9mm.json index 5d71b52..1983dc3 100644 --- a/json/items/gun/9mm.json +++ b/json/items/gun/9mm.json @@ -6,6 +6,19 @@ "name": { "str_sp": "H&K USP 9mm" }, "weight": "748 g" }, + { + "id": "hk_p30_9", + "copy-from": "usp_9mm", + "type": "GUN", + "name": { "str_sp": "H&K P30 9mm" }, + "description": "Developed as a successor to the USP 9mm handgun, the P30 9mm retains the earlier model's famed durability, but with improved control and reduced weight.", + "weight": "647 g", + "price": 75000, + "price_postapoc": 3000, + "min_cycle_recoil": 400, + "magazines": [ [ "9mm", [ "p309mag" ] ] ], + "built_in_mods": [ "pistol_grip" ] + }, { "id": "hk_mp5", "copy-from": "hk_mp5", diff --git a/json/items/magazine/40.json b/json/items/magazine/40.json index 5f2795c..3be341c 100644 --- a/json/items/magazine/40.json +++ b/json/items/magazine/40.json @@ -8,6 +8,13 @@ "ammo_type": [ "40" ], "capacity": 13 }, + { + "id": "p3040mag", + "copy-from": "usp40mag", + "type": "MAGAZINE", + "name": { "str": "H&K P30 .40 magazine" }, + "description": "A standard capacity magazine for use with the Heckler & Koch P30 .40 handgun." + }, { "id": "ump40mag", "copy-from": "ump45mag", diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json index 9722667..344187d 100644 --- a/json/items/magazine/45.json +++ b/json/items/magazine/45.json @@ -30,5 +30,13 @@ "type": "MAGAZINE", "name": { "str": "H&K USP .45 magazine" }, "description": "A standard capacity magazine for use with the Heckler & Koch USP .45 handgun." + }, + { + "id": "hk45mag", + "copy-from": "usp45mag", + "type": "MAGAZINE", + "name": { "str": "H&K HK45 magazine" }, + "description": "A standard capacity magazine for use with the Heckler & Koch HK45 handgun.", + "capacity": 10 } ] diff --git a/json/items/magazine/9mm.json b/json/items/magazine/9mm.json index ffc0653..14644f2 100644 --- a/json/items/magazine/9mm.json +++ b/json/items/magazine/9mm.json @@ -5,6 +5,13 @@ "type": "MAGAZINE", "name": { "str": "H&K USP 9mm magazine" } }, + { + "id": "p309mag", + "copy-from": "usp9mag", + "type": "MAGAZINE", + "name": { "str": "H&K P30 9mm magazine" }, + "description": "A standard capacity magazine for use with the Heckler & Koch P30 9mm handgun." + }, { "id": "mp5mag", "copy-from": "mp5mag", -- cgit v1.2.1