From c70ee0d35f71e78dd6e273cd8d57f3817c8d21d7 Mon Sep 17 00:00:00 2001 From: Holli Date: Sun, 27 Oct 2024 13:49:35 -0600 Subject: [PATCH 01/11] Add Rio Bravo --- .../Weapons_Mods_Ammo/guns_by_calibre.json | 6 ++- .../Weapons_Mods_Ammo/nested_guns.json | 8 +++ data/json/items/gun/22.json | 50 +++++++++++++++++++ .../firearms/gg_firearms_migration.json | 3 +- data/mods/TEST_DATA/item_demographics.json | 2 + 5 files changed, 66 insertions(+), 3 deletions(-) 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 e99517d20a4a7..a6298ded56123 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json @@ -487,7 +487,8 @@ { "group": "nested_marlin_9a", "prob": 3 }, { "group": "nested_ruger_1022", "prob": 100 }, { "group": "nested_rossi_gallery", "prob": 11 }, - { "group": "nested_ar15_retool_22", "prob": 2 } + { "group": "nested_ar15_retool_22", "prob": 2 }, + { "group": "nested_rio_bravo", "prob": 20 } ] }, { @@ -647,7 +648,8 @@ { "item": "ruger_1022", "prob": 100 }, { "item": "rossi_gallery", "prob": 11 }, { "item": "marlin_9a", "prob": 3 }, - { "group": "ar15_22", "prob": 2 } + { "group": "ar15_22", "prob": 2 }, + { "item": "rio_bravo", "prob": 20 } ] }, { diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index 0aae2f73ee8a5..9c37753dd87d7 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -1448,6 +1448,14 @@ "ammo": 100, "entries": [ { "item": "marlin_9a", "charges": [ 0, 19 ] }, { "group": "on_hand_22" } ] }, + { + "id": "nested_rio_bravo", + "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": "rio_bravo", "charges": [ 0, 15 ] }, { "group": "on_hand_22" } ] + }, { "id": "nested_rossi_gallery", "type": "item_group", diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index aa32d6220c885..2761b631d2b3f 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -643,5 +643,55 @@ "description": "A 1911 handgun with \"1911-22\" stamped on the slide. While .22 LR 1911s were first devised as a training aid for US soldiers, it found large civilian use from concealed carry to plinking thanks to the readily available ammunition and familiar platform." } ] + }, + { + "id": "rio_bravo", + "looks_like": "marlin_9a", + "type": "GUN", + "reload_noise_volume": 10, + "name": { "str": "small game lever-action rifle" }, + "description": "A .22 Long Rifle lever-action rifle, which holds 15 rounds of ammo. While quite useful against small-game, it's effectiveness isn't as great against the undead.", + "variant_type": "gun", + "variants": [ + { + "id": "rio_bravo", + "name": { "str": "Rio Bravo" }, + "description": "A modern .22 LR lever-action rifle, the Rio Bravo features an 18\" barrel with 15 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. The mechanical origins date back decades, being based off of Rossi's R92 series of rifles, which themselves were based off of the Winchester 1892." + } + ], + "ascii_picture": "marlin_39a", + "weight": "2345 g", + "volume": "2101 ml", + "longest_side": "931 mm", + "barrel_length": "457 mm", + "price": "404 USD 99 cent", + "price_postapoc": "10 USD", + "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" }, + "material": [ "steel", "wood", "aluminum" ], + "symbol": "(", + "color": "brown", + "range": 5, + "ammo": [ "22" ], + "skill": "rifle", + "ranged_damage": { "damage_type": "bullet", "amount": 3 }, + "dispersion": 110, + "durability": 8, + "blackpowder_tolerance": 56, + "clip_size": 15, + "valid_mod_locations": [ + [ "brass catcher", 1 ], + [ "grip mount", 1 ], + [ "mechanism", 2 ], + [ "rail mount", 1 ], + [ "sights mount", 1 ], + [ "sling", 1 ], + [ "stock mount", 1 ], + [ "stock accessory", 2 ], + [ "underbarrel mount", 1 ] + ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], + "flags": [ "RELOAD_ONE", "NO_TURRET" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 15 } } ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 3bb10756cd62e..68eb4c4c882e7 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -210,7 +210,8 @@ "ruger_mk4", "rough_rider_pistol", "rough_rider_pistol_9", - "1911_22" + "1911_22", + "rio_bravo" ], "type": "MIGRATION", "replace": "pistol_tiny_target" diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json index be141260f17fc..c7b42dee758a6 100644 --- a/data/mods/TEST_DATA/item_demographics.json +++ b/data/mods/TEST_DATA/item_demographics.json @@ -678,6 +678,7 @@ "sig_mosquito": 1, "walther_p22": 1, "cp33": 1, + "rio_bravo": 1, "ruger_charger": 1, "ruger_charger_auto": 1, "ruger_1022_auto": 1, @@ -1135,6 +1136,7 @@ "rifle_9mm": 1, "rifle_9x18": 1, "rifle_flintlock": 1, + "rio_bravo": 1, "rm11b_sniper_rifle": 1, "rm298": 1, "rm51_assault_rifle": 1, From 30b1e7578f4df277a47e12b79bebc34129b881e6 Mon Sep 17 00:00:00 2001 From: Holli Date: Sun, 27 Oct 2024 14:11:39 -0600 Subject: [PATCH 02/11] Henry Golden Boy --- .../Weapons_Mods_Ammo/guns_by_calibre.json | 6 ++- .../Weapons_Mods_Ammo/nested_guns.json | 8 +++ data/json/items/gun/22.json | 50 +++++++++++++++++++ .../firearms/gg_firearms_migration.json | 3 +- data/mods/TEST_DATA/item_demographics.json | 2 + 5 files changed, 66 insertions(+), 3 deletions(-) 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 a6298ded56123..9fca9fb0988cf 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json @@ -488,7 +488,8 @@ { "group": "nested_ruger_1022", "prob": 100 }, { "group": "nested_rossi_gallery", "prob": 11 }, { "group": "nested_ar15_retool_22", "prob": 2 }, - { "group": "nested_rio_bravo", "prob": 20 } + { "group": "nested_rio_bravo", "prob": 15 }, + { "group": "nested_henry_golden_boy", "prob": 31 } ] }, { @@ -649,7 +650,8 @@ { "item": "rossi_gallery", "prob": 11 }, { "item": "marlin_9a", "prob": 3 }, { "group": "ar15_22", "prob": 2 }, - { "item": "rio_bravo", "prob": 20 } + { "item": "rio_bravo", "prob": 15 }, + { "item": "henry_golden_boy", "prob": 31 } ] }, { diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index 9c37753dd87d7..dddc3cbb66721 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -1456,6 +1456,14 @@ "ammo": 100, "entries": [ { "item": "rio_bravo", "charges": [ 0, 15 ] }, { "group": "on_hand_22" } ] }, + { + "id": "nested_henry_golden_boy", + "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": "henry_golden_boy", "charges": [ 0, 16 ] }, { "group": "on_hand_22" } ] + }, { "id": "nested_rossi_gallery", "type": "item_group", diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 2761b631d2b3f..5c33f54063643 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -693,5 +693,55 @@ "flags": [ "RELOAD_ONE", "NO_TURRET" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 15 } } ], "melee_damage": { "bash": 12 } + }, + { + "id": "henry_golden_boy", + "looks_like": "marlin_9a", + "type": "GUN", + "reload_noise_volume": 10, + "name": { "str": "small game lever-action rifle" }, + "description": "A .22 Long Rifle lever-action rifle, which holds 16 rounds of ammo. While quite useful against small-game, it's effectiveness isn't as great against the undead.", + "variant_type": "gun", + "variants": [ + { + "id": "henry_golden_boy", + "name": { "str": "Henry Golden Boy" }, + "description": "A modern .22 LR lever-action rifle, the Henry Golden Boy features an 20\" octagonal barrel with 16 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. It fairly resembles the original Henry Model 1860 with it's brass colored reciever, though with wooden furniture at the front, and no doubt using modern manufacturing." + } + ], + "ascii_picture": "marlin_39a", + "weight": "3062 g", + "volume": "2116 ml", + "longest_side": "979 mm", + "barrel_length": "580 mm", + "price": "648 USD", + "price_postapoc": "11 USD", + "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" }, + "material": [ "steel", "wood", "aluminum", "brass" ], + "symbol": "(", + "color": "brown", + "range": 6, + "ammo": [ "22" ], + "skill": "rifle", + "ranged_damage": { "damage_type": "bullet", "amount": 3 }, + "dispersion": 100, + "durability": 8, + "blackpowder_tolerance": 56, + "clip_size": 16, + "valid_mod_locations": [ + [ "brass catcher", 1 ], + [ "grip mount", 1 ], + [ "mechanism", 2 ], + [ "rail mount", 1 ], + [ "sights mount", 1 ], + [ "sling", 1 ], + [ "stock mount", 1 ], + [ "stock accessory", 2 ], + [ "underbarrel mount", 1 ] + ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], + "flags": [ "RELOAD_ONE", "NO_TURRET" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 16 } } ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 68eb4c4c882e7..13218de75bc2a 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -211,7 +211,8 @@ "rough_rider_pistol", "rough_rider_pistol_9", "1911_22", - "rio_bravo" + "rio_bravo", + "henry_golden_boy" ], "type": "MIGRATION", "replace": "pistol_tiny_target" diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json index c7b42dee758a6..a87e698a5ec62 100644 --- a/data/mods/TEST_DATA/item_demographics.json +++ b/data/mods/TEST_DATA/item_demographics.json @@ -671,6 +671,7 @@ "weight": 204, "items": { "1911-22": 1, + "henry_golden_boy": 1, "marlin_9a": 1, "rifle_22": 1, "ruger_1022": 1, @@ -1064,6 +1065,7 @@ "fn_ps90": 1, "garand": 1, "henry_big_boy": 1, + "henry_golden_boy": 1, "hk417_13": 1, "hk_g3": 1, "hk_g80": 1, From 12168c19dbb54a5195c4cb3532e5c7f106b23c71 Mon Sep 17 00:00:00 2001 From: Holli Date: Sun, 27 Oct 2024 15:02:15 -0600 Subject: [PATCH 03/11] Add .44 R92 --- .../Weapons_Mods_Ammo/guns_by_calibre.json | 12 ++- .../Weapons_Mods_Ammo/nested_guns.json | 16 ++++ data/json/items/gun/44.json | 86 +++++++++++++++++++ .../firearms/gg_firearms_migration.json | 2 +- data/mods/TEST_DATA/item_demographics.json | 12 ++- 5 files changed, 124 insertions(+), 4 deletions(-) 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 9fca9fb0988cf..939c8e2414cb7 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json @@ -557,7 +557,11 @@ { "type": "item_group", "id": "guns_rifle_common_44", - "items": [ { "group": "nested_henry_big_boy", "prob": 100 } ] + "items": [ + { "group": "nested_henry_big_boy", "prob": 100 }, + { "group": "nested_rossi_r92_44_16", "prob": 185 }, + { "group": "nested_rossi_r92_44_20", "prob": 121 } + ] }, { "type": "item_group", @@ -720,7 +724,11 @@ { "type": "item_group", "id": "guns_rifle_common_display_44", - "items": [ { "item": "henry_big_boy", "prob": 100 } ] + "items": [ + { "item": "henry_big_boy", "prob": 100 }, + { "item": "rossi_r92_44_16", "prob": 185 }, + { "item": "rossi_r92_44_20", "prob": 121 } + ] }, { "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 dddc3cbb66721..f3241d21866e3 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -1649,6 +1649,22 @@ "ammo": 100, "entries": [ { "item": "henry_big_boy", "charges": [ 0, 10 ] }, { "group": "on_hand_44" } ] }, + { + "id": "nested_rossi_r92_44_16", + "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": "rossi_r92_44_16", "charges": [ 0, 10 ] }, { "group": "on_hand_44" } ] + }, + { + "id": "nested_rossi_r92_44_20", + "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": "rossi_r92_44_20", "charges": [ 0, 10 ] }, { "group": "on_hand_44" } ] + }, { "id": "nested_m14ebr", "type": "item_group", diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index bc8dde57701b0..964f43a1077d6 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -269,5 +269,91 @@ "price": "1499 USD", "symbol": "(", "color": "dark_gray" + }, + { + "id": "rossi_r92_44_16", + "copy-from": "rifle_manual", + "looks_like": "modular_ar15", + "type": "GUN", + "name": { "str": ".44 lever-action rifle" }, + "description": "This fine lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 16\" barrel with a tube fed magazine. Go get 'em cowboy!", + "variant_type": "gun", + "variants": [ + { + "id": "rossi_r92_44_16", + "name": { "str": "Rossi R92 16\"", "str_pl": "Rossi R92s 16\"" }, + "description": "The R92 is a widely succesfull line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features all-black furniture, a 16\" barrel, and 8 rounds of .44 Magnum, along with a large lever loop." + } + ], + "weight": "2529 g", + "volume": "2076 ml", + "longest_side": "879 cm", + "barrel_length": "419 mm", + "price": "1060 USD 99 cent", + "price_postapoc": "15 USD", + "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" }, + "material": [ "steel", "wood" ], + "color": "dark_gray", + "range": 5, + "ammo": [ "44" ], + "dispersion": 160, + "durability": 8, + "blackpowder_tolerance": 32, + "clip_size": 8, + "valid_mod_locations": [ + [ "grip", 1 ], + [ "mechanism", 2 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock mount", 1 ], + [ "rail mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "flags": [ "NO_TURRET" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "44": 8 } } ], + "melee_damage": { "bash": 12 } + }, + { + "id": "rossi_r92_44_20", + "copy-from": "rifle_manual", + "looks_like": "modular_ar15", + "type": "GUN", + "name": { "str": ".44 lever-action rifle" }, + "description": "This fine lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", + "variant_type": "gun", + "variants": [ + { + "id": "rossi_r92_44_16", + "name": { "str": "Rossi R92 20\"", "str_pl": "Rossi R92s 20\"" }, + "description": "The R92 is a widely succesfull line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features all-black furniture, a 20\" barrel, and 10 rounds of .44 Magnum." + } + ], + "weight": "2705 g", + "volume": "2015 ml", + "longest_side": "965 cm", + "barrel_length": "508 mm", + "price": "1060 USD 99 cent", + "price_postapoc": "15 USD", + "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" }, + "material": [ "steel", "wood" ], + "color": "dark_gray", + "range": 7, + "ammo": [ "44" ], + "dispersion": 140, + "durability": 8, + "blackpowder_tolerance": 32, + "clip_size": 10, + "valid_mod_locations": [ + [ "grip", 1 ], + [ "mechanism", 2 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock mount", 1 ], + [ "rail mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "flags": [ "NO_TURRET" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "44": 10 } } ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 13218de75bc2a..344db20429a92 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_automag" }, { - "id": [ "henry_big_boy" ], + "id": [ "henry_big_boy", "rossi_r92_44_20", "rossi_r92_44_16" ], "type": "MIGRATION", "replace": "pistol_magnum_levergun" }, diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json index a87e698a5ec62..b519281ff7c9a 100644 --- a/data/mods/TEST_DATA/item_demographics.json +++ b/data/mods/TEST_DATA/item_demographics.json @@ -830,7 +830,15 @@ { "type": "44", "weight": 15, - "items": { "deagle_44": 1, "henry_big_boy": 1, "rifle_44": 1, "ruger_redhawk": 1, "sw629": 1 } + "items": { + "deagle_44": 1, + "henry_big_boy": 1, + "rossi_r92_44_16": 1, + "rossi_r92_44_20": 1, + "rifle_44": 1, + "ruger_redhawk": 1, + "sw629": 1 + } }, { "type": "3006", @@ -1142,6 +1150,8 @@ "rm11b_sniper_rifle": 1, "rm298": 1, "rm51_assault_rifle": 1, + "rossi_r92_44_16": 1, + "rossi_r92_44_20": 1, "rossi_gallery": 1, "ruger_1022": 1, "ruger_1022_auto": 1, From 36607f8f3b88f563c5b7647d1d4a27ce4abdd942 Mon Sep 17 00:00:00 2001 From: Holli Date: Sun, 27 Oct 2024 20:09:58 -0600 Subject: [PATCH 04/11] Adds Uberti 1873 --- .../itemgroups/Weapons_Mods_Ammo/guns.json | 2 + .../Weapons_Mods_Ammo/guns_by_calibre.json | 14 ++++++ .../Weapons_Mods_Ammo/nested_guns.json | 8 ++++ data/json/items/gun/38.json | 44 +++++++++++++++++++ .../firearms/gg_firearms_migration.json | 12 ++++- data/mods/TEST_DATA/item_demographics.json | 3 +- 6 files changed, 81 insertions(+), 2 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index 271aa87569936..31f76ca187e64 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -194,6 +194,7 @@ { "group": "guns_rifle_common_762", "prob": 230 }, { "group": "guns_rifle_common_9mm", "prob": 180 }, { "group": "guns_rifle_common_3006", "prob": 149 }, + { "group": "guns_rifle_common_357", "prob": 108 }, { "group": "guns_rifle_common_44", "prob": 81 }, { "group": "guns_rifle_common_762R", "prob": 70 }, { "group": "guns_rifle_common_270win", "prob": 57 }, @@ -231,6 +232,7 @@ { "group": "guns_rifle_common_display_762", "prob": 230 }, { "group": "guns_rifle_common_display_9mm", "prob": 180 }, { "group": "guns_rifle_common_display_3006", "prob": 149 }, + { "group": "guns_rifle_common_display_357", "prob": 108 }, { "group": "guns_rifle_common_display_44", "prob": 81 }, { "group": "guns_rifle_common_display_762R", "prob": 70 }, { "group": "guns_rifle_common_display_270win", "prob": 57 }, 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 939c8e2414cb7..493c725ff945b 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json @@ -554,6 +554,13 @@ { "group": "nested_m1903", "prob": 26 } ] }, + { + "type": "item_group", + "id": "guns_rifle_common_357", + "items": [ + { "group": "nested_uberti_1873", "prob": 100 } + ] + }, { "type": "item_group", "id": "guns_rifle_common_44", @@ -721,6 +728,13 @@ { "item": "m1903", "prob": 26 } ] }, + { + "type": "item_group", + "id": "guns_rifle_common_display_357", + "items": [ + { "item": "uberti_1873", "prob": 100 } + ] + }, { "type": "item_group", "id": "guns_rifle_common_display_44", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index f3241d21866e3..bab44d1d07b11 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -1665,6 +1665,14 @@ "ammo": 100, "entries": [ { "item": "rossi_r92_44_20", "charges": [ 0, 10 ] }, { "group": "on_hand_44" } ] }, + { + "id": "nested_uberti_1873", + "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": "uberti_1873", "charges": [ 0, 10 ] }, { "group": "on_hand_357" } ] + }, { "id": "nested_m14ebr", "type": "item_group", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index ae067c340c6af..2dd79ec653111 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -351,5 +351,49 @@ } ], "melee_damage": { "bash": 6 } + }, + { + "id": "uberti_1873", + "copy-from": "rifle_manual", + "looks_like": "modular_ar15", + "type": "GUN", + "name": { "str": ".357 lever-action rifle" }, + "description": "This fine lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", + "variant_type": "gun", + "variants": [ + { + "id": "uberti_1873", + "name": { "str": "Uberti 1873" }, + "description": "The 1873 is a rifle platform developed all the way in, unsurprisingly, 1873. This one is a fairly faithful Uberti reproduction, although the original 1873s pre-dated .357 Magnum, and even .38 Special. This one has a case-hardened finish, wood furniture, and octagonal barrel." + } + ], + "//": "Stats from the .357 Short Rifle https://www.uberti-usa.com/cartridge-rifles/1873-rifle-and-carbine", + "weight": "3719 g", + "volume": "2718 ml", + "longest_side": "1117 cm", + "barrel_length": "508 mm", + "price": "1429 USD", + "price_postapoc": "15 USD", + "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" }, + "material": [ "steel", "wood" ], + "color": "dark_gray", + "range": 7, + "ammo": [ "357mag", "38" ], + "dispersion": 140, + "durability": 8, + "blackpowder_tolerance": 32, + "clip_size": 10, + "valid_mod_locations": [ + [ "grip", 1 ], + [ "mechanism", 2 ], + [ "sights mount", 1 ], + [ "sling", 1 ], + [ "stock mount", 1 ], + [ "rail mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "flags": [ "NO_TURRET" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "357mag": 10, "38": 10 } } ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 344db20429a92..63f2dd57085ed 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -155,7 +155,17 @@ "replace": "pistol_medium" }, { - "id": [ "hk_mp5_semi_pistol", "ksub2000", "calico", "hk_mp5_10_semi", "TDI_10", "mp40semi", "hpt3895", "draco_9mm" ], + "id": [ + "hk_mp5_semi_pistol", + "ksub2000", + "calico", + "hk_mp5_10_semi", + "TDI_10", + "mp40semi", + "hpt3895", + "draco_9mm", + "uberti_1873" + ], "type": "MIGRATION", "replace": "pistol_pcc" }, diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json index b519281ff7c9a..0a1e77b7616c1 100644 --- a/data/mods/TEST_DATA/item_demographics.json +++ b/data/mods/TEST_DATA/item_demographics.json @@ -767,7 +767,7 @@ "bren2_762": 1 } }, - { "type": "357mag", "weight": 34, "items": { "sw_619": 1, "rp63": 1, "chiappa_rhino": 1 } }, + { "type": "357mag", "weight": 34, "items": { "sw_619": 1, "rp63": 1, "chiappa_rhino": 1, "uberti_1873": 1 } }, { "type": "shot", "weight": 26, @@ -1173,6 +1173,7 @@ "tac338": 1, "tac50": 1, "trex_gun": 1, + "uberti_1873": 1, "vz58_p": 1, "vz58ts": 1, "weatherby_5": 1, From adc1f7c9e823f431fee68094b5b1633c00ba76c1 Mon Sep 17 00:00:00 2001 From: Holli Date: Mon, 28 Oct 2024 12:23:41 -0600 Subject: [PATCH 05/11] Added sources --- data/json/items/gun/22.json | 2 ++ data/json/items/gun/44.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 5c33f54063643..d69a5d965be35 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -659,6 +659,7 @@ "description": "A modern .22 LR lever-action rifle, the Rio Bravo features an 18\" barrel with 15 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. The mechanical origins date back decades, being based off of Rossi's R92 series of rifles, which themselves were based off of the Winchester 1892." } ], + "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/313-rio-bravo-wood-matte-black-22-lr-18-in", "ascii_picture": "marlin_39a", "weight": "2345 g", "volume": "2101 ml", @@ -709,6 +710,7 @@ "description": "A modern .22 LR lever-action rifle, the Henry Golden Boy features an 20\" octagonal barrel with 16 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. It fairly resembles the original Henry Model 1860 with it's brass colored reciever, though with wooden furniture at the front, and no doubt using modern manufacturing." } ], + "//": "Stats from https://www.henryusa.com/rifles/golden-boy/", "ascii_picture": "marlin_39a", "weight": "3062 g", "volume": "2116 ml", diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index 964f43a1077d6..8d7eb78c5232e 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -285,6 +285,7 @@ "description": "The R92 is a widely succesfull line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features all-black furniture, a 16\" barrel, and 8 rounds of .44 Magnum, along with a large lever loop." } ], + "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/349-r92-triple-black-wood-black-cerakote-44-mag-16-in", "weight": "2529 g", "volume": "2076 ml", "longest_side": "879 cm", @@ -328,6 +329,7 @@ "description": "The R92 is a widely succesfull line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features all-black furniture, a 20\" barrel, and 10 rounds of .44 Magnum." } ], + "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/368-r92-hardwood-polished-black-oxide-44-mag-20-in", "weight": "2705 g", "volume": "2015 ml", "longest_side": "965 cm", From 117f6d51049239d0de9188c0c0f94a21f29c6b90 Mon Sep 17 00:00:00 2001 From: Holli Date: Mon, 28 Oct 2024 12:41:29 -0600 Subject: [PATCH 06/11] 357 R92 --- .../Weapons_Mods_Ammo/guns_by_calibre.json | 8 +- .../Weapons_Mods_Ammo/nested_guns.json | 16 ++++ data/json/items/gun/38.json | 90 ++++++++++++++++++- .../firearms/gg_firearms_migration.json | 4 +- data/mods/TEST_DATA/item_demographics.json | 8 +- 5 files changed, 121 insertions(+), 5 deletions(-) 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 493c725ff945b..500f620b9e872 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json @@ -558,7 +558,9 @@ "type": "item_group", "id": "guns_rifle_common_357", "items": [ - { "group": "nested_uberti_1873", "prob": 100 } + { "group": "nested_uberti_1873", "prob": 100 }, + { "group": "nested_rossi_r92_357_16", "prob": 18 }, + { "group": "nested_rossi_r92_357_20", "prob": 37 } ] }, { @@ -732,7 +734,9 @@ "type": "item_group", "id": "guns_rifle_common_display_357", "items": [ - { "item": "uberti_1873", "prob": 100 } + { "item": "uberti_1873", "prob": 100 }, + { "item": "rossi_r92_357_16", "prob": 18 }, + { "item": "rossi_r92_357_20", "prob": 37 } ] }, { diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index bab44d1d07b11..46acdc85b5a54 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -1673,6 +1673,22 @@ "ammo": 100, "entries": [ { "item": "uberti_1873", "charges": [ 0, 10 ] }, { "group": "on_hand_357" } ] }, + { + "id": "nested_rossi_r92_357_16", + "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": "rossi_r92_357_16", "charges": [ 0, 8 ] }, { "group": "on_hand_357" } ] + }, + { + "id": "nested_rossi_r92_357_20", + "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": "rossi_r92_357_20", "charges": [ 0, 10 ] }, { "group": "on_hand_357" } ] + }, { "id": "nested_m14ebr", "type": "item_group", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index 2dd79ec653111..4c6ec6bf7f9f1 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -358,7 +358,7 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": ".357 lever-action rifle" }, - "description": "This fine lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", + "description": "This fine lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", "variant_type": "gun", "variants": [ { @@ -395,5 +395,93 @@ "flags": [ "NO_TURRET" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "357mag": 10, "38": 10 } } ], "melee_damage": { "bash": 12 } + }, + { + "id": "rossi_r92_357_20", + "copy-from": "rifle_manual", + "looks_like": "modular_ar15", + "type": "GUN", + "name": { "str": ".357 lever-action rifle" }, + "description": "This fine lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", + "variant_type": "gun", + "variants": [ + { + "id": "rossi_r92_357_20", + "name": { "str": "Rossi R92 20\"", "str_pl": "Rossi R92s 20\"" }, + "description": "The R92 is a widely succesfull line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features wooden furniture, a 20\" barrel, and 10 rounds of .357 Magnum or .38 Special." + } + ], + "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/373-r92-traditional-hardwood-stock-black-357-mag-38-special-p-20-in", + "weight": "2804 g", + "volume": "1986 ml", + "longest_side": "946 cm", + "barrel_length": "508 mm", + "price": "840 USD 99 cent", + "price_postapoc": "15 USD", + "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" }, + "material": [ "steel", "wood" ], + "color": "dark_gray", + "range": 7, + "ammo": [ "357mag", "38" ], + "dispersion": 140, + "durability": 8, + "blackpowder_tolerance": 32, + "clip_size": 10, + "valid_mod_locations": [ + [ "grip", 1 ], + [ "mechanism", 2 ], + [ "sights mount", 1 ], + [ "sling", 1 ], + [ "stock mount", 1 ], + [ "rail mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "flags": [ "NO_TURRET" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "357mag": 10, "38": 10 } } ], + "melee_damage": { "bash": 12 } + }, + { + "id": "rossi_r92_357_16", + "copy-from": "rifle_manual", + "looks_like": "modular_ar15", + "type": "GUN", + "name": { "str": ".357 lever-action rifle" }, + "description": "This fine lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 16\" barrel with a tube fed magazine. Go get 'em cowboy!", + "variant_type": "gun", + "variants": [ + { + "id": "rossi_r92_357_16", + "name": { "str": "Rossi R92 16\"", "str_pl": "Rossi R92s 16\"" }, + "description": "The R92 is a widely succesfull line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features wooden furniture, a 16\" barrel, and 8 rounds of .357 Magnum or .38 Special." + } + ], + "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/372-r92-hardwood-357-mag-38-special-p-polished-black-oxide-16-in", + "weight": "2662 g", + "volume": "1909 ml", + "longest_side": "843 cm", + "barrel_length": "406 mm", + "price": "833 USD 99 cent", + "price_postapoc": "15 USD", + "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" }, + "material": [ "steel", "wood" ], + "color": "dark_gray", + "range": 5, + "ammo": [ "357mag", "38" ], + "dispersion": 140, + "durability": 8, + "blackpowder_tolerance": 32, + "clip_size": 8, + "valid_mod_locations": [ + [ "grip", 1 ], + [ "mechanism", 2 ], + [ "sights mount", 1 ], + [ "sling", 1 ], + [ "stock mount", 1 ], + [ "rail mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "flags": [ "NO_TURRET" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "357mag": 8, "38": 8 } } ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 63f2dd57085ed..20865d18af0f5 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -164,7 +164,9 @@ "mp40semi", "hpt3895", "draco_9mm", - "uberti_1873" + "uberti_1873", + "rossi_r92_357_16", + "rossi_r92_357_20" ], "type": "MIGRATION", "replace": "pistol_pcc" diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json index 0a1e77b7616c1..65f8206e00bf0 100644 --- a/data/mods/TEST_DATA/item_demographics.json +++ b/data/mods/TEST_DATA/item_demographics.json @@ -767,7 +767,11 @@ "bren2_762": 1 } }, - { "type": "357mag", "weight": 34, "items": { "sw_619": 1, "rp63": 1, "chiappa_rhino": 1, "uberti_1873": 1 } }, + { + "type": "357mag", + "weight": 34, + "items": { "sw_619": 1, "rp63": 1, "chiappa_rhino": 1, "uberti_1873": 1, "rossi_r92_357_16": 1, "rossi_r92_357_20": 1 } + }, { "type": "shot", "weight": 26, @@ -1150,6 +1154,8 @@ "rm11b_sniper_rifle": 1, "rm298": 1, "rm51_assault_rifle": 1, + "rossi_r92_357_16": 1, + "rossi_r92_357_20": 1, "rossi_r92_44_16": 1, "rossi_r92_44_20": 1, "rossi_gallery": 1, From 4853ec4cca9810be0cbed60349cee1b6605dea3f Mon Sep 17 00:00:00 2001 From: Holli Date: Mon, 28 Oct 2024 12:51:16 -0600 Subject: [PATCH 07/11] Minor fixes --- data/json/items/gun/22.json | 6 +++--- data/json/items/gun/38.json | 10 +++++----- data/json/items/gun/44.json | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index d69a5d965be35..7e0b2b8e50411 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -656,7 +656,7 @@ { "id": "rio_bravo", "name": { "str": "Rio Bravo" }, - "description": "A modern .22 LR lever-action rifle, the Rio Bravo features an 18\" barrel with 15 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. The mechanical origins date back decades, being based off of Rossi's R92 series of rifles, which themselves were based off of the Winchester 1892." + "description": "A modern .22 LR lever-action rifle, the Rio Bravo features an 18\" barrel with 15 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. The mechanical origins date back decades, being based off of Rossi's R92 series of rifles which themselves were based off of the Winchester 1892." } ], "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/313-rio-bravo-wood-matte-black-22-lr-18-in", @@ -693,7 +693,7 @@ "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], "flags": [ "RELOAD_ONE", "NO_TURRET" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 15 } } ], - "melee_damage": { "bash": 12 } + "melee_damage": { "bash": 9 } }, { "id": "henry_golden_boy", @@ -707,7 +707,7 @@ { "id": "henry_golden_boy", "name": { "str": "Henry Golden Boy" }, - "description": "A modern .22 LR lever-action rifle, the Henry Golden Boy features an 20\" octagonal barrel with 16 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. It fairly resembles the original Henry Model 1860 with it's brass colored reciever, though with wooden furniture at the front, and no doubt using modern manufacturing." + "description": "A modern .22 LR lever-action rifle, the Henry Golden Boy features an 20\" octagonal barrel with 16 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. It fairly resembles the original Henry Model 1860 with it's brass colored reciever, though with wooden furniture at the front, and without a doubt using modern manufacturing." } ], "//": "Stats from https://www.henryusa.com/rifles/golden-boy/", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index 4c6ec6bf7f9f1..5e8ef2eae16eb 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -357,7 +357,7 @@ "copy-from": "rifle_manual", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": ".357 lever-action rifle" }, + "name": { "str": "reproduction .357 lever-action rifle" }, "description": "This fine lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", "variant_type": "gun", "variants": [ @@ -381,7 +381,7 @@ "ammo": [ "357mag", "38" ], "dispersion": 140, "durability": 8, - "blackpowder_tolerance": 32, + "blackpowder_tolerance": 56, "clip_size": 10, "valid_mod_locations": [ [ "grip", 1 ], @@ -402,7 +402,7 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": ".357 lever-action rifle" }, - "description": "This fine lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", + "description": "This lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", "variant_type": "gun", "variants": [ { @@ -425,7 +425,7 @@ "ammo": [ "357mag", "38" ], "dispersion": 140, "durability": 8, - "blackpowder_tolerance": 32, + "blackpowder_tolerance": 56, "clip_size": 10, "valid_mod_locations": [ [ "grip", 1 ], @@ -469,7 +469,7 @@ "ammo": [ "357mag", "38" ], "dispersion": 140, "durability": 8, - "blackpowder_tolerance": 32, + "blackpowder_tolerance": 56, "clip_size": 8, "valid_mod_locations": [ [ "grip", 1 ], diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index 8d7eb78c5232e..a458037a85a59 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -276,7 +276,7 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": ".44 lever-action rifle" }, - "description": "This fine lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 16\" barrel with a tube fed magazine. Go get 'em cowboy!", + "description": "This lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 16\" barrel with a tube fed magazine. Go get 'em cowboy!", "variant_type": "gun", "variants": [ { @@ -299,7 +299,7 @@ "ammo": [ "44" ], "dispersion": 160, "durability": 8, - "blackpowder_tolerance": 32, + "blackpowder_tolerance": 56, "clip_size": 8, "valid_mod_locations": [ [ "grip", 1 ], @@ -320,7 +320,7 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": ".44 lever-action rifle" }, - "description": "This fine lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", + "description": "This lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", "variant_type": "gun", "variants": [ { @@ -343,7 +343,7 @@ "ammo": [ "44" ], "dispersion": 140, "durability": 8, - "blackpowder_tolerance": 32, + "blackpowder_tolerance": 56, "clip_size": 10, "valid_mod_locations": [ [ "grip", 1 ], From e0649480e57a18379e462df44fa1dcdaed71e718 Mon Sep 17 00:00:00 2001 From: Holli Date: Mon, 28 Oct 2024 12:54:40 -0600 Subject: [PATCH 08/11] fix in ammo count for nested r92 --- data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index 46acdc85b5a54..3b3050de1f4f7 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -1655,7 +1655,7 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "rossi_r92_44_16", "charges": [ 0, 10 ] }, { "group": "on_hand_44" } ] + "entries": [ { "item": "rossi_r92_44_16", "charges": [ 0, 8 ] }, { "group": "on_hand_44" } ] }, { "id": "nested_rossi_r92_44_20", From 084a9e01af6f48ba8b6526bb09a89ae7650a88b8 Mon Sep 17 00:00:00 2001 From: Holli Date: Mon, 28 Oct 2024 13:03:39 -0600 Subject: [PATCH 09/11] Spelling fixes --- data/json/items/gun/22.json | 4 ++-- data/json/items/gun/38.json | 4 ++-- data/json/items/gun/44.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 7e0b2b8e50411..e869ddc65f17b 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -655,7 +655,7 @@ "variants": [ { "id": "rio_bravo", - "name": { "str": "Rio Bravo" }, + "name": { "str": "Rossi Rio Bravo" }, "description": "A modern .22 LR lever-action rifle, the Rio Bravo features an 18\" barrel with 15 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. The mechanical origins date back decades, being based off of Rossi's R92 series of rifles which themselves were based off of the Winchester 1892." } ], @@ -707,7 +707,7 @@ { "id": "henry_golden_boy", "name": { "str": "Henry Golden Boy" }, - "description": "A modern .22 LR lever-action rifle, the Henry Golden Boy features an 20\" octagonal barrel with 16 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. It fairly resembles the original Henry Model 1860 with it's brass colored reciever, though with wooden furniture at the front, and without a doubt using modern manufacturing." + "description": "A modern .22 LR lever-action rifle, the Henry Golden Boy features an 20\" octagonal barrel with 16 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. It fairly resembles the original Henry Model 1860 with it's brass colored receiver, though with wooden furniture at the front, and without a doubt using modern manufacturing." } ], "//": "Stats from https://www.henryusa.com/rifles/golden-boy/", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index 5e8ef2eae16eb..5de5b5b054727 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -408,7 +408,7 @@ { "id": "rossi_r92_357_20", "name": { "str": "Rossi R92 20\"", "str_pl": "Rossi R92s 20\"" }, - "description": "The R92 is a widely succesfull line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features wooden furniture, a 20\" barrel, and 10 rounds of .357 Magnum or .38 Special." + "description": "The R92 is a widely successful line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features wooden furniture, a 20\" barrel, and 10 rounds of .357 Magnum or .38 Special." } ], "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/373-r92-traditional-hardwood-stock-black-357-mag-38-special-p-20-in", @@ -452,7 +452,7 @@ { "id": "rossi_r92_357_16", "name": { "str": "Rossi R92 16\"", "str_pl": "Rossi R92s 16\"" }, - "description": "The R92 is a widely succesfull line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features wooden furniture, a 16\" barrel, and 8 rounds of .357 Magnum or .38 Special." + "description": "The R92 is a widely successful line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features wooden furniture, a 16\" barrel, and 8 rounds of .357 Magnum or .38 Special." } ], "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/372-r92-hardwood-357-mag-38-special-p-polished-black-oxide-16-in", diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index a458037a85a59..3570780b06c7f 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -282,7 +282,7 @@ { "id": "rossi_r92_44_16", "name": { "str": "Rossi R92 16\"", "str_pl": "Rossi R92s 16\"" }, - "description": "The R92 is a widely succesfull line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features all-black furniture, a 16\" barrel, and 8 rounds of .44 Magnum, along with a large lever loop." + "description": "The R92 is a widely successful line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features all-black furniture, a 16\" barrel, and 8 rounds of .44 Magnum, along with a large lever loop." } ], "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/349-r92-triple-black-wood-black-cerakote-44-mag-16-in", @@ -326,7 +326,7 @@ { "id": "rossi_r92_44_16", "name": { "str": "Rossi R92 20\"", "str_pl": "Rossi R92s 20\"" }, - "description": "The R92 is a widely succesfull line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features all-black furniture, a 20\" barrel, and 10 rounds of .44 Magnum." + "description": "The R92 is a widely successful line of lever-action rifles from Rossi, featuring a wide array of different calibers and barrel lengths. These aim to be less reproductions of old rifles, but rather modern takes on the lever-action formula. This particular one features all-black furniture, a 20\" barrel, and 10 rounds of .44 Magnum." } ], "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/368-r92-hardwood-polished-black-oxide-44-mag-20-in", From cb4930a7e6bbee0d16178ed26819d4739842e316 Mon Sep 17 00:00:00 2001 From: Holli <78005870+Holli-Git@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:12:02 -0600 Subject: [PATCH 10/11] Apply suggestions from code review Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> --- data/json/items/gun/22.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index e869ddc65f17b..b85d9c671e95d 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -650,13 +650,13 @@ "type": "GUN", "reload_noise_volume": 10, "name": { "str": "small game lever-action rifle" }, - "description": "A .22 Long Rifle lever-action rifle, which holds 15 rounds of ammo. While quite useful against small-game, it's effectiveness isn't as great against the undead.", + "description": "A .22 Long Rifle lever-action rifle, which holds 15 rounds of ammo. While quite useful against small-game, its effectiveness isn't as great against the undead.", "variant_type": "gun", "variants": [ { "id": "rio_bravo", "name": { "str": "Rossi Rio Bravo" }, - "description": "A modern .22 LR lever-action rifle, the Rio Bravo features an 18\" barrel with 15 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. The mechanical origins date back decades, being based off of Rossi's R92 series of rifles which themselves were based off of the Winchester 1892." + "description": "A modern .22 LR lever-action rifle, the Rio Bravo features an 18\" barrel with 15 rounds of ammo in its tube magazine, which is loaded from the front of the rifle. The mechanical origins date back decades, being based off of Rossi's R92 series of rifles which themselves were based off of the Winchester 1892." } ], "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/313-rio-bravo-wood-matte-black-22-lr-18-in", @@ -701,13 +701,13 @@ "type": "GUN", "reload_noise_volume": 10, "name": { "str": "small game lever-action rifle" }, - "description": "A .22 Long Rifle lever-action rifle, which holds 16 rounds of ammo. While quite useful against small-game, it's effectiveness isn't as great against the undead.", + "description": "A .22 Long Rifle lever-action rifle, which holds 16 rounds of ammo. While quite useful against small-game, its effectiveness isn't as great against the undead.", "variant_type": "gun", "variants": [ { "id": "henry_golden_boy", "name": { "str": "Henry Golden Boy" }, - "description": "A modern .22 LR lever-action rifle, the Henry Golden Boy features an 20\" octagonal barrel with 16 rounds of ammo in it's tube magazine, which is loaded from the front of the rifle. It fairly resembles the original Henry Model 1860 with it's brass colored receiver, though with wooden furniture at the front, and without a doubt using modern manufacturing." + "description": "A modern .22 LR lever-action rifle, the Henry Golden Boy features an 20\" octagonal barrel with 16 rounds of ammo in its tube magazine, which is loaded from the front of the rifle. It fairly resembles the original Henry Model 1860 with its brass colored receiver, though with wooden furniture at the front, and without a doubt using modern manufacturing." } ], "//": "Stats from https://www.henryusa.com/rifles/golden-boy/", From d1bf80c5b50ea8f68a41dc70cf715134b3d0a386 Mon Sep 17 00:00:00 2001 From: Holli <78005870+Holli-Git@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:11:06 -0600 Subject: [PATCH 11/11] Apply suggestions from code review Co-authored-by: Anton Burmistrov --- data/json/items/gun/22.json | 4 ++-- data/json/items/gun/38.json | 6 +++--- data/json/items/gun/44.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index b85d9c671e95d..0c3d321e74441 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -650,7 +650,7 @@ "type": "GUN", "reload_noise_volume": 10, "name": { "str": "small game lever-action rifle" }, - "description": "A .22 Long Rifle lever-action rifle, which holds 15 rounds of ammo. While quite useful against small-game, its effectiveness isn't as great against the undead.", + "description": "A .22 Long Rifle lever-action rifle, which holds 15 rounds of ammo. While quite useful against small game, its effectiveness isn't as great against the undead.", "variant_type": "gun", "variants": [ { @@ -701,7 +701,7 @@ "type": "GUN", "reload_noise_volume": 10, "name": { "str": "small game lever-action rifle" }, - "description": "A .22 Long Rifle lever-action rifle, which holds 16 rounds of ammo. While quite useful against small-game, its effectiveness isn't as great against the undead.", + "description": "A .22 Long Rifle lever-action rifle, which holds 16 rounds of ammo. While quite useful against small game, its effectiveness isn't as great against the undead.", "variant_type": "gun", "variants": [ { diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index 5de5b5b054727..417982bf4cad2 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -358,7 +358,7 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": "reproduction .357 lever-action rifle" }, - "description": "This fine lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", + "description": "This fine lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 20\" barrel with a tube-fed magazine. Go get 'em cowboy!", "variant_type": "gun", "variants": [ { @@ -402,7 +402,7 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": ".357 lever-action rifle" }, - "description": "This lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", + "description": "This lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 20\" barrel with a tube-fed magazine. Go get 'em cowboy!", "variant_type": "gun", "variants": [ { @@ -446,7 +446,7 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": ".357 lever-action rifle" }, - "description": "This fine lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 16\" barrel with a tube fed magazine. Go get 'em cowboy!", + "description": "This fine lever-action rifle is chambered in the powerful .357 Magnum cartridge, with an 16\" barrel with a tube-fed magazine. Go get 'em cowboy!", "variant_type": "gun", "variants": [ { diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index 3570780b06c7f..ea3e4e3471a0b 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -276,7 +276,7 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": ".44 lever-action rifle" }, - "description": "This lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 16\" barrel with a tube fed magazine. Go get 'em cowboy!", + "description": "This lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 16\" barrel with a tube-fed magazine. Go get 'em cowboy!", "variant_type": "gun", "variants": [ { @@ -320,7 +320,7 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": ".44 lever-action rifle" }, - "description": "This lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 20\" barrel with a tube fed magazine. Go get 'em cowboy!", + "description": "This lever-action rifle is chambered in the powerful .44 Magnum cartridge, with an 20\" barrel with a tube-fed magazine. Go get 'em cowboy!", "variant_type": "gun", "variants": [ {