From 54bd595e524f274e1cc502fb1cb3419d1b6e0662 Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Fri, 28 Jun 2024 23:43:14 +0200
Subject: [PATCH] Replace the S&W 619 with the 686 Plus (#74756)

* initial commit

* fix minor typo

* fix containers

* Update data/json/items/gun/38.json

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

* fix attempt 1

* fix attempt 2

* I HATE JOHN BAILEY

* fix Generic_Guns conversion

* fix Generic_guns weirdness

* GG holster is annoying

* update the whole thing

* fix botched merge

---------

Co-authored-by: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com>
---
 .vscode/settings.json       |  5 ++++-
 data/json/items/gun/38.json | 28 +++++++++++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2df65457a4a88..95294f0d6160a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -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"
+    }
 }
diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
index 1883b68167083..1ab71e881ff19 100644
--- a/data/json/items/gun/38.json
+++ b/data/json/items/gun/38.json
@@ -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,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
@@ -239,7 +238,14 @@
         "allowed_speedloaders": [ "38_speedloader" ]
       }
     ],
-    "melee_damage": { "bash": 9 }
+    "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",