aboutsummaryrefslogtreecommitdiff
path: root/guns
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-05-26 20:46:42 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-05-26 20:46:42 -0700
commit1e6bdbf2a13a3a0229729b47b190719a36b943e7 (patch)
tree9345db484c3f04536b189c13ec50579b0cc98f15 /guns
parentFull gun revamp, part 2 (diff)
downloadcataclysm-dda-soundpack_jcsoundpack-1e6bdbf2a13a3a0229729b47b190719a36b943e7.tar.xz
Full gun revamp, part 3
Diffstat (limited to 'guns')
-rw-r--r--guns/4570.json119
-rw-r--r--guns/45colt.json137
-rw-r--r--guns/460.json47
-rw-r--r--guns/50.json111
-rw-r--r--guns/545x39.json16
5 files changed, 422 insertions, 8 deletions
diff --git a/guns/4570.json b/guns/4570.json
new file mode 100644
index 0000000..5401e6d
--- /dev/null
+++ b/guns/4570.json
@@ -0,0 +1,119 @@
+[
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun",
+ "volume" : 100,
+ "variant" : "1895sbl",
+ "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" : "1895sbl",
+ "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" : "1895sbl",
+ "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" : "bfr",
+ "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" : "bfr",
+ "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" : "bfr",
+ "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" : "sharps",
+ "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" : "sharps",
+ "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" : "sharps",
+ "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"
+ ]
+ }
+]
diff --git a/guns/45colt.json b/guns/45colt.json
new file mode 100644
index 0000000..5df970d
--- /dev/null
+++ b/guns/45colt.json
@@ -0,0 +1,137 @@
+[
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun",
+ "volume" : 100,
+ "variant" : "bond_410",
+ "files" : [
+ "guns/45/45_1.ogg",
+ "guns/45/45_2.ogg",
+ "guns/45/45_3.ogg",
+ "guns/45/45_4.ogg",
+ "guns/45/45_5.ogg",
+ "guns/45/45_6.ogg",
+ "guns/45/45_7.ogg",
+ "guns/45/45_8.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun_distant",
+ "volume" : 60,
+ "variant" : "bond_410",
+ "files" : [
+ "guns/45/45_1.ogg",
+ "guns/45/45_2.ogg",
+ "guns/45/45_3.ogg",
+ "guns/45/45_4.ogg",
+ "guns/45/45_5.ogg",
+ "guns/45/45_6.ogg",
+ "guns/45/45_7.ogg",
+ "guns/45/45_8.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "reload",
+ "volume" : 90,
+ "variant" : "bond_410",
+ "files" : [
+ "guns/reload/pistol_h/pistol_1.ogg",
+ "guns/reload/pistol_h/pistol_2.ogg",
+ "guns/reload/pistol_h/pistol_3.ogg",
+ "guns/reload/pistol_h/pistol_4.ogg",
+ "guns/reload/pistol_h/pistol_5.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun",
+ "volume" : 100,
+ "variant" : "colt_lightning",
+ "files" : [
+ "guns/45/45_1.ogg",
+ "guns/45/45_2.ogg",
+ "guns/45/45_3.ogg",
+ "guns/45/45_4.ogg",
+ "guns/45/45_5.ogg",
+ "guns/45/45_6.ogg",
+ "guns/45/45_7.ogg",
+ "guns/45/45_8.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun_distant",
+ "volume" : 60,
+ "variant" : "colt_lightning",
+ "files" : [
+ "guns/45/45_1.ogg",
+ "guns/45/45_2.ogg",
+ "guns/45/45_3.ogg",
+ "guns/45/45_4.ogg",
+ "guns/45/45_5.ogg",
+ "guns/45/45_6.ogg",
+ "guns/45/45_7.ogg",
+ "guns/45/45_8.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "reload",
+ "volume" : 90,
+ "variant" : "colt_lightning",
+ "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" : "colt_saa",
+ "files" : [
+ "guns/45/45_1.ogg",
+ "guns/45/45_2.ogg",
+ "guns/45/45_3.ogg",
+ "guns/45/45_4.ogg",
+ "guns/45/45_5.ogg",
+ "guns/45/45_6.ogg",
+ "guns/45/45_7.ogg",
+ "guns/45/45_8.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun_distant",
+ "volume" : 60,
+ "variant" : "colt_saa",
+ "files" : [
+ "guns/45/45_1.ogg",
+ "guns/45/45_2.ogg",
+ "guns/45/45_3.ogg",
+ "guns/45/45_4.ogg",
+ "guns/45/45_5.ogg",
+ "guns/45/45_6.ogg",
+ "guns/45/45_7.ogg",
+ "guns/45/45_8.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "reload",
+ "volume" : 90,
+ "variant" : "colt_saa",
+ "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"
+ ]
+ },
+]
diff --git a/guns/460.json b/guns/460.json
new file mode 100644
index 0000000..a7b6646
--- /dev/null
+++ b/guns/460.json
@@ -0,0 +1,47 @@
+[
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun",
+ "volume" : 100,
+ "variant" : "m1911-460",
+ "files" : [
+ "guns/45/45_1.ogg",
+ "guns/45/45_2.ogg",
+ "guns/45/45_3.ogg",
+ "guns/45/45_4.ogg",
+ "guns/45/45_5.ogg",
+ "guns/45/45_6.ogg",
+ "guns/45/45_7.ogg",
+ "guns/45/45_8.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun_distant",
+ "volume" : 60,
+ "variant" : "m1911-460",
+ "files" : [
+ "guns/45/45_1.ogg",
+ "guns/45/45_2.ogg",
+ "guns/45/45_3.ogg",
+ "guns/45/45_4.ogg",
+ "guns/45/45_5.ogg",
+ "guns/45/45_6.ogg",
+ "guns/45/45_7.ogg",
+ "guns/45/45_8.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "reload",
+ "volume" : 90,
+ "variant" : "m1911-460",
+ "files" : [
+ "guns/reload/pistol_h/pistol_1.ogg",
+ "guns/reload/pistol_h/pistol_2.ogg",
+ "guns/reload/pistol_h/pistol_3.ogg",
+ "guns/reload/pistol_h/pistol_4.ogg",
+ "guns/reload/pistol_h/pistol_5.ogg"
+ ]
+ }
+]
diff --git a/guns/50.json b/guns/50.json
index 6fc84bc..0b38a0f 100644
--- a/guns/50.json
+++ b/guns/50.json
@@ -109,5 +109,116 @@
"guns/reload/rifle_s/rifle_4.ogg",
"guns/reload/rifle_s/rifle_5.ogg"
]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun",
+ "volume" : 100,
+ "variant" : "as50",
+ "files" : [
+ "guns/50/50_1.ogg",
+ "guns/50/50_2.ogg",
+ "guns/50/50_3.ogg",
+ "guns/50/50_4.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun_distant",
+ "volume" : 60,
+ "variant" : "as50",
+ "files" : [
+ "guns/50/50_1.ogg",
+ "guns/50/50_2.ogg",
+ "guns/50/50_3.ogg",
+ "guns/50/50_4.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "reload",
+ "volume" : 90,
+ "variant" : "as50",
+ "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" : "tac50",
+ "files" : [
+ "guns/50/50_1.ogg",
+ "guns/50/50_2.ogg",
+ "guns/50/50_3.ogg",
+ "guns/50/50_4.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun_distant",
+ "volume" : 60,
+ "variant" : "tac50",
+ "files" : [
+ "guns/50/50_1.ogg",
+ "guns/50/50_2.ogg",
+ "guns/50/50_3.ogg",
+ "guns/50/50_4.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "reload",
+ "volume" : 90,
+ "variant" : "tac50",
+ "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" : "bfg50",
+ "files" : [
+ "guns/50/50_1.ogg",
+ "guns/50/50_2.ogg",
+ "guns/50/50_3.ogg",
+ "guns/50/50_4.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "fire_gun_distant",
+ "volume" : 60,
+ "variant" : "bfg50",
+ "files" : [
+ "guns/50/50_1.ogg",
+ "guns/50/50_2.ogg",
+ "guns/50/50_3.ogg",
+ "guns/50/50_4.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id" : "reload",
+ "volume" : 90,
+ "variant" : "bfg50",
+ "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/545x39.json b/guns/545x39.json
index e24feda..beb9863 100644
--- a/guns/545x39.json
+++ b/guns/545x39.json
@@ -1,9 +1,9 @@
[
- {
+ {
"type": "sound_effect",
"id" : "fire_gun",
"volume" : 100,
- "variant" : "an94",
+ "variant" : "ak74",
"files" : [
"guns/545x39/545x39_1.ogg",
"guns/545x39/545x39_2.ogg",
@@ -16,7 +16,7 @@
"type": "sound_effect",
"id" : "fire_gun_distant",
"volume" : 60,
- "variant" : "an94",
+ "variant" : "ak74",
"files" : [
"guns/545x39/545x39_1.ogg",
"guns/545x39/545x39_2.ogg",
@@ -29,7 +29,7 @@
"type": "sound_effect",
"id" : "reload",
"volume" : 90,
- "variant" : "an94",
+ "variant" : "ak74",
"files" : [
"guns/reload/ak/ak_reload_1.ogg",
"guns/reload/ak/ak_reload_2.ogg",
@@ -38,11 +38,11 @@
"guns/reload/ak/ak_reload_5.ogg"
]
},
- {
+ {
"type": "sound_effect",
"id" : "fire_gun",
"volume" : 100,
- "variant" : "ak74",
+ "variant" : "an94",
"files" : [
"guns/545x39/545x39_1.ogg",
"guns/545x39/545x39_2.ogg",
@@ -55,7 +55,7 @@
"type": "sound_effect",
"id" : "fire_gun_distant",
"volume" : 60,
- "variant" : "ak74",
+ "variant" : "an94",
"files" : [
"guns/545x39/545x39_1.ogg",
"guns/545x39/545x39_2.ogg",
@@ -68,7 +68,7 @@
"type": "sound_effect",
"id" : "reload",
"volume" : 90,
- "variant" : "ak74",
+ "variant" : "an94",
"files" : [
"guns/reload/ak/ak_reload_1.ogg",
"guns/reload/ak/ak_reload_2.ogg",