Full gun revamp, part 1

6 files changed, 159 insertions, 404 deletions

diff --git a/guns/20x66mm.json b/guns/20x66mm.json
index a0f4584..fa3a16e 100644
--- a/guns/20x66mm.json
+++ b/guns/20x66mm.json
@@ -36,11 +36,11 @@
 			"guns/reload/shotgun/pumpreload5.ogg"
         ]
     },
-	{
+    {
         "type": "sound_effect",
         "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "rm121aux",
+        "volume" : 90,
+        "variant" : "rm20",
         "files" : [
             "guns/20x66mm/20x66mm_1.ogg",
 			"guns/20x66mm/20x66mm_2.ogg",
@@ -52,7 +52,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "rm121aux",
+        "variant" : "rm20",
         "files" : [
             "guns/20x66mm/20x66mm_1.ogg",
 			"guns/20x66mm/20x66mm_2.ogg",
@@ -63,21 +63,21 @@
     {
         "type": "sound_effect",
         "id" : "reload",
-        "volume" : 70,
-        "variant" : "rm121aux",
+        "volume" : 90,
+        "variant" : "rm20",
         "files" : [
-            "guns/reload/shotgun/pumpreload1.ogg",
-			"guns/reload/shotgun/pumpreload2.ogg",
-			"guns/reload/shotgun/pumpreload3.ogg",
-			"guns/reload/shotgun/pumpreload4.ogg",
-			"guns/reload/shotgun/pumpreload5.ogg"
+            "guns/reload/shotgun/autoreload_1.ogg",
+			"guns/reload/shotgun/autoreload_2.ogg",
+			"guns/reload/shotgun/autoreload_3.ogg",
+			"guns/reload/shotgun/autoreload_4.ogg",
+			"guns/reload/shotgun/autoreload_5.ogg"
         ]
     },
-    {
+	{
         "type": "sound_effect",
         "id" : "fire_gun",
-        "volume" : 90,
-        "variant" : "rm20",
+        "volume" : 100,
+        "variant" : "rm121aux",
         "files" : [
             "guns/20x66mm/20x66mm_1.ogg",
 			"guns/20x66mm/20x66mm_2.ogg",
@@ -89,7 +89,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "rm20",
+        "variant" : "rm121aux",
         "files" : [
             "guns/20x66mm/20x66mm_1.ogg",
 			"guns/20x66mm/20x66mm_2.ogg",
@@ -100,14 +100,14 @@
     {
         "type": "sound_effect",
         "id" : "reload",
-        "volume" : 90,
-        "variant" : "rm20",
+        "volume" : 70,
+        "variant" : "rm121aux",
         "files" : [
-            "guns/reload/shotgun/autoreload_1.ogg",
-			"guns/reload/shotgun/autoreload_2.ogg",
-			"guns/reload/shotgun/autoreload_3.ogg",
-			"guns/reload/shotgun/autoreload_4.ogg",
-			"guns/reload/shotgun/autoreload_5.ogg"
+            "guns/reload/shotgun/pumpreload1.ogg",
+			"guns/reload/shotgun/pumpreload2.ogg",
+			"guns/reload/shotgun/pumpreload3.ogg",
+			"guns/reload/shotgun/pumpreload4.ogg",
+			"guns/reload/shotgun/pumpreload5.ogg"
         ]
     },
     {
diff --git a/guns/22.json b/guns/22.json
index c1f084a..ca5b2d8 100644
--- a/guns/22.json
+++ b/guns/22.json
@@ -159,7 +159,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "rm360_carbine",
+        "variant" : "ruger_1022",
         "files" : [
             "guns/22/22_1.ogg",
 			"guns/22/22_2.ogg",
@@ -172,7 +172,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "rm360_carbine",
+        "variant" : "ruger_1022",
         "files" : [
             "guns/22/22_1.ogg",
 			"guns/22/22_2.ogg",
@@ -185,20 +185,20 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "rm360_carbine",
+        "variant" : "ruger_1022",
         "files" : [
-            "guns/reload/rifle/rifle_1.ogg",
-			"guns/reload/rifle/rifle_2.ogg",
-			"guns/reload/rifle/rifle_3.ogg",
-			"guns/reload/rifle/rifle_4.ogg",
-			"guns/reload/rifle/rifle_5.ogg"
+            "guns/reload/smg/smg_1.ogg",
+			"guns/reload/smg/smg_2.ogg",
+			"guns/reload/smg/smg_3.ogg",
+			"guns/reload/smg/smg_4.ogg",
+			"guns/reload/smg/smg_5.ogg"
         ]
     },
     {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "ruger_1022",
+        "variant" : "ruger_lcr_22",
         "files" : [
             "guns/22/22_1.ogg",
 			"guns/22/22_2.ogg",
@@ -211,7 +211,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "ruger_1022",
+        "variant" : "ruger_lcr_22",
         "files" : [
             "guns/22/22_1.ogg",
 			"guns/22/22_2.ogg",
@@ -224,20 +224,20 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "ruger_1022",
+        "variant" : "ruger_lcr_22",
         "files" : [
-            "guns/reload/smg/smg_1.ogg",
-			"guns/reload/smg/smg_2.ogg",
-			"guns/reload/smg/smg_3.ogg",
-			"guns/reload/smg/smg_4.ogg",
-			"guns/reload/smg/smg_5.ogg"
+            "guns/reload/revolver/revolver_1.ogg",
+			"guns/reload/revolver/revolver_2.ogg",
+			"guns/reload/revolver/revolver_3.ogg",
+			"guns/reload/revolver/revolver_4.ogg",
+			"guns/reload/revolver/revolver_5.ogg"
         ]
     },
     {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "ruger_lcr_22",
+        "variant" : "sig_mosquito",
         "files" : [
             "guns/22/22_1.ogg",
 			"guns/22/22_2.ogg",
@@ -250,7 +250,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "ruger_lcr_22",
+        "variant" : "sig_mosquito",
         "files" : [
             "guns/22/22_1.ogg",
 			"guns/22/22_2.ogg",
@@ -263,20 +263,20 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "ruger_lcr_22",
+        "variant" : "sig_mosquito",
         "files" : [
-            "guns/reload/revolver/revolver_1.ogg",
-			"guns/reload/revolver/revolver_2.ogg",
-			"guns/reload/revolver/revolver_3.ogg",
-			"guns/reload/revolver/revolver_4.ogg",
-			"guns/reload/revolver/revolver_5.ogg"
+            "guns/reload/pistol_l/pistol_1.ogg",
+			"guns/reload/pistol_l/pistol_2.ogg",
+			"guns/reload/pistol_l/pistol_3.ogg",
+			"guns/reload/pistol_l/pistol_4.ogg",
+			"guns/reload/pistol_l/pistol_5.ogg"
         ]
     },
     {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "sig_mosquito",
+        "variant" : "sw_22",
         "files" : [
             "guns/22/22_1.ogg",
 			"guns/22/22_2.ogg",
@@ -289,7 +289,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "sig_mosquito",
+        "variant" : "sw_22",
         "files" : [
             "guns/22/22_1.ogg",
 			"guns/22/22_2.ogg",
@@ -302,7 +302,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "sig_mosquito",
+        "variant" : "sw_22",
         "files" : [
             "guns/reload/pistol_l/pistol_1.ogg",
 			"guns/reload/pistol_l/pistol_2.ogg",
@@ -315,7 +315,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "sw_22",
+        "variant" : "j22",
         "files" : [
             "guns/22/22_1.ogg",
 			"guns/22/22_2.ogg",
@@ -328,7 +328,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "sw_22",
+        "variant" : "j22",
         "files" : [
             "guns/22/22_1.ogg",
 			"guns/22/22_2.ogg",
@@ -341,7 +341,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "sw_22",
+        "variant" : "j22",
         "files" : [
             "guns/reload/pistol_l/pistol_1.ogg",
 			"guns/reload/pistol_l/pistol_2.ogg",
diff --git a/guns/223.json b/guns/223.json
index c2ef970..b807e07 100644
--- a/guns/223.json
+++ b/guns/223.json
@@ -195,251 +195,6 @@
 			"guns/reload/rifle/rifle_5.ogg"
         ]
     },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "l_bak_223",
-        "files" : [
-            "guns/223/223_1.ogg",
-			"guns/223/223_2.ogg",
-			"guns/223/223_3.ogg",
-			"guns/223/223_4.ogg",
-			"guns/223/223_5.ogg",
-			"guns/223/223_6.ogg",
-			"guns/223/223_7.ogg",
-			"guns/223/223_8.ogg",
-			"guns/223/223_9.ogg",
-			"guns/223/223_10.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "l_bak_223",
-        "files" : [
-            "guns/223/223_1.ogg",
-			"guns/223/223_2.ogg",
-			"guns/223/223_3.ogg",
-			"guns/223/223_4.ogg",
-			"guns/223/223_5.ogg",
-			"guns/223/223_6.ogg",
-			"guns/223/223_7.ogg",
-			"guns/223/223_8.ogg",
-			"guns/223/223_9.ogg",
-			"guns/223/223_10.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "l_bak_223",
-        "files" : [
-            "guns/reload/revolver/revolver_1.ogg",
-			"guns/reload/revolver/revolver_2.ogg",
-			"guns/reload/revolver/revolver_3.ogg",
-			"guns/reload/revolver/revolver_4.ogg",
-			"guns/reload/revolver/revolver_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "l_base_223",
-        "files" : [
-            "guns/223/223_1.ogg",
-			"guns/223/223_2.ogg",
-			"guns/223/223_3.ogg",
-			"guns/223/223_4.ogg",
-			"guns/223/223_5.ogg",
-			"guns/223/223_6.ogg",
-			"guns/223/223_7.ogg",
-			"guns/223/223_8.ogg",
-			"guns/223/223_9.ogg",
-			"guns/223/223_10.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "l_base_223",
-        "files" : [
-            "guns/223/223_1.ogg",
-			"guns/223/223_2.ogg",
-			"guns/223/223_3.ogg",
-			"guns/223/223_4.ogg",
-			"guns/223/223_5.ogg",
-			"guns/223/223_6.ogg",
-			"guns/223/223_7.ogg",
-			"guns/223/223_8.ogg",
-			"guns/223/223_9.ogg",
-			"guns/223/223_10.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "l_base_223",
-        "files" : [
-            "guns/reload/bullpup/bullpup_1.ogg",
-			"guns/reload/bullpup/bullpup_2.ogg",
-			"guns/reload/bullpup/bullpup_3.ogg",
-			"guns/reload/bullpup/bullpup_4.ogg",
-			"guns/reload/bullpup/bullpup_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "l_car_223",
-        "files" : [
-            "guns/223/223_1.ogg",
-			"guns/223/223_2.ogg",
-			"guns/223/223_3.ogg",
-			"guns/223/223_4.ogg",
-			"guns/223/223_5.ogg",
-			"guns/223/223_6.ogg",
-			"guns/223/223_7.ogg",
-			"guns/223/223_8.ogg",
-			"guns/223/223_9.ogg",
-			"guns/223/223_10.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "l_car_223",
-        "files" : [
-            "guns/223/223_1.ogg",
-			"guns/223/223_2.ogg",
-			"guns/223/223_3.ogg",
-			"guns/223/223_4.ogg",
-			"guns/223/223_5.ogg",
-			"guns/223/223_6.ogg",
-			"guns/223/223_7.ogg",
-			"guns/223/223_8.ogg",
-			"guns/223/223_9.ogg",
-			"guns/223/223_10.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "l_car_223",
-        "files" : [
-            "guns/reload/bullpup/bullpup_1.ogg",
-			"guns/reload/bullpup/bullpup_2.ogg",
-			"guns/reload/bullpup/bullpup_3.ogg",
-			"guns/reload/bullpup/bullpup_4.ogg",
-			"guns/reload/bullpup/bullpup_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "l_dsr_223",
-        "files" : [
-            "guns/223/223_1.ogg",
-			"guns/223/223_2.ogg",
-			"guns/223/223_3.ogg",
-			"guns/223/223_4.ogg",
-			"guns/223/223_5.ogg",
-			"guns/223/223_6.ogg",
-			"guns/223/223_7.ogg",
-			"guns/223/223_8.ogg",
-			"guns/223/223_9.ogg",
-			"guns/223/223_10.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "l_dsr_223",
-        "files" : [
-            "guns/223/223_1.ogg",
-			"guns/223/223_2.ogg",
-			"guns/223/223_3.ogg",
-			"guns/223/223_4.ogg",
-			"guns/223/223_5.ogg",
-			"guns/223/223_6.ogg",
-			"guns/223/223_7.ogg",
-			"guns/223/223_8.ogg",
-			"guns/223/223_9.ogg",
-			"guns/223/223_10.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "l_dsr_223",
-        "files" : [
-            "guns/reload/bullpup/bullpup_1.ogg",
-			"guns/reload/bullpup/bullpup_2.ogg",
-			"guns/reload/bullpup/bullpup_3.ogg",
-			"guns/reload/bullpup/bullpup_4.ogg",
-			"guns/reload/bullpup/bullpup_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "l_lmg_223",
-        "files" : [
-            "guns/223/223_1.ogg",
-			"guns/223/223_2.ogg",
-			"guns/223/223_3.ogg",
-			"guns/223/223_4.ogg",
-			"guns/223/223_5.ogg",
-			"guns/223/223_6.ogg",
-			"guns/223/223_7.ogg",
-			"guns/223/223_8.ogg",
-			"guns/223/223_9.ogg",
-			"guns/223/223_10.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "l_lmg_223",
-        "files" : [
-            "guns/223/223_1.ogg",
-			"guns/223/223_2.ogg",
-			"guns/223/223_3.ogg",
-			"guns/223/223_4.ogg",
-			"guns/223/223_5.ogg",
-			"guns/223/223_6.ogg",
-			"guns/223/223_7.ogg",
-			"guns/223/223_8.ogg",
-			"guns/223/223_9.ogg",
-			"guns/223/223_10.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "l_lmg_223",
-        "files" : [
-            "guns/reload/bullpup/bullpup_1.ogg",
-			"guns/reload/bullpup/bullpup_2.ogg",
-			"guns/reload/bullpup/bullpup_3.ogg",
-			"guns/reload/bullpup/bullpup_4.ogg",
-			"guns/reload/bullpup/bullpup_5.ogg"
-        ]
-    },
     {
         "type": "sound_effect",
         "id" : "fire_gun",
@@ -636,11 +391,11 @@
 			"guns/reload/rifle_m/rifle_5.ogg"
         ]
     },
-    {
+	{
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "ruger_mini",
+        "variant" : "rifle_223",
         "files" : [
             "guns/223/223_1.ogg",
 			"guns/223/223_2.ogg",
@@ -658,7 +413,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "ruger_mini",
+        "variant" : "rifle_223",
         "files" : [
             "guns/223/223_1.ogg",
 			"guns/223/223_2.ogg",
@@ -676,20 +431,20 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "ruger_mini",
+        "variant" : "rifle_223",
         "files" : [
-            "guns/reload/rifle/rifle_1.ogg",
-			"guns/reload/rifle/rifle_2.ogg",
-			"guns/reload/rifle/rifle_3.ogg",
-			"guns/reload/rifle/rifle_4.ogg",
-			"guns/reload/rifle/rifle_5.ogg"
+            "guns/reload/rifle_m/rifle_1.ogg",
+			"guns/reload/rifle_m/rifle_2.ogg",
+			"guns/reload/rifle_m/rifle_3.ogg",
+			"guns/reload/rifle_m/rifle_4.ogg",
+			"guns/reload/rifle_m/rifle_5.ogg"
         ]
     },
     {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "scar_l",
+        "variant" : "ruger_mini",
         "files" : [
             "guns/223/223_1.ogg",
 			"guns/223/223_2.ogg",
@@ -707,7 +462,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "scar_l",
+        "variant" : "ruger_mini",
         "files" : [
             "guns/223/223_1.ogg",
 			"guns/223/223_2.ogg",
@@ -725,7 +480,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "scar_l",
+        "variant" : "ruger_mini",
         "files" : [
             "guns/reload/rifle/rifle_1.ogg",
 			"guns/reload/rifle/rifle_2.ogg",
@@ -734,11 +489,11 @@
 			"guns/reload/rifle/rifle_5.ogg"
         ]
     },
-	{
+    {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "sig552",
+        "variant" : "scar_l",
         "files" : [
             "guns/223/223_1.ogg",
 			"guns/223/223_2.ogg",
@@ -756,7 +511,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "sig552",
+        "variant" : "scar_l",
         "files" : [
             "guns/223/223_1.ogg",
 			"guns/223/223_2.ogg",
@@ -774,7 +529,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "sig552",
+        "variant" : "scar_l",
         "files" : [
             "guns/reload/rifle/rifle_1.ogg",
 			"guns/reload/rifle/rifle_2.ogg",
@@ -783,11 +538,11 @@
 			"guns/reload/rifle/rifle_5.ogg"
         ]
     },
-    {
+	{
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "steyr_aug",
+        "variant" : "sig552",
         "files" : [
             "guns/223/223_1.ogg",
 			"guns/223/223_2.ogg",
@@ -805,7 +560,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "steyr_aug",
+        "variant" : "sig552",
         "files" : [
             "guns/223/223_1.ogg",
 			"guns/223/223_2.ogg",
@@ -823,20 +578,20 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "steyr_aug",
+        "variant" : "sig552",
         "files" : [
-            "guns/reload/bullpup/bullpup_1.ogg",
-			"guns/reload/bullpup/bullpup_2.ogg",
-			"guns/reload/bullpup/bullpup_3.ogg",
-			"guns/reload/bullpup/bullpup_4.ogg",
-			"guns/reload/bullpup/bullpup_5.ogg"
+            "guns/reload/rifle/rifle_1.ogg",
+			"guns/reload/rifle/rifle_2.ogg",
+			"guns/reload/rifle/rifle_3.ogg",
+			"guns/reload/rifle/rifle_4.ogg",
+			"guns/reload/rifle/rifle_5.ogg"
         ]
     },
-	{
+    {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "l_mbr_223",
+        "variant" : "steyr_aug",
         "files" : [
             "guns/223/223_1.ogg",
 			"guns/223/223_2.ogg",
@@ -854,7 +609,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "l_mbr_223",
+        "variant" : "steyr_aug",
         "files" : [
             "guns/223/223_1.ogg",
 			"guns/223/223_2.ogg",
@@ -872,7 +627,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "l_mbr_223",
+        "variant" : "steyr_aug",
         "files" : [
             "guns/reload/bullpup/bullpup_1.ogg",
 			"guns/reload/bullpup/bullpup_2.ogg",
diff --git a/guns/3006.json b/guns/3006.json
index 333be14..30629dc 100644
--- a/guns/3006.json
+++ b/guns/3006.json
@@ -77,45 +77,6 @@
 			"guns/reload/rifle/rifle_5.ogg"
         ]
     },
-    {
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "m1918",
-        "files" : [
-            "guns/3006/3006_1.ogg",
-			"guns/3006/3006_2.ogg",
-			"guns/3006/3006_3.ogg",
-			"guns/3006/3006_4.ogg",
-			"guns/3006/3006_5.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "m1918",
-        "files" : [
-            "guns/3006/3006_1.ogg",
-			"guns/3006/3006_2.ogg",
-			"guns/3006/3006_3.ogg",
-			"guns/3006/3006_4.ogg",
-			"guns/3006/3006_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "m1918",
-        "files" : [
-            "guns/reload/rifle/rifle_1.ogg",
-			"guns/reload/rifle/rifle_2.ogg",
-			"guns/reload/rifle/rifle_3.ogg",
-			"guns/reload/rifle/rifle_4.ogg",
-			"guns/reload/rifle/rifle_5.ogg"
-        ]
-    },
 	{
         "type": "sound_effect",
         "id" : "fire_gun",
@@ -159,7 +120,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "remington_700",
+        "variant" : "m1918",
         "files" : [
             "guns/3006/3006_1.ogg",
 			"guns/3006/3006_2.ogg",
@@ -172,7 +133,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "remington_700",
+        "variant" : "m1918",
         "files" : [
             "guns/3006/3006_1.ogg",
 			"guns/3006/3006_2.ogg",
@@ -185,20 +146,20 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "remington_700",
+        "variant" : "m1918",
         "files" : [
-            "guns/reload/rifle_s/rifle_1.ogg",
-			"guns/reload/rifle_s/rifle_2.ogg",
-			"guns/reload/rifle_s/rifle_3.ogg",
-			"guns/reload/rifle_s/rifle_4.ogg",
-			"guns/reload/rifle_s/rifle_5.ogg"
+            "guns/reload/rifle/rifle_1.ogg",
+			"guns/reload/rifle/rifle_2.ogg",
+			"guns/reload/rifle/rifle_3.ogg",
+			"guns/reload/rifle/rifle_4.ogg",
+			"guns/reload/rifle/rifle_5.ogg"
         ]
     },
     {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "rifle_3006",
+        "variant" : "remington_700",
         "files" : [
             "guns/3006/3006_1.ogg",
 			"guns/3006/3006_2.ogg",
@@ -211,7 +172,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "rifle_3006",
+        "variant" : "remington_700",
         "files" : [
             "guns/3006/3006_1.ogg",
 			"guns/3006/3006_2.ogg",
@@ -220,11 +181,11 @@
 			"guns/3006/3006_5.ogg"
         ]
     },
-	{
+    {
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "rifle_3006",
+        "variant" : "remington_700",
         "files" : [
             "guns/reload/rifle_s/rifle_1.ogg",
 			"guns/reload/rifle_s/rifle_2.ogg",
@@ -237,7 +198,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "survivor_special_700",
+        "variant" : "rifle_3006",
         "files" : [
             "guns/3006/3006_1.ogg",
 			"guns/3006/3006_2.ogg",
@@ -250,7 +211,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "survivor_special_700",
+        "variant" : "rifle_3006",
         "files" : [
             "guns/3006/3006_1.ogg",
 			"guns/3006/3006_2.ogg",
@@ -259,11 +220,11 @@
 			"guns/3006/3006_5.ogg"
         ]
     },
-    {
+	{
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "survivor_special_700",
+        "variant" : "rifle_3006",
         "files" : [
             "guns/reload/rifle_s/rifle_1.ogg",
 			"guns/reload/rifle_s/rifle_2.ogg",
diff --git a/guns/308.json b/guns/308.json
index df66deb..c3d9119 100644
--- a/guns/308.json
+++ b/guns/308.json
@@ -244,11 +244,11 @@
 			"guns/reload/rifle/rifle_5.ogg"
         ]
     },
-    {
+	{
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "m60",
+        "variant" : "m240",
         "files" : [
             "guns/308/308_1.ogg",
 			"guns/308/308_2.ogg",
@@ -266,7 +266,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "m60",
+        "variant" : "m240",
         "files" : [
             "guns/308/308_1.ogg",
 			"guns/308/308_2.ogg",
@@ -284,7 +284,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "m60",
+        "variant" : "m240",
         "files" : [
             "guns/reload/mg/mgk_1.ogg",
 			"guns/reload/mg/mgk_2.ogg",
@@ -293,11 +293,11 @@
 			"guns/reload/mg/mgk_5.ogg"
         ]
     },
-	{
+    {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "m240",
+        "variant" : "m60",
         "files" : [
             "guns/308/308_1.ogg",
 			"guns/308/308_2.ogg",
@@ -315,7 +315,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "m240",
+        "variant" : "m60",
         "files" : [
             "guns/308/308_1.ogg",
 			"guns/308/308_2.ogg",
@@ -333,7 +333,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "m240",
+        "variant" : "m60",
         "files" : [
             "guns/reload/mg/mgk_1.ogg",
 			"guns/reload/mg/mgk_2.ogg",
diff --git a/guns/38.json b/guns/38.json
index f0e6a3b..a17dbd2 100644
--- a/guns/38.json
+++ b/guns/38.json
@@ -77,11 +77,11 @@
 			"guns/reload/rifle_s/rifle_5.ogg"
         ]
     },
-    {
+  {
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "ruger_lcr_38",
+        "variant" : "model_10_revolver",
         "files" : [
             "guns/38/38_1.ogg",
 			"guns/38/38_2.ogg",
@@ -94,7 +94,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "ruger_lcr_38",
+        "variant" : "model_10_revolver",
         "files" : [
             "guns/38/38_1.ogg",
 			"guns/38/38_2.ogg",
@@ -107,7 +107,7 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "ruger_lcr_38",
+        "variant" : "model_10_revolver",
         "files" : [
             "guns/reload/revolver/revolver_1.ogg",
 			"guns/reload/revolver/revolver_2.ogg",
@@ -120,7 +120,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "sw_619",
+        "variant" : "rifle_38",
         "files" : [
             "guns/38/38_1.ogg",
 			"guns/38/38_2.ogg",
@@ -133,7 +133,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "sw_619",
+        "variant" : "rifle_38",
         "files" : [
             "guns/38/38_1.ogg",
 			"guns/38/38_2.ogg",
@@ -146,7 +146,46 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "sw_619",
+        "variant" : "rifle_38",
+        "files" : [
+            "guns/reload/rifle_s/rifle_1.ogg",
+			"guns/reload/rifle_s/rifle_2.ogg",
+			"guns/reload/rifle_s/rifle_3.ogg",
+			"guns/reload/rifle_s/rifle_4.ogg",
+			"guns/reload/rifle_s/rifle_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "ruger_lcr_38",
+        "files" : [
+            "guns/38/38_1.ogg",
+			"guns/38/38_2.ogg",
+			"guns/38/38_3.ogg",
+			"guns/38/38_4.ogg",
+			"guns/38/38_5.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "ruger_lcr_38",
+        "files" : [
+            "guns/38/38_1.ogg",
+			"guns/38/38_2.ogg",
+			"guns/38/38_3.ogg",
+			"guns/38/38_4.ogg",
+			"guns/38/38_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "ruger_lcr_38",
         "files" : [
             "guns/reload/revolver/revolver_1.ogg",
 			"guns/reload/revolver/revolver_2.ogg",
@@ -159,7 +198,7 @@
         "type": "sound_effect",
         "id" : "fire_gun",
         "volume" : 100,
-        "variant" : "taurus_38",
+        "variant" : "sw_619",
         "files" : [
             "guns/38/38_1.ogg",
 			"guns/38/38_2.ogg",
@@ -172,7 +211,7 @@
         "type": "sound_effect",
         "id" : "fire_gun_distant",
         "volume" : 60,
-        "variant" : "taurus_38",
+        "variant" : "sw_619",
         "files" : [
             "guns/38/38_1.ogg",
 			"guns/38/38_2.ogg",
@@ -185,13 +224,13 @@
         "type": "sound_effect",
         "id" : "reload",
         "volume" : 90,
-        "variant" : "taurus_38",
+        "variant" : "sw_619",
         "files" : [
-            "guns/reload/pistol_l/pistol_1.ogg",
-			"guns/reload/pistol_l/pistol_2.ogg",
-			"guns/reload/pistol_l/pistol_3.ogg",
-			"guns/reload/pistol_l/pistol_4.ogg",
-			"guns/reload/pistol_l/pistol_5.ogg"
+            "guns/reload/revolver/revolver_1.ogg",
+			"guns/reload/revolver/revolver_2.ogg",
+			"guns/reload/revolver/revolver_3.ogg",
+			"guns/reload/revolver/revolver_4.ogg",
+			"guns/reload/revolver/revolver_5.ogg"
         ]
     }
 ]