diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-05-09 11:16:24 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-05-09 11:16:24 -0700 |
| commit | b516513f9328cac1552c09895cf40afd0bce5f1f (patch) | |
| tree | 32b351dee2c427c0433924a4ae20b117be68d40c /guns | |
| parent | Fix stray comma after adding m26 (diff) | |
| download | cataclysm-dda-soundpack_jcsoundpack-b516513f9328cac1552c09895cf40afd0bce5f1f.tar.xz | |
Update to bright nights
Diffstat (limited to 'guns')
| -rw-r--r-- | guns/223.json | 196 | ||||
| -rw-r--r-- | guns/308.json | 49 | ||||
| -rw-r--r-- | guns/40.json | 78 | ||||
| -rw-r--r-- | guns/762.json | 78 | ||||
| -rw-r--r-- | guns/9mm.json | 121 | ||||
| -rw-r--r-- | guns/archery.json | 105 | ||||
| -rw-r--r-- | guns/archery_obsolete.json | 106 | ||||
| -rw-r--r-- | guns/crossbows.json | 34 | ||||
| -rw-r--r-- | guns/flintlock.json | 39 | ||||
| -rw-r--r-- | guns/metal_rail_obsolete.json (renamed from guns/metal_rail.json) | 0 | ||||
| -rw-r--r-- | guns/nail.json | 60 | ||||
| -rw-r--r-- | guns/nail_obsolete.json | 62 | ||||
| -rw-r--r-- | guns/pneumatic.json | 89 | ||||
| -rw-r--r-- | guns/pneumatic_obsolete.json | 91 | ||||
| -rw-r--r-- | guns/ups.json | 14 |
15 files changed, 867 insertions, 255 deletions
diff --git a/guns/223.json b/guns/223.json index c1bba8e..ea4fb83 100644 --- a/guns/223.json +++ b/guns/223.json @@ -101,6 +101,104 @@ "type": "sound_effect", "id": "fire_gun", "volume": 100, + "variant": "ar_pistol", + "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": "ar_pistol", + "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": "ar_pistol", + "files": [ + "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": "famas", + "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": "famas", + "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": "famas", + "files": [ + "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": "h&k416a5", "files": [ "guns/223/223_1.ogg", @@ -395,6 +493,104 @@ "type": "sound_effect", "id": "fire_gun", "volume": 100, + "variant": "m16a4_turret_fake", + "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": "m16a4_turret_fake", + "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": "m16a4_turret_fake", + "files": [ + "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": "oa93", + "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": "oa93", + "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": "oa93", + "files": [ + "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": "rifle_223", "files": [ "guns/223/223_1.ogg", diff --git a/guns/308.json b/guns/308.json index 6f0cdf8..14a0a9b 100644 --- a/guns/308.json +++ b/guns/308.json @@ -199,6 +199,55 @@ "type": "sound_effect", "id": "fire_gun", "volume": 100, + "variant": "m14ebr_turret_fake", + "files": [ + "guns/308/308_1.ogg", + "guns/308/308_2.ogg", + "guns/308/308_3.ogg", + "guns/308/308_4.ogg", + "guns/308/308_5.ogg", + "guns/308/308_6.ogg", + "guns/308/308_7.ogg", + "guns/308/308_8.ogg", + "guns/308/308_9.ogg", + "guns/308/308_10.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 60, + "variant": "m14ebr_turret_fake", + "files": [ + "guns/308/308_1.ogg", + "guns/308/308_2.ogg", + "guns/308/308_3.ogg", + "guns/308/308_4.ogg", + "guns/308/308_5.ogg", + "guns/308/308_6.ogg", + "guns/308/308_7.ogg", + "guns/308/308_8.ogg", + "guns/308/308_9.ogg", + "guns/308/308_10.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "m14ebr_turret_fake", + "files": [ + "guns/reload/rifle_h/rifle_1.ogg", + "guns/reload/rifle_h/rifle_2.ogg", + "guns/reload/rifle_h/rifle_3.ogg", + "guns/reload/rifle_h/rifle_4.ogg", + "guns/reload/rifle_h/rifle_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, "variant": "m1a", "files": [ "guns/308/308_1.ogg", diff --git a/guns/40.json b/guns/40.json index b1e709c..0ba54b1 100644 --- a/guns/40.json +++ b/guns/40.json @@ -3,6 +3,45 @@ "type": "sound_effect", "id": "fire_gun", "volume": 100, + "variant": "90to40", + "files": [ + "guns/40/40_1.ogg", + "guns/40/40_2.ogg", + "guns/40/40_3.ogg", + "guns/40/40_4.ogg", + "guns/40/40_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 60, + "variant": "90to40", + "files": [ + "guns/40/40_1.ogg", + "guns/40/40_2.ogg", + "guns/40/40_3.ogg", + "guns/40/40_4.ogg", + "guns/40/40_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "90to40", + "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" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, "variant": "glock_22", "files": [ "guns/40/40_1.ogg", @@ -42,6 +81,45 @@ "type": "sound_effect", "id": "fire_gun", "volume": 100, + "variant": "px4_40", + "files": [ + "guns/40/40_1.ogg", + "guns/40/40_2.ogg", + "guns/40/40_3.ogg", + "guns/40/40_4.ogg", + "guns/40/40_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 60, + "variant": "px4_40", + "files": [ + "guns/40/40_1.ogg", + "guns/40/40_2.ogg", + "guns/40/40_3.ogg", + "guns/40/40_4.ogg", + "guns/40/40_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "px4_40", + "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" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, "variant": "rifle_40", "files": [ "guns/40/40_1.ogg", diff --git a/guns/762.json b/guns/762.json index 33a8cba..01da751 100644 --- a/guns/762.json +++ b/guns/762.json @@ -115,5 +115,83 @@ "guns/reload/rifle_s/rifle_4.ogg", "guns/reload/rifle_s/rifle_5.ogg" ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, + "variant": "aksemi", + "files": [ + "guns/762/762_1.ogg", + "guns/762/762_2.ogg", + "guns/762/762_3.ogg", + "guns/762/762_4.ogg", + "guns/762/762_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 60, + "variant": "aksemi", + "files": [ + "guns/762/762_1.ogg", + "guns/762/762_2.ogg", + "guns/762/762_3.ogg", + "guns/762/762_4.ogg", + "guns/762/762_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "aksemi", + "files": [ + "guns/reload/ak/ak_reload_1.ogg", + "guns/reload/ak/ak_reload_2.ogg", + "guns/reload/ak/ak_reload_3.ogg", + "guns/reload/ak/ak_reload_4.ogg", + "guns/reload/ak/ak_reload_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, + "variant": "draco", + "files": [ + "guns/762/762_1.ogg", + "guns/762/762_2.ogg", + "guns/762/762_3.ogg", + "guns/762/762_4.ogg", + "guns/762/762_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 60, + "variant": "draco", + "files": [ + "guns/762/762_1.ogg", + "guns/762/762_2.ogg", + "guns/762/762_3.ogg", + "guns/762/762_4.ogg", + "guns/762/762_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "draco", + "files": [ + "guns/reload/ak/ak_reload_1.ogg", + "guns/reload/ak/ak_reload_2.ogg", + "guns/reload/ak/ak_reload_3.ogg", + "guns/reload/ak/ak_reload_4.ogg", + "guns/reload/ak/ak_reload_5.ogg" + ] } ] diff --git a/guns/9mm.json b/guns/9mm.json index de600ee..f431c97 100644 --- a/guns/9mm.json +++ b/guns/9mm.json @@ -3,6 +3,45 @@ "type": "sound_effect", "id": "fire_gun", "volume": 100, + "variant": "90two", + "files": [ + "guns/9mm/9mm_1.ogg", + "guns/9mm/9mm_2.ogg", + "guns/9mm/9mm_3.ogg", + "guns/9mm/9mm_4.ogg", + "guns/9mm/9mm_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 60, + "variant": "90two", + "files": [ + "guns/9mm/9mm_1.ogg", + "guns/9mm/9mm_2.ogg", + "guns/9mm/9mm_3.ogg", + "guns/9mm/9mm_4.ogg", + "guns/9mm/9mm_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "90two", + "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" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, "variant": "calico", "files": [ "guns/9mm/9mm_1.ogg", @@ -321,7 +360,7 @@ "guns/9mm/9mm_2.ogg", "guns/9mm/9mm_3.ogg", "guns/9mm/9mm_4.ogg", - "guns/9mm/9mm_5.ogg" + "guns/9mm/9mm_5.ogg" ] }, { @@ -334,7 +373,7 @@ "guns/9mm/9mm_2.ogg", "guns/9mm/9mm_3.ogg", "guns/9mm/9mm_4.ogg", - "guns/9mm/9mm_5.ogg" + "guns/9mm/9mm_5.ogg" ] }, { @@ -354,6 +393,45 @@ "type": "sound_effect", "id": "fire_gun", "volume": 100, + "variant": "ksub2000_turret_fake", + "files": [ + "guns/9mm/9mm_1.ogg", + "guns/9mm/9mm_2.ogg", + "guns/9mm/9mm_3.ogg", + "guns/9mm/9mm_4.ogg", + "guns/9mm/9mm_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 60, + "variant": "ksub2000_turret_fake", + "files": [ + "guns/9mm/9mm_1.ogg", + "guns/9mm/9mm_2.ogg", + "guns/9mm/9mm_3.ogg", + "guns/9mm/9mm_4.ogg", + "guns/9mm/9mm_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "ksub2000_turret_fake", + "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" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, "variant": "m9", "files": [ "guns/9mm/9mm_1.ogg", @@ -393,6 +471,45 @@ "type": "sound_effect", "id": "fire_gun", "volume": 100, + "variant": "px4", + "files": [ + "guns/9mm/9mm_1.ogg", + "guns/9mm/9mm_2.ogg", + "guns/9mm/9mm_3.ogg", + "guns/9mm/9mm_4.ogg", + "guns/9mm/9mm_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 60, + "variant": "px4", + "files": [ + "guns/9mm/9mm_1.ogg", + "guns/9mm/9mm_2.ogg", + "guns/9mm/9mm_3.ogg", + "guns/9mm/9mm_4.ogg", + "guns/9mm/9mm_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "px4", + "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" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, "variant": "rifle_9mm", "files": [ "guns/9mm/9mm_1.ogg", diff --git a/guns/archery.json b/guns/archery.json index 9d1bc53..d90bef1 100644 --- a/guns/archery.json +++ b/guns/archery.json @@ -155,84 +155,7 @@ "guns/archery/archery_5.ogg" ] }, - { - "type": "sound_effect", - "id": "fire_gun", - "volume": 100, - "variant": "recurbow", - "files": [ - "guns/archery/archery_1.ogg", - "guns/archery/archery_2.ogg", - "guns/archery/archery_3.ogg", - "guns/archery/archery_4.ogg", - "guns/archery/archery_5.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun_distant", - "volume": 40, - "variant": "recurbow", - "files": [ - "guns/archery/archery_1.ogg", - "guns/archery/archery_2.ogg", - "guns/archery/archery_3.ogg", - "guns/archery/archery_4.ogg", - "guns/archery/archery_5.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun", - "volume": 100, - "variant": "reflexbow", - "files": [ - "guns/archery/archery_1.ogg", - "guns/archery/archery_2.ogg", - "guns/archery/archery_3.ogg", - "guns/archery/archery_4.ogg", - "guns/archery/archery_5.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun_distant", - "volume": 40, - "variant": "reflexbow", - "files": [ - "guns/archery/archery_1.ogg", - "guns/archery/archery_2.ogg", - "guns/archery/archery_3.ogg", - "guns/archery/archery_4.ogg", - "guns/archery/archery_5.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun", - "volume": 100, - "variant": "hybridbow", - "files": [ - "guns/archery/archery_1.ogg", - "guns/archery/archery_2.ogg", - "guns/archery/archery_3.ogg", - "guns/archery/archery_4.ogg", - "guns/archery/archery_5.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun_distant", - "volume": 40, - "variant": "hybridbow", - "files": [ - "guns/archery/archery_1.ogg", - "guns/archery/archery_2.ogg", - "guns/archery/archery_3.ogg", - "guns/archery/archery_4.ogg", - "guns/archery/archery_5.ogg" - ] - }, + { "type": "sound_effect", "id": "fire_gun", @@ -263,32 +186,6 @@ "type": "sound_effect", "id": "fire_gun", "volume": 100, - "variant": "woodgreatbow", - "files": [ - "guns/archery/archery_1.ogg", - "guns/archery/archery_2.ogg", - "guns/archery/archery_3.ogg", - "guns/archery/archery_4.ogg", - "guns/archery/archery_5.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun_distant", - "volume": 40, - "variant": "woodgreatbow", - "files": [ - "guns/archery/archery_1.ogg", - "guns/archery/archery_2.ogg", - "guns/archery/archery_3.ogg", - "guns/archery/archery_4.ogg", - "guns/archery/archery_5.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun", - "volume": 100, "variant": "compgreatbow", "files": [ "guns/archery/archery_1.ogg", diff --git a/guns/archery_obsolete.json b/guns/archery_obsolete.json new file mode 100644 index 0000000..6402030 --- /dev/null +++ b/guns/archery_obsolete.json @@ -0,0 +1,106 @@ +[ + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, + "variant": "recurbow", + "files": [ + "guns/archery/archery_1.ogg", + "guns/archery/archery_2.ogg", + "guns/archery/archery_3.ogg", + "guns/archery/archery_4.ogg", + "guns/archery/archery_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 40, + "variant": "recurbow", + "files": [ + "guns/archery/archery_1.ogg", + "guns/archery/archery_2.ogg", + "guns/archery/archery_3.ogg", + "guns/archery/archery_4.ogg", + "guns/archery/archery_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, + "variant": "reflexbow", + "files": [ + "guns/archery/archery_1.ogg", + "guns/archery/archery_2.ogg", + "guns/archery/archery_3.ogg", + "guns/archery/archery_4.ogg", + "guns/archery/archery_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 40, + "variant": "reflexbow", + "files": [ + "guns/archery/archery_1.ogg", + "guns/archery/archery_2.ogg", + "guns/archery/archery_3.ogg", + "guns/archery/archery_4.ogg", + "guns/archery/archery_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, + "variant": "hybridbow", + "files": [ + "guns/archery/archery_1.ogg", + "guns/archery/archery_2.ogg", + "guns/archery/archery_3.ogg", + "guns/archery/archery_4.ogg", + "guns/archery/archery_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 40, + "variant": "hybridbow", + "files": [ + "guns/archery/archery_1.ogg", + "guns/archery/archery_2.ogg", + "guns/archery/archery_3.ogg", + "guns/archery/archery_4.ogg", + "guns/archery/archery_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, + "variant": "woodgreatbow", + "files": [ + "guns/archery/archery_1.ogg", + "guns/archery/archery_2.ogg", + "guns/archery/archery_3.ogg", + "guns/archery/archery_4.ogg", + "guns/archery/archery_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 40, + "variant": "woodgreatbow", + "files": [ + "guns/archery/archery_1.ogg", + "guns/archery/archery_2.ogg", + "guns/archery/archery_3.ogg", + "guns/archery/archery_4.ogg", + "guns/archery/archery_5.ogg" + ] + } +] diff --git a/guns/crossbows.json b/guns/crossbows.json index ce75b97..d1caf50 100644 --- a/guns/crossbows.json +++ b/guns/crossbows.json @@ -105,6 +105,40 @@ "type": "sound_effect", "id": "fire_gun", "volume": 100, + "variant": "compositecrossbow", + "files": [ + "guns/crossbows/crossbows_1.ogg", + "guns/crossbows/crossbows_2.ogg", + "guns/crossbows/crossbows_3.ogg", + "guns/crossbows/crossbows_4.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 40, + "variant": "compositecrossbow", + "files": [ + "guns/crossbows/crossbows_1.ogg", + "guns/crossbows/crossbows_2.ogg", + "guns/crossbows/crossbows_3.ogg", + "guns/crossbows/crossbows_4.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "compositecrossbow", + "files": [ + "guns/crossbows/reload_1.ogg", + "guns/crossbows/reload_2.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, "variant": "compcrossbow", "files": [ "guns/crossbows/crossbows_1.ogg", diff --git a/guns/flintlock.json b/guns/flintlock.json index 21f6af3..cd88f40 100644 --- a/guns/flintlock.json +++ b/guns/flintlock.json @@ -154,5 +154,44 @@ "guns/reload/rifle_s/rifle_4.ogg", "guns/reload/rifle_s/rifle_5.ogg" ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, + "variant": "longrifle_flintlock", + "files": [ + "guns/flintlock/flintlock_1.ogg", + "guns/flintlock/flintlock_2.ogg", + "guns/flintlock/flintlock_3.ogg", + "guns/flintlock/flintlock_4.ogg", + "guns/flintlock/flintlock_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 40, + "variant": "longrifle_flintlock", + "files": [ + "guns/flintlock/flintlock_1.ogg", + "guns/flintlock/flintlock_2.ogg", + "guns/flintlock/flintlock_3.ogg", + "guns/flintlock/flintlock_4.ogg", + "guns/flintlock/flintlock_5.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "longrifle_flintlock", + "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" + ] } ] diff --git a/guns/metal_rail.json b/guns/metal_rail_obsolete.json index 752d58c..752d58c 100644 --- a/guns/metal_rail.json +++ b/guns/metal_rail_obsolete.json diff --git a/guns/nail.json b/guns/nail.json index e6fa4eb..7a4fc67 100644 --- a/guns/nail.json +++ b/guns/nail.json @@ -3,33 +3,6 @@ "type": "sound_effect", "id": "fire_gun", "volume": 90, - "variant": "coilgun", - "files": [ "guns/nail/coilgun.ogg" ] - }, - { - "type": "sound_effect", - "id": "fire_gun", - "volume": 90, - "variant": "coilgun", - "files": [ "guns/nail/coilgun.ogg" ] - }, - { - "type": "sound_effect", - "id": "reload", - "volume": 90, - "variant": "coilgun", - "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" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun", - "volume": 90, "variant": "nailgun", "files": [ "guns/nail/nailgun_1.ogg", @@ -52,38 +25,5 @@ "volume": 90, "variant": "nailgun", "files": [ "guns/reload/others/bbgun.ogg" ] - }, - { - "type": "sound_effect", - "id": "fire_gun", - "volume": 90, - "variant": "nailrifle", - "files": [ - "guns/nail/nailgun_1.ogg", - "guns/nail/nailgun_2.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun", - "volume": 90, - "variant": "nailrifle", - "files": [ - "guns/nail/nailgun_1.ogg", - "guns/nail/nailgun_2.ogg" - ] - }, - { - "type": "sound_effect", - "id": "reload", - "volume": 90, - "variant": "nailrifle", - "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" - ] } ] diff --git a/guns/nail_obsolete.json b/guns/nail_obsolete.json new file mode 100644 index 0000000..c0e25cd --- /dev/null +++ b/guns/nail_obsolete.json @@ -0,0 +1,62 @@ +[ + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 90, + "variant": "coilgun", + "files": [ "guns/nail/coilgun.ogg" ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 90, + "variant": "coilgun", + "files": [ "guns/nail/coilgun.ogg" ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "coilgun", + "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" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 90, + "variant": "nailrifle", + "files": [ + "guns/nail/nailgun_1.ogg", + "guns/nail/nailgun_2.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 90, + "variant": "nailrifle", + "files": [ + "guns/nail/nailgun_1.ogg", + "guns/nail/nailgun_2.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "nailrifle", + "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" + ] + } +] diff --git a/guns/pneumatic.json b/guns/pneumatic.json index a819120..e396729 100644 --- a/guns/pneumatic.json +++ b/guns/pneumatic.json @@ -27,94 +27,5 @@ "files": [ "guns/reload/others/bbgun.ogg" ] - }, - { - "type": "sound_effect", - "id": "fire_gun", - "volume": 100, - "variant": "tihar", - "files": [ - "guns/others/tihar_1.ogg", - "guns/others/tihar_2.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun_distant", - "volume": 40, - "variant": "tihar", - "files": [ - "guns/others/tihar_1.ogg", - "guns/others/tihar_2.ogg" - ] - }, - { - "type": "sound_effect", - "id": "reload", - "volume": 90, - "variant": "tihar", - "files": [ - "guns/crossbows/hellsing_reload.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun", - "volume": 100, - "variant": "helsing", - "files": [ - "guns/crossbows/hellsing_1.ogg", - "guns/crossbows/hellsing_2.ogg", - "guns/crossbows/hellsing_3.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun_distant", - "volume": 40, - "variant": "helsing", - "files": [ - "guns/crossbows/hellsing_1.ogg", - "guns/crossbows/hellsing_2.ogg", - "guns/crossbows/hellsing_3.ogg" - ] - }, - { - "type": "sound_effect", - "id": "reload", - "volume": 90, - "variant": "helsing", - "files": [ - "guns/crossbows/hellsing_reload.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun", - "volume": 100, - "variant": "pneumatic_shotgun", - "files": [ - "guns/others/bbgun_1.ogg", - "guns/others/bbgun_2.ogg" - ] - }, - { - "type": "sound_effect", - "id": "fire_gun_distant", - "volume": 40, - "variant": "pneumatic_shotgun", - "files": [ - "guns/others/bbgun_1.ogg", - "guns/others/bbgun_2.ogg" - ] - }, - { - "type": "sound_effect", - "id": "reload", - "volume": 90, - "variant": "pneumatic_shotgun", - "files": [ - "guns/reload/others/bbgun.ogg" - ] } ] diff --git a/guns/pneumatic_obsolete.json b/guns/pneumatic_obsolete.json new file mode 100644 index 0000000..636d56b --- /dev/null +++ b/guns/pneumatic_obsolete.json @@ -0,0 +1,91 @@ +[ + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, + "variant": "tihar", + "files": [ + "guns/others/tihar_1.ogg", + "guns/others/tihar_2.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 40, + "variant": "tihar", + "files": [ + "guns/others/tihar_1.ogg", + "guns/others/tihar_2.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "tihar", + "files": [ + "guns/crossbows/hellsing_reload.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, + "variant": "helsing", + "files": [ + "guns/crossbows/hellsing_1.ogg", + "guns/crossbows/hellsing_2.ogg", + "guns/crossbows/hellsing_3.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 40, + "variant": "helsing", + "files": [ + "guns/crossbows/hellsing_1.ogg", + "guns/crossbows/hellsing_2.ogg", + "guns/crossbows/hellsing_3.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "helsing", + "files": [ + "guns/crossbows/hellsing_reload.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun", + "volume": 100, + "variant": "pneumatic_shotgun", + "files": [ + "guns/others/bbgun_1.ogg", + "guns/others/bbgun_2.ogg" + ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 40, + "variant": "pneumatic_shotgun", + "files": [ + "guns/others/bbgun_1.ogg", + "guns/others/bbgun_2.ogg" + ] + }, + { + "type": "sound_effect", + "id": "reload", + "volume": 90, + "variant": "pneumatic_shotgun", + "files": [ + "guns/reload/others/bbgun.ogg" + ] + } +] diff --git a/guns/ups.json b/guns/ups.json index 5459dfd..9e15633 100644 --- a/guns/ups.json +++ b/guns/ups.json @@ -65,6 +65,20 @@ "type": "sound_effect", "id": "fire_gun", "volume": 100, + "variant": "laser_cannon_turret_fake", + "files": [ "guns/eweapons/laser_cannon.ogg" ] + }, + { + "type": "sound_effect", + "id": "fire_gun_distant", + "volume": 40, + "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", |