From 014078a4b8f688776b750c8638e493a7ce9ce893 Mon Sep 17 00:00:00 2001 From: KeremBaba Date: Sun, 23 Jun 2024 21:00:26 +0300 Subject: [PATCH] Colt Python (#74576) * colt python * finalize the gun * generic guns + typo * descriptive gun name * spawns * Update guns_by_calibre.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fuck you * fucking merge it already * fuck you Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../itemgroups/Weapons_Mods_Ammo/guns.json | 7 ++- .../Weapons_Mods_Ammo/guns_by_calibre.json | 6 +-- .../Weapons_Mods_Ammo/nested_guns.json | 8 +++ data/json/items/gun/38.json | 52 +++++++++++++++++++ .../firearms/gg_firearms_migration.json | 2 +- 5 files changed, 69 insertions(+), 6 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index e040ba7de9e94..a8d01435781a4 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -98,6 +98,7 @@ { "item": "glock_40", "variant": "glock_40", "prob": 1 }, { "item": "sw_610", "prob": 1 }, { "item": "sw_619", "prob": 40 }, + { "item": "colt_python", "prob": 40 }, { "item": "bfr", "prob": 10 }, { "item": "raging_bull", "prob": 15 }, { "item": "sw_500", "prob": 10 }, @@ -1667,7 +1668,8 @@ { "item": "m9", "variant": "m9", "prob": 5, "charges": [ 0, 15 ] }, { "item": "sig_40", "prob": 20, "charges": [ 0, 12 ] }, { "item": "usp_45", "prob": 10, "charges": [ 0, 12 ] }, - { "item": "usp_9mm", "prob": 10, "charges": [ 0, 15 ] } + { "item": "usp_9mm", "prob": 10, "charges": [ 0, 15 ] }, + { "item": "colt_python", "prob": 5, "charges": [ 0, 6 ] } ] }, { @@ -1752,7 +1754,8 @@ { "item": "garand", "prob": 1, "charges": [ 0, 8 ] }, { "item": "mk47", "prob": 1, "charges": [ 0, 30 ] }, { "item": "ak556", "prob": 2, "charges": [ 0, 30 ] }, - { "item": "ak556", "variant": "zpapm90", "prob": 1 } + { "item": "ak556", "variant": "zpapm90", "prob": 1 }, + { "item": "colt_python", "prob": 1, "charges": [ 0, 6 ] } ] } ] diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json index 9589f4eeca8ed..1e064d8b88455 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json @@ -63,7 +63,7 @@ { "type": "item_group", "id": "guns_pistol_common_357mag", - "items": [ { "group": "nested_sw_619", "prob": 3 } ] + "items": [ { "group": "nested_sw_619", "prob": 3 }, { "group": "nested_colt_python", "prob": 3 } ] }, { "type": "item_group", @@ -145,7 +145,7 @@ { "type": "item_group", "id": "guns_pistol_common_everyday_carry_357mag", - "items": [ { "item": "sw_619", "prob": 5, "charges": [ 0, -1 ] } ] + "items": [ { "item": "sw_619", "prob": 5, "charges": [ 0, -1 ] }, { "item": "colt_python", "prob": 5, "charges": [ 0, -1 ] } ] }, { "type": "item_group", @@ -232,7 +232,7 @@ { "type": "item_group", "id": "guns_pistol_common_display_357mag", - "items": [ { "item": "sw_619", "prob": 1 } ] + "items": [ { "item": "sw_619", "prob": 1 }, { "item": "colt_python", "prob": 2 } ] }, { "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index f0cf5ebd9cc78..c7929ca7f65dc 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -283,6 +283,14 @@ "ammo": 100, "entries": [ { "item": "sw_619", "charges": [ 0, 7 ] }, { "group": "on_hand_38" } ] }, + { + "id": "nested_colt_python", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ { "item": "colt_python", "charges": [ 0, 6 ] }, { "group": "on_hand_357" } ] + }, { "id": "nested_model_10_revolver", "type": "item_group", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index 4a58a4f912f62..1bf810526f6fa 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -146,6 +146,58 @@ ], "melee_damage": { "bash": 8 } }, + { + "id": "colt_python", + "copy-from": "pistol_revolver", + "looks_like": "sw_619", + "type": "GUN", + "name": { "str_sp": ".357 revolver" }, + "//": "This is the Colt Python 2020 6-inch version.", + "description": "A six inch revolver chambered in .357 Magnum/.38 Special. Favorite of sheriffs and post-Cataclysm survivor group leaders.", + "//s": "omg twd reference :O", + "weight": "1300 g", + "volume": "703 ml", + "longest_side": "292 mm", + "barrel_length": "152 mm", + "symbol": "(", + "color": "light_gray", + "//2": "Price of one according to colt's own website. Goddamn.", + "price": "1 kUSD 599 USD", + "price_postapoc": "20 USD", + "to_hit": { "grip": "solid", "length": "short", "balance": "neutral", "surface": "point" }, + "material": [ "steel", "wood" ], + "ammo": [ "357mag", "38" ], + "dispersion": 280, + "durability": 10, + "blackpowder_tolerance": 48, + "clip_size": 6, + "valid_mod_locations": [ + [ "barrel", 1 ], + [ "grip", 1 ], + [ "mechanism", 2 ], + [ "rail mount", 1 ], + [ "sights", 1 ], + [ "stocks mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE", + "rigid": true, + "ammo_restriction": { "357mag": 6, "38": 6 }, + "allowed_speedloaders": [ "38_speedloader" ] + } + ], + "variant_type": "gun", + "variants": [ + { + "id": "colt_python", + "name": { "str_sp": "Colt Python" }, + "description": "Made by Colt, this six inch six-shooter is one of the most lauded revolvers ever produced. Can fire .38 Special and .357 Magnum." + } + ], + "melee_damage": { "bash": 9 } + }, { "id": "sw_619", "copy-from": "pistol_revolver", diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index a73c95a1543d7..70a88a7184948 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -71,7 +71,7 @@ "replace": "pistol_magnum_pipe" }, { - "id": [ "sw_619", "sw629", "bfr", "sw_500", "raging_bull", "chiappa_rhino" ], + "id": [ "sw_619", "sw629", "bfr", "sw_500", "raging_bull", "chiappa_rhino", "colt_python" ], "type": "MIGRATION", "replace": "pistol_magnum_revolver" },