Skip to content

Commit

Permalink
A bit more shotguns (#75378)
Browse files Browse the repository at this point in the history 
* add tar_12p and it's mags

* obsolete and migrate Streetsweeper

* variants of ar12_shotgun

* finish items, add triple barrel shotgun, add itemgroups

* spellchecker fixes

* Apply suggestions from code review

Co-authored-by: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>

* add weights for shotgun variants

---------

Co-authored-by: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
  • Loading branch information
@GuardianDll @DoctorBoomstick @TheShadowFerret
3 people authored Aug 8, 2024
1 parent 643bab3 commit c8fcd5c
Show file tree
Hide file tree
Showing 11 changed files with 338 additions and 66 deletions.
15 changes: 9 additions & 6 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@
{ "group": "nested_mossberg_930", "prob": 15 },
{ "group": "nested_shotgun_410", "prob": 30 },
{ "group": "nested_shotgun_d", "prob": 30 },
{ "group": "nested_shotgun_triple", "prob": 2 },
{ "group": "nested_shotgun_s", "prob": 30 }
]
},
Expand Down Expand Up @@ -565,6 +566,8 @@
{ "group": "nested_ksg", "prob": 50 },
{ "group": "nested_dp_12", "prob": 3 },
{ "group": "nested_srm_1216", "prob": 2 },
{ "group": "nested_ar12_shotgun", "prob": 5 },
{ "group": "nested_gfy_1", "prob": 2 },
{ "group": "nested_tavor_12", "prob": 5 },
{ "group": "nested_m1014", "prob": 10 },
{ "group": "nested_slp", "prob": 10 },
Expand All @@ -580,8 +583,11 @@
"entries": [
{ "item": "ksg", "prob": 50, "charges": [ 0, 7 ] },
{ "item": "srm_1216", "prob": 1, "charges": [ 0, 16 ] },
{ "item": "ar12_shotgun", "prob": 5, "charges": [ 0, -1 ] },
{ "item": "gfy_1", "prob": 2, "charges": [ 0, -1 ] },
{ "item": "dp_12", "prob": 2, "charges": [ 0, 14 ] },
{ "item": "tavor_12", "prob": 5, "charges": [ 0, 5 ] },
{ "item": "shotgun_triple", "prob": 1, "charges": [ 0, 3 ] },
{ "item": "mossberg_930", "variant": "m1014", "prob": 10, "charges": [ 0, 8 ] },
{ "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 10, "charges": [ 0, 9 ] },
{ "item": "mossberg_590m", "prob": 2, "charges": [ 0, 5 ] }
Expand All @@ -596,6 +602,8 @@
{ "item": "ksg", "prob": 25 },
{ "item": "tavor_12", "prob": 5 },
{ "item": "srm_1216", "prob": 3 },
{ "item": "ar12_shotgun", "prob": 5 },
{ "item": "gfy_1", "prob": 2 },
{ "item": "dp_12", "prob": 4 },
{ "item": "mossberg_930", "variant": "m1014", "prob": 10 },
{ "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 10 },
Expand Down Expand Up @@ -640,11 +648,7 @@
"id": "guns_shotgun_obscure",
"//": "Imported or otherwise very obscure shotguns.",
"//2": "Making the assumption any loaded gun will have additional ammo and mags with it.",
"items": [
{ "group": "nested_saiga_12", "prob": 50 },
{ "group": "nested_streetsweeper", "prob": 4 },
{ "group": "nested_saiga_410", "prob": 40 }
]
"items": [ { "group": "nested_saiga_12", "prob": 50 }, { "group": "nested_saiga_410", "prob": 40 } ]
},
{
"type": "item_group",
Expand All @@ -653,7 +657,6 @@
"//": "Imported or otherwise very obscure shotguns, unloaded for storage in a gunstore, some violate AWA.",
"items": [
{ "item": "saiga_12", "prob": 25 },
{ "item": "streetsweeper", "prob": 4 },
{ "item": "winchester_1887", "prob": 10 },
{ "item": "winchester_1897", "prob": 20 },
{ "item": "saiga_410", "prob": 10 }
Expand Down
3 changes: 3 additions & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,9 @@
{ "item": "saiga30mag", "prob": 10 },
{ "item": "saiga410mag_10rd", "prob": 30 },
{ "item": "saiga410mag_30rd", "prob": 10 },
{ "item": "mka_1919_5", "prob": 4 },
{ "item": "mka_1919_10", "prob": 4 },
{ "item": "mka_1919_20", "prob": 3 },
{ "item": "mossberg_590m_mag_5", "prob": 3, "charges": 0 },
{ "item": "mossberg_590m_mag_10", "prob": 2, "charges": 0 },
{ "item": "mossberg_590m_mag_15", "prob": 1, "charges": 0 },
Expand Down
70 changes: 62 additions & 8 deletions data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2118,6 +2118,14 @@
"ammo": 100,
"entries": [ { "item": "shotgun_d", "charges": [ 0, 2 ] }, { "group": "on_hand_shot" } ]
},
{
"id": "nested_shotgun_triple",
"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": "shotgun_triple", "charges": [ 0, 3 ] }, { "group": "on_hand_shot" } ]
},
{
"id": "nested_shotgun_s",
"type": "item_group",
Expand Down Expand Up @@ -2147,6 +2155,60 @@
{ "group": "on_hand_shot" }
]
},
{
"id": "nested_ar12_shotgun",
"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": "ar12_shotgun", "charges": [ 0, -1 ] },
{
"distribution": [
{
"collection": [ { "item": "mka_1919_5" }, { "item": "mka_1919_5", "prob": 70 }, { "item": "mka_1919_5", "prob": 30 } ],
"prob": 3
},
{
"collection": [ { "item": "mka_1919_10" }, { "item": "mka_1919_10", "prob": 70 }, { "item": "mka_1919_10", "prob": 30 } ],
"prob": 2
},
{
"collection": [ { "item": "mka_1919_20" }, { "item": "mka_1919_20", "prob": 70 }, { "item": "mka_1919_20", "prob": 30 } ],
"prob": 1
}
]
},
{ "group": "on_hand_shot" }
]
},
{
"id": "nested_gfy_1",
"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": "gfy_1", "charges": [ 0, -1 ] },
{
"distribution": [
{
"collection": [ { "item": "mka_1919_5" }, { "item": "mka_1919_5", "prob": 70 }, { "item": "mka_1919_5", "prob": 30 } ],
"prob": 3
},
{
"collection": [ { "item": "mka_1919_10" }, { "item": "mka_1919_10", "prob": 70 }, { "item": "mka_1919_10", "prob": 30 } ],
"prob": 2
},
{
"collection": [ { "item": "mka_1919_20" }, { "item": "mka_1919_20", "prob": 70 }, { "item": "mka_1919_20", "prob": 30 } ],
"prob": 1
}
]
},
{ "group": "on_hand_shot" }
]
},
{
"id": "nested_ksg",
"type": "item_group",
Expand Down Expand Up @@ -2283,14 +2345,6 @@
{ "group": "on_hand_shot" }
]
},
{
"id": "nested_streetsweeper",
"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": "streetsweeper", "charges": [ 0, 12 ] }, { "group": "on_hand_shot" } ]
},
{
"id": "nested_saiga_410",
"type": "item_group",
Expand Down
216 changes: 171 additions & 45 deletions data/json/items/gun/shot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,41 @@
"extend": { "flags": [ "RELOAD_ONE" ] },
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 2 } } ]
},
{
"id": "shotgun_triple",
"copy-from": "shotgun_s",
"type": "GUN",
"name": { "str": "triple-barrelled shotgun" },
"description": "A pretty modern-looking shotgun that has three barrels.",
"variant_type": "gun",
"variants": [
{
"id": "triple_honcho",
"name": { "str": "Triple Honcho" },
"description": "Made by Charles Daly, this modern three-barrel shotgun had a unique balance between how much it cost and how little firepower it could release with its 18.5-inch barrels. Luckily, you do not need to pay the full price for it anymore."
}
],
"clip_size": 3,
"modes": [ [ "DEFAULT", "single", 1 ] ],
"weight": "2721 g",
"volume": "2926 ml",
"longest_side": "686 mm",
"barrel_length": "469 mm",
"price": "2000 USD",
"price_postapoc": "2 USD",
"valid_mod_locations": [
[ "barrel", 1 ],
[ "sights mount", 1 ],
[ "sling", 1 ],
[ "mechanism", 2 ],
[ "stock mount", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "underbarrel mount", 1 ]
],
"extend": { "flags": [ "RELOAD_ONE" ] },
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 3 } } ]
},
{
"id": "shotgun_s",
"copy-from": "shotgun_base",
Expand Down Expand Up @@ -559,51 +594,6 @@
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ],
"melee_damage": { "bash": 12 }
},
{
"id": "streetsweeper",
"copy-from": "shotgun_base",
"type": "GUN",
"name": { "str": "automatic shotgun" },
"description": "This shotgun, deemed a destructive device, resembles a comically oversized revolver. It can hold 12 rounds of 12 gauge shot, and fire all of them in under 3 seconds",
"variant_type": "gun",
"variants": [
{
"id": "streetsweeper",
"name": { "str": "Cobray Streetsweeper" },
"description": "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper sold poorly before it was deemed a destructive device. The cylinder is driven by a clockspring, cannot be indexed by hand, and must be ejected with an ejector rod. Its unique design allows for all 12 shells to be fired in under 3 seconds, as demonstrated by the ATF technical branch."
}
],
"weight": "4200 g",
"volume": "3193 ml",
"longest_side": "592 mm",
"barrel_length": "470 mm",
"looks_like": "revolver_shotgun",
"price": "1 kUSD 200 USD",
"price_postapoc": "35 USD",
"to_hit": -1,
"material": [ "steel", "wood" ],
"dispersion": 855,
"durability": 6,
"clip_size": 12,
"reload": 220,
"barrel_volume": "505 ml",
"default_mods": [ "grip" ],
"built_in_mods": [ "wire_stock" ],
"valid_mod_locations": [
[ "barrel", 1 ],
[ "brass catcher", 1 ],
[ "grip", 1 ],
[ "mechanism", 2 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 12 } } ],
"melee_damage": { "bash": 8 }
},
{
"id": "tavor_12",
"copy-from": "shotgun_base",
Expand Down Expand Up @@ -899,6 +889,142 @@
"//": "no provision for separate triggers",
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 2 } } ]
},
{
"id": "ar12_shotgun",
"copy-from": "shotgun_pump",
"looks_like": "remington_870",
"type": "GUN",
"name": { "str": "rifle shotgun" },
"description": "Despite looking like a military-issued rifle, this is, in fact, a shotgun. It can accept a variety of magazines.",
"variant_type": "gun",
"variants": [
{
"id": "tar_12p",
"name": { "str": "Tokarev TAR 12P" },
"weight": 327,
"description": "Not related to the Soviet weapon designer, Tokarev, this Turkish shotgun uses an AR-12 shotgun platform to make the user comfortably hold it like a rifle and to utilise MKA 1919 magazines of different sizes."
},
{
"id": "vr80",
"name": { "str": "VR 80" },
"weight": 575,
"description": "The work of Rock Island Armoury, this AR-12-style shotgun affords both the comfort of being similar to a rifle and the ability to use MKA 1919 shotgun magazines."
},
{
"id": "boss25",
"name": { "str": "BOSS 25" },
"weight": 299,
"description": "Manufactured in Turkey, this work of Farncolin Arms uses an AR-12 shotgun platform to let the user comfortably hold it like a rifle and utilise MKA 1919 magazines of different sizes."
},
{
"id": "ar12s",
"name": { "str": "AR-12S" },
"weight": 101,
"description": "Created by Charles Daly, this shotgun uses AR-12 platform to make user comfortably hold it like a rifle, and to utilize MKA 1919 magazines of different sizes."
},
{
"id": "ar12a",
"name": { "str": "AR-12A" },
"weight": 98,
"description": "Made by Charles Daly, this shotgun uses AR-12 platform to make user comfortably hold it like a rifle, and to utilize MKA 1919 magazines of different sizes."
},
{
"id": "gf25",
"name": { "str": "GF25" },
"weight": 158,
"description": "Work of GForce Arms, this shotgun uses AR-12 platform to make user comfortably hold it like a rifle, and to utilize MKA 1919 magazines of different sizes."
},
{
"id": "mka1919",
"name": { "str": "MKA 1919" },
"weight": 85,
"description": "First of its type, this Akdal Arms MKA 1919 looks like a bulky M-4 rifle, and was a parent for numerous shotguns, that soon after got a named \"AR-12 platform\", inspired by Armalite design."
},
{
"id": "krx",
"name": { "str": "KRX" },
"weight": 231,
"description": "Created by TriStar Arms, this shotgun uses AR-12 platform to make user comfortably hold it like a rifle, and to utilize MKA 1919 magazines of different sizes."
},
{
"id": "vr60",
"name": { "str": "VR60" },
"weight": 109,
"description": "Work of Rock Island Armory, this AR-12 style shotgun afford both the comfort of being similar to rifle, and ability to use MKA 1919 shotgun magazines."
}
],
"weight": "3335 g",
"volume": "3443 ml",
"longest_side": "990 mm",
"barrel_length": "469 mm",
"price": "320 USD",
"price_postapoc": "12 USD",
"to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "uneven" },
"material": [ "steel", "plastic" ],
"dispersion": 425,
"sight_dispersion": 500,
"durability": 7,
"valid_mod_locations": [
[ "barrel", 1 ],
[ "brass catcher", 1 ],
[ "grip mount", 1 ],
[ "mechanism", 2 ],
[ "muzzle", 1 ],
[ "rail mount", 1 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "underbarrel", 1 ]
],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "mka_1919_5", "mka_1919_10", "mka_1919_20" ] } ],
"melee_damage": { "bash": 9 }
},
{
"id": "gfy_1",
"copy-from": "shotgun_pump",
"looks_like": "remington_870",
"type": "GUN",
"name": { "str": "bullpup shotgun" },
"description": "A curious magazine-fed shotgun, made using bullpup scheme.",
"variant_type": "gun",
"variants": [
{
"id": "gfy_1",
"name": { "str": "GFY-1" },
"weight": 101,
"description": "A work of GForce Arms, this curious bullpup shotgun is compact, familiar to any rifleman, and can use standard MKA 1919 magazines."
},
{
"id": "bp12",
"name": { "str": "BP-12" },
"weight": 82,
"description": "Manufactured by Century Arms, it is a compact bullpup shotgun, that accept a variety of MKA 1919 magazines."
}
],
"weight": "3628 g",
"volume": "3443 ml",
"longest_side": "723 mm",
"barrel_length": "469 mm",
"price": "325 USD",
"price_postapoc": "13 USD",
"to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "uneven" },
"material": [ "steel", "plastic" ],
"dispersion": 425,
"sight_dispersion": 500,
"durability": 7,
"valid_mod_locations": [
[ "barrel", 1 ],
[ "brass catcher", 1 ],
[ "grip mount", 1 ],
[ "mechanism", 2 ],
[ "muzzle", 1 ],
[ "rail mount", 1 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "underbarrel", 1 ]
],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "mka_1919_5", "mka_1919_10", "mka_1919_20" ] } ],
"melee_damage": { "bash": 9 }
},
{
"id": "srm_1216",
"copy-from": "shotgun_pump",
Expand Down
Loading

0 comments on commit c8fcd5c

Please sign in to comment.