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

Replace the S&W 619 with the 686 Plus #74756

Merged
merged 13 commits into from
Jun 28, 2024
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,8 @@
"github-actions.remote-name": "upstream",
// NOTE: This disable the plugins formatting so astyle is used.
"C_Cpp.formatting": "disabled",
"astyle.astylerc": "${workspaceRoot}/.astylerc"
"astyle.astylerc": "${workspaceRoot}/.astylerc",
"files.associations": {
"vector": "cpp"
}
}
28 changes: 17 additions & 11 deletions data/json/items/gun/38.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,19 +201,18 @@
{
"id": "sw_619",
"copy-from": "pistol_revolver",
"//": "Tileset whitelist for revolvers.",
"type": "GUN",
"name": { "str_sp": "S&W 619" },
"description": "A seven-round .357 revolver sold by Smith & Wesson. Can also fire .38 Special. It features a fixed rear sight and a reinforced frame.",
"name": { "str_sp": "7-shots .357 revolver" },
"description": "A revolver chambered in .357, with a 6 inch barrel and 7 shots.",
"ascii_picture": "sw_610",
"weight": "1074 g",
"volume": "608 ml",
"longest_side": "278 mm",
"barrel_length": "140 mm",
"//2": "100mm + 40mm max OAL for 357mag. Revolvers just built different.",
"price": "620 USD",
"weight": "1280 g",
"volume": "760 ml",
"//1": "took 5mm off `longest_side` so it can fit regular holsters",
"longest_side": "300 mm",
"//2": "barrel length (152mm) + cylinder length (40mm)",
"barrel_length": "192 mm",
"price": "980 USD",
"price_postapoc": "12 USD 50 cent",
"to_hit": -2,
BalthazarArgall marked this conversation as resolved.
Show resolved Hide resolved
"material": [ "steel", "plastic" ],
"symbol": "(",
"color": "light_gray",
Expand All @@ -239,7 +238,14 @@
"allowed_speedloaders": [ "38_speedloader" ]
}
],
"melee_damage": { "bash": 9 }
BalthazarArgall marked this conversation as resolved.
Show resolved Hide resolved
"variant_type": "gun",
"variants": [
{
"id": "sw_619",
"name": { "str_sp": "S&W 686 Plus" },
"description": "Introduced in the 90's, Smith & Wesson's model 686 'Plus' features a robust stainless steel frame, an adjustable front sight and a seventh shot that's sure to save your life."
}
]
},
{
"id": "chiappa_rhino",
Expand Down
Loading