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.

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

Adds the Charger Pistol #74321

Merged
merged 6 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
{ "group": "nested_sig_mosquito", "prob": 15 },
{ "group": "nested_sw_22", "prob": 40 },
{ "group": "nested_cp33", "prob": 8 },
{ "group": "nested_ruger_mk4", "prob": 60 }
{ "group": "nested_ruger_mk4", "prob": 60 },
{ "group": "nested_ruger_charger", "prob": 1 }
]
},
{
Expand Down Expand Up @@ -200,7 +201,8 @@
{ "item": "walther_p22", "prob": 35 },
{ "item": "ruger_lcr_22", "prob": 70 },
{ "item": "cp33", "prob": 11 },
{ "item": "ruger_mk4", "prob": 60 }
{ "item": "ruger_mk4", "prob": 60 },
{ "item": "ruger_charger", "prob": 9 }
]
},
{
Expand Down
13 changes: 13 additions & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,19 @@
{ "group": "on_hand_22" }
]
},
{
"id": "nested_ruger_charger",
"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": "ruger_charger", "charges": [ 0, 10 ] },
{ "item": "ruger1022mag" },
{ "item": "ruger1022mag", "prob": 50 },
{ "group": "on_hand_22" }
]
},
{
"id": "nested_sw_610",
"type": "item_group",
Expand Down
54 changes: 54 additions & 0 deletions data/json/items/gun/22.json
Original file line number Diff line number Diff line change
Expand Up @@ -498,5 +498,59 @@
{ "rigid": false, "magazine_well": "96 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ruger_mk4_mag" ] }
],
"melee_damage": { "bash": 8 }
},
{
"id": "ruger_charger",
"looks_like": "ar_pistol",
"type": "GUN",
"//": "Stats are from https://ruger.com/products/22Charger/specSheets/4923.html",
"reload_noise_volume": 10,
"name": { "str": "varmint pistol" },
"description": "Essentially a varmint rifle with no stock and a shorter barrel, this gun loses out on a bit of energy with its shorter barrel and is a bit more uncomfortable to hold, but a fair bit lighter. Includes a bipod.",
"variant_type": "gun",
"variants": [
{
"id": "ruger_charger",
"name": { "str": "Ruger 22 Charger" },
"description": "This gun is essentially a shortened 10/22, feeding from the same magazines. While it does feature a shorter barrel and a lack of a stock, it is a fair bit lighter, and comes included with a bipod to more steadily plink away at the undead."
}
],
"ascii_picture": "ruger1022",
"weight": "1418 g",
"volume": "1358 ml",
"longest_side": "509 mm",
"barrel_length": "254 mm",
"price": "399 USD",
"price_postapoc": "4 USD",
"to_hit": -1,
"material": [ "steel", "plastic" ],
"symbol": "(",
"color": "brown",
"range": 3,
"ammo": [ "22" ],
"skill": "pistol",
"ranged_damage": { "damage_type": "bullet", "amount": 1 },
"dispersion": 140,
"durability": 8,
"min_cycle_recoil": 39,
"valid_mod_locations": [
[ "barrel", 1 ],
[ "brass catcher", 1 ],
[ "grip", 1 ],
[ "mechanism", 2 ],
[ "muzzle", 1 ],
[ "rail mount", 1 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "stock mount", 1 ],
[ "stock accessory", 2 ],
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"built_in_mods": [ "bipod" ],
"pocket_data": [
{ "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ruger1022mag", "ruger1022bigmag" ] }
],
"melee_damage": { "bash": 12 }
}
]
3 changes: 2 additions & 1 deletion data/mods/Generic_Guns/firearms/gg_firearms_migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@
"m11",
"m18",
"p226_9mm",
"sp2022"
"sp2022",
"ruger_charger"
],
"type": "MIGRATION",
"replace": "pistol_medium"
Expand Down
6 changes: 4 additions & 2 deletions data/mods/TEST_DATA/item_demographics.json
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,8 @@
"sw_22": 10,
"j22": 10,
"walther_p22": 10,
"cp33": 10
"cp33": 10,
"ruger_charger": 10
}
},
{
Expand Down Expand Up @@ -1058,7 +1059,8 @@
"walther_ppq_9mm": 1,
"winchester_1887": 1,
"witness_10": 1,
"xd_10": 1
"xd_10": 1,
"ruger_charger": 1
}
},
{
Expand Down
3 changes: 2 additions & 1 deletion data/mods/classic_zombies/items/blacklists.json
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,8 @@
"cp33_mag",
"cp33_mag_50",
"ruger_mk4",
"ruger_mk4_mag"
"ruger_mk4_mag",
"ruger_charger"
]
}
]
Loading