Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lever action rifles #77409

Merged
merged 11 commits into from
Oct 29, 2024
Merged

Lever action rifles #77409

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c70ee0d
Add Rio Bravo
Holli-Git Oct 27, 2024
30b1e75
Henry Golden Boy
Holli-Git Oct 27, 2024
12168c1
Add .44 R92
Holli-Git Oct 27, 2024
36607f8
Adds Uberti 1873
Holli-Git Oct 28, 2024
adc1f7c
Added sources
Holli-Git Oct 28, 2024
117f6d5
357 R92
Holli-Git Oct 28, 2024
4853ec4
Minor fixes
Holli-Git Oct 28, 2024
e064948
fix in ammo count for nested r92
Holli-Git Oct 28, 2024
084a9e0
Spelling fixes
Holli-Git Oct 28, 2024
cb4930a
Apply suggestions from code review
Holli-Git Oct 28, 2024
d1bf80c
Apply suggestions from code review
Holli-Git Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -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 },
Expand Down
38 changes: 34 additions & 4 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,9 @@
{ "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": 15 },
{ "group": "nested_henry_golden_boy", "prob": 31 }
]
},
{
Expand Down Expand Up @@ -552,10 +554,23 @@
{ "group": "nested_m1903", "prob": 26 }
]
},
{
"type": "item_group",
"id": "guns_rifle_common_357",
"items": [
{ "group": "nested_uberti_1873", "prob": 100 },
{ "group": "nested_rossi_r92_357_16", "prob": 18 },
{ "group": "nested_rossi_r92_357_20", "prob": 37 }
]
},
{
"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",
Expand Down Expand Up @@ -647,7 +662,9 @@
{ "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": 15 },
{ "item": "henry_golden_boy", "prob": 31 }
]
},
{
Expand Down Expand Up @@ -713,10 +730,23 @@
{ "item": "m1903", "prob": 26 }
]
},
{
"type": "item_group",
"id": "guns_rifle_common_display_357",
"items": [
{ "item": "uberti_1873", "prob": 100 },
{ "item": "rossi_r92_357_16", "prob": 18 },
{ "item": "rossi_r92_357_20", "prob": 37 }
]
},
{
"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",
Expand Down
56 changes: 56 additions & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,6 +1448,22 @@
"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_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",
Expand Down Expand Up @@ -1633,6 +1649,46 @@
"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, 8 ] }, { "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_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_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",
Expand Down
102 changes: 102 additions & 0 deletions data/json/items/gun/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,5 +643,107 @@
"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, its effectiveness isn't as great against the undead.",
Holli-Git marked this conversation as resolved.
Show resolved Hide resolved
"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 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",
"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": 9 }
},
{
"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, its effectiveness isn't as great against the undead.",
Holli-Git marked this conversation as resolved.
Show resolved Hide resolved
"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 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/",
"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 }
}
]
Loading
Loading