From 213997ec00d93b67d12d4724ad5597cc92603448 Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Tue, 25 Jun 2024 07:08:52 +0200 Subject: [PATCH] Add Colt Anaconda (#74719) * add colt anaconda * Thank you Boomstick! Co-authored-by: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * migrate gun in GG * Satisfy DPS test --------- Co-authored-by: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../itemgroups/Weapons_Mods_Ammo/guns.json | 5 +- .../Weapons_Mods_Ammo/guns_by_calibre.json | 26 ++++- .../Weapons_Mods_Ammo/nested_guns.json | 17 ++++ data/json/items/gun/44.json | 95 +++++++++++++++++++ data/json/npcs/NC_EVAC_BROKER.json | 3 + data/json/npcs/NC_SCAVENGER.json | 3 + .../firearms/gg_firearms_migration.json | 13 ++- 7 files changed, 155 insertions(+), 7 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index a8d01435781a4..e594e87506a44 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -106,7 +106,10 @@ { "group": "modular_deagle_44", "prob": 5 }, { "group": "modular_deagle_50", "prob": 1 }, { "group": "nested_deagle_with_kits", "prob": 1 }, - { "item": "sw629", "prob": 30 } + { "item": "sw629", "prob": 30 }, + { "item": "colt_anaconda_8", "prob": 11 }, + { "item": "colt_anaconda_6", "prob": 16 }, + { "item": "colt_anaconda_4", "prob": 5 } ] }, { 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 1f1c7bc652072..bf788955cd00f 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json @@ -73,7 +73,7 @@ { "type": "item_group", "id": "guns_pistol_common_44", - "items": [ { "group": "nested_sw629", "prob": 5 } ] + "items": [ { "group": "nested_sw629", "prob": 5 }, { "group": "nested_colt_anaconda", "prob": 4 } ] }, { "type": "item_group", @@ -158,7 +158,12 @@ { "type": "item_group", "id": "guns_pistol_common_everyday_carry_44", - "items": [ { "item": "sw629", "prob": 5, "charges": [ 0, -1 ] } ] + "items": [ + { "item": "sw629", "prob": 150, "charges": [ 0, -1 ] }, + { "item": "colt_anaconda_8", "prob": 33, "charges": [ 0, -1 ] }, + { "item": "colt_anaconda_6", "prob": 50, "charges": [ 0, -1 ] }, + { "item": "colt_anaconda_4", "prob": 16, "charges": [ 0, -1 ] } + ] }, { "type": "item_group", @@ -242,7 +247,12 @@ { "type": "item_group", "id": "guns_pistol_common_display_44", - "items": [ { "item": "sw629", "prob": 5 } ] + "items": [ + { "item": "sw629", "prob": 150 }, + { "item": "colt_anaconda_8", "prob": 33 }, + { "item": "colt_anaconda_6", "prob": 50 }, + { "item": "colt_anaconda_4", "prob": 16 } + ] }, { "type": "item_group", @@ -301,7 +311,7 @@ { "type": "item_group", "id": "guns_pistol_rare_44", - "items": [ { "group": "nested_sw629", "prob": 40 } ] + "items": [ { "group": "nested_sw629", "prob": 40 }, { "group": "nested_colt_anaconda", "prob": 30 } ] }, { "type": "item_group", @@ -360,7 +370,13 @@ { "type": "item_group", "id": "guns_pistol_rare_display_44", - "items": [ { "item": "sw629", "prob": 15 }, { "group": "modular_deagle_44", "prob": 10 } ] + "items": [ + { "item": "sw629", "prob": 150 }, + { "group": "modular_deagle_44", "prob": 100 }, + { "item": "colt_anaconda_8", "prob": 33 }, + { "item": "colt_anaconda_6", "prob": 50 }, + { "item": "colt_anaconda_4", "prob": 16 } + ] }, { "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 7e783ee51c153..574cbc5497a82 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -786,6 +786,23 @@ "ammo": 100, "entries": [ { "item": "sw629", "charges": [ 0, 6 ] }, { "group": "on_hand_44" } ] }, + { + "id": "nested_colt_anaconda", + "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": [ + { + "distribution": [ + { "item": "colt_anaconda_8", "prob": 97, "charges": [ 0, 6 ] }, + { "item": "colt_anaconda_6", "prob": 143, "charges": [ 0, 6 ] }, + { "item": "colt_anaconda_4", "prob": 51, "charges": [ 0, 6 ] } + ] + }, + { "group": "on_hand_44" } + ] + }, { "id": "nested_usp_45", "type": "item_group", diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index 9309ee90c1716..a39e7dd1d1636 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -177,5 +177,100 @@ } ], "melee_damage": { "bash": 10 } + }, + { + "id": "colt_anaconda_8", + "copy-from": "pistol_revolver", + "looks_like": "sw_619", + "type": "GUN", + "name": { "str": ".44 long barrel hunting revolver" }, + "description": "A large-frame revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for the manufacturer deemed it to be the most accurate .44-calibre revolver in their line. This one has an extended 8-inch barrel.", + "variant_type": "gun", + "variants": [ + { + "id": "colt_anaconda_8", + "name": { "str": "Colt Anaconda" }, + "description": "A large-frame double-action revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for Colt deemed it to be the most accurate .44-calibre revolver in their line. This one has an extended 8-inch barrel." + } + ], + "weight": "1672 g", + "volume": "1384 ml", + "//": "350 x 153 x 70, but trimmed massively", + "longest_side": "350 mm", + "barrel_length": "203 mm", + "price": "1499 USD", + "price_postapoc": "15 USD", + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "dark_gray", + "ammo": [ "44" ], + "dispersion": 280, + "durability": 8, + "blackpowder_tolerance": 56, + "clip_size": 6, + "valid_mod_locations": [ + [ "barrel", 1 ], + [ "grip", 1 ], + [ "mechanism", 2 ], + [ "rail", 1 ], + [ "sights", 1 ], + [ "stock", 1 ], + [ "underbarrel", 1 ] + ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE", + "rigid": true, + "ammo_restriction": { "44": 6 }, + "allowed_speedloaders": [ "44_speedloader6" ] + } + ], + "melee_damage": { "bash": 7 } + }, + { + "id": "colt_anaconda_6", + "copy-from": "colt_anaconda_8", + "type": "GUN", + "name": { "str": ".44 hunting revolver" }, + "description": "A large-frame revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for the manufacturer deemed it to be the most accurate .44-calibre revolver in their line. This one has a 6-inch barrel.", + "variant_type": "gun", + "variants": [ + { + "id": "colt_anaconda", + "name": { "str": "Colt Anaconda" }, + "description": "A large-frame double-action revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for Colt deemed it to be the most accurate .44-calibre revolver in their line. This one has a 6-inch barrel." + } + ], + "weight": "1499 g", + "volume": "1299 ml", + "//": "300 x 153 x 70, but trimmed massively", + "longest_side": "300 mm", + "barrel_length": "153 mm", + "price": "1499 USD", + "symbol": "(", + "color": "dark_gray" + }, + { + "id": "colt_anaconda_4", + "copy-from": "colt_anaconda_8", + "type": "GUN", + "name": { "str": ".44 short barrel hunting revolver" }, + "description": "A large-frame revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for the manufacturer deemed it to be the most accurate .44-calibre revolver in their line. This one has a shortened 4-inch barrel.", + "variant_type": "gun", + "variants": [ + { + "id": "colt_anaconda", + "name": { "str": "Colt Anaconda" }, + "description": "A large-frame double-action revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for Colt deemed it to be the most accurate .44-calibre revolver in their line. This one has a shortened 4-inch barrel." + } + ], + "weight": "1499 g", + "volume": "1053 ml", + "//": "240 x 153 x 70, but trimmed massively", + "longest_side": "240 mm", + "barrel_length": "102 mm", + "price": "1499 USD", + "symbol": "(", + "color": "dark_gray" } ] diff --git a/data/json/npcs/NC_EVAC_BROKER.json b/data/json/npcs/NC_EVAC_BROKER.json index c52e00a99e849..e8ba273110d18 100644 --- a/data/json/npcs/NC_EVAC_BROKER.json +++ b/data/json/npcs/NC_EVAC_BROKER.json @@ -26,6 +26,9 @@ { "item": "sw_619", "prob": 30 }, { "item": "sw_610", "prob": 30 }, { "item": "sw629", "prob": 5 }, + { "item": "colt_anaconda_8", "prob": 2 }, + { "item": "colt_anaconda_6", "prob": 3 }, + { "item": "colt_anaconda_4", "prob": 1 }, { "item": "makarov", "prob": 5 }, { "item": "m9", "prob": 50 } ] diff --git a/data/json/npcs/NC_SCAVENGER.json b/data/json/npcs/NC_SCAVENGER.json index f14c104816c18..fafebc239da04 100644 --- a/data/json/npcs/NC_SCAVENGER.json +++ b/data/json/npcs/NC_SCAVENGER.json @@ -26,6 +26,9 @@ { "item": "sw_619", "prob": 30 }, { "item": "sw_610", "prob": 30 }, { "item": "sw629", "prob": 5 }, + { "item": "colt_anaconda_8", "prob": 2 }, + { "item": "colt_anaconda_6", "prob": 3 }, + { "item": "colt_anaconda_4", "prob": 1 }, { "item": "makarov", "prob": 5 }, { "item": "m9", "prob": 50 } ] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 8085b696f68c7..7e45277e3e947 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -71,7 +71,18 @@ "replace": "pistol_magnum_pipe" }, { - "id": [ "sw_619", "sw629", "bfr", "sw_500", "raging_bull", "chiappa_rhino", "colt_python" ], + "id": [ + "sw_619", + "sw629", + "bfr", + "sw_500", + "raging_bull", + "chiappa_rhino", + "colt_python", + "colt_anaconda_8", + "colt_anaconda_6", + "colt_anaconda_4" + ], "type": "MIGRATION", "replace": "pistol_magnum_revolver" },