From 822ca6042db424605b0c842b245ce3fbc6cdb870 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 5 Jan 2022 12:31:30 -0800
Subject: Sync up a lot of gun sounds with the new upstream

---
 guns/ups.json | 184 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 104 insertions(+), 80 deletions(-)

(limited to 'guns/ups.json')

diff --git a/guns/ups.json b/guns/ups.json
index 5c7427d..74eb913 100644
--- a/guns/ups.json
+++ b/guns/ups.json
@@ -1,66 +1,90 @@
 [
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 75,
+        "variant" : "emp_gun",
+        "files" : [
+            "guns/eweapons/emp_gun_1.ogg",
+			"guns/eweapons/emp_gun_2.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 40,
+        "variant" : "emp_gun",
+        "files" : [
+            "guns/eweapons/emp_gun_1.ogg",
+			"guns/eweapons/emp_gun_2.ogg"
+        ]
+    },
   {
     "type": "sound_effect",
     "id": "fire_gun",
     "volume": 100,
-    "variant": "emp_gun",
+    "variant": "gatling_mech_laser",
     "files": [
-      "guns/eweapons/emp_gun_1.ogg",
-      "guns/eweapons/emp_gun_2.ogg"
+      "guns/eweapons/gatling_mech_laser_1.ogg",
+      "guns/eweapons/gatling_mech_laser_2.ogg",
+      "guns/eweapons/gatling_mech_laser_3.ogg",
+      "guns/eweapons/gatling_mech_laser_4.ogg",
+      "guns/eweapons/gatling_mech_laser_5.ogg"
     ]
   },
   {
     "type": "sound_effect",
     "id": "fire_gun_distant",
     "volume": 40,
-    "variant": "emp_gun",
+    "variant": "gatling_mech_laser",
     "files": [
-      "guns/eweapons/emp_gun_1.ogg",
-      "guns/eweapons/emp_gun_2.ogg"
+      "guns/eweapons/gatling_mech_laser_1.ogg",
+      "guns/eweapons/gatling_mech_laser_2.ogg",
+      "guns/eweapons/gatling_mech_laser_3.ogg",
+      "guns/eweapons/gatling_mech_laser_4.ogg",
+      "guns/eweapons/gatling_mech_laser_5.ogg"
     ]
   },
-  {
-    "type": "sound_effect",
-    "id": "fire_gun",
-    "volume": 100,
-    "variant": "gatling_mech_laser",
-    "files": [ "guns/eweapons/laser_cannon.ogg" ]
-  },
-  {
-    "type": "sound_effect",
-    "id": "fire_gun_distant",
-    "volume": 40,
-    "variant": "gatling_mech_laser",
-    "files": [ "guns/eweapons/laser_cannon.ogg" ]
-  },
   {
     "type": "sound_effect",
     "id": "fire_gun",
     "volume": 100,
     "variant": "recon_mech_laser",
-    "files": [ "guns/eweapons/laser_cannon.ogg" ]
+    "files": [
+      "guns/eweapons/recon_mech_laser_1.ogg.ogg",
+      "guns/eweapons/recon_mech_laser_2.ogg.ogg",
+      "guns/eweapons/recon_mech_laser_3.ogg.ogg"
+    ]
   },
   {
     "type": "sound_effect",
     "id": "fire_gun_distant",
     "volume": 40,
     "variant": "recon_mech_laser",
-    "files": [ "guns/eweapons/laser_cannon.ogg" ]
-  },
-  {
-    "type": "sound_effect",
-    "id": "fire_gun",
-    "volume": 100,
-    "variant": "laser_cannon",
-    "files": [ "guns/eweapons/laser_cannon.ogg" ]
-  },
-  {
-    "type": "sound_effect",
-    "id": "fire_gun_distant",
-    "volume": 40,
-    "variant": "laser_cannon",
-    "files": [ "guns/eweapons/laser_cannon.ogg" ]
+    "files": [
+      "guns/eweapons/recon_mech_laser_1.ogg.ogg",
+      "guns/eweapons/recon_mech_laser_2.ogg.ogg",
+      "guns/eweapons/recon_mech_laser_3.ogg.ogg"
+    ]
   },
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 75,
+        "variant" : "laser_cannon",
+        "files" : [
+            "guns/eweapons/laser_cannon.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 40,
+        "variant" : "laser_cannon",
+        "files" : [
+            "guns/eweapons/laser_cannon.ogg"
+        ]
+    },
   {
     "type": "sound_effect",
     "id": "fire_gun",
@@ -75,48 +99,48 @@
     "variant": "laser_cannon_turret_fake",
     "files": [ "guns/eweapons/laser_cannon.ogg" ]
   },
-  {
-    "type": "sound_effect",
-    "id": "fire_gun",
-    "volume": 100,
-    "variant": "laser_rifle",
-    "files": [
-      "guns/eweapons/laser_rifle_1.ogg",
-      "guns/eweapons/laser_rifle_2.ogg",
-      "guns/eweapons/laser_rifle_3.ogg"
-    ]
-  },
-  {
-    "type": "sound_effect",
-    "id": "fire_gun_distant",
-    "volume": 40,
-    "variant": "laser_rifle",
-    "files": [
-      "guns/eweapons/laser_rifle_1.ogg",
-      "guns/eweapons/laser_rifle_2.ogg",
-      "guns/eweapons/laser_rifle_3.ogg"
-    ]
-  },
-  {
-    "type": "sound_effect",
-    "id": "fire_gun",
-    "volume": 100,
-    "variant": "v29",
-    "files": [
-      "guns/eweapons/v29_1.ogg",
-      "guns/eweapons/v29_2.ogg",
-      "guns/eweapons/v29_3.ogg"
-    ]
-  },
-  {
-    "type": "sound_effect",
-    "id": "fire_gun_distant",
-    "volume": 40,
-    "variant": "v29",
-    "files": [
-      "guns/eweapons/v29_1.ogg",
-      "guns/eweapons/v29_2.ogg",
-      "guns/eweapons/v29_3.ogg"
-    ]
-  }
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 75,
+        "variant" : "laser_rifle",
+        "files" : [
+            "guns/eweapons/laser_rifle_1.ogg",
+			"guns/eweapons/laser_rifle_2.ogg",
+			"guns/eweapons/laser_rifle_3.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 40,
+        "variant" : "laser_rifle",
+        "files" : [
+            "guns/eweapons/laser_rifle_1.ogg",
+			"guns/eweapons/laser_rifle_2.ogg",
+			"guns/eweapons/laser_rifle_3.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 75,
+        "variant" : "v29",
+        "files" : [
+            "guns/eweapons/v29_1.ogg",
+			"guns/eweapons/v29_2.ogg",
+			"guns/eweapons/v29_3.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 40,
+        "variant" : "v29",
+        "files" : [
+            "guns/eweapons/v29_1.ogg",
+			"guns/eweapons/v29_2.ogg",
+			"guns/eweapons/v29_3.ogg"
+        ]
+    },
 ]
-- 
cgit v1.2.1