aboutsummaryrefslogtreecommitdiff
path: root/guns
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-09-08 10:50:21 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-09-08 10:50:21 -0700
commit46dbecdba2b2d52431173ee6182d7015658e69dd (patch)
treebe76fdd2048ada5820a796735b8309e3207f94bc /guns
parentRevert the danger_theme sounds. (diff)
downloadcataclysm-dda-soundpack_jcsoundpack-46dbecdba2b2d52431173ee6182d7015658e69dd.tar.xz
Move my mod guns out of the vanilla guns folder.
Also add prelimiary vamp_stuff sound definitions.
Diffstat (limited to 'guns')
-rw-r--r--guns/000shot.json41
-rw-r--r--guns/00shot_mod.json39
-rw-r--r--guns/308.json98
-rw-r--r--guns/40.json39
-rw-r--r--guns/46.json39
-rw-r--r--guns/473.json49
-rw-r--r--guns/ups.json42
7 files changed, 0 insertions, 347 deletions
diff --git a/guns/000shot.json b/guns/000shot.json
deleted file mode 100644
index c29ef55..0000000
--- a/guns/000shot.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
- {
- "type": "sound_effect",
- "id": "fire_gun",
- "volume": 100,
- "variant": "hk_caws",
- "files": [
- "guns/shot/shot1.ogg",
- "guns/shot/shot2.ogg",
- "guns/shot/shot3.ogg",
- "guns/shot/shot4.ogg",
- "guns/shot/shot5.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "fire_gun_distant",
- "volume": 60,
- "variant": "hk_caws",
- "files": [
- "guns/shot/shot1.ogg",
- "guns/shot/shot2.ogg",
- "guns/shot/shot3.ogg",
- "guns/shot/shot4.ogg",
- "guns/shot/shot5.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "reload",
- "volume": 90,
- "variant": "hk_caws",
- "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"
- ]
- }
-]
diff --git a/guns/00shot_mod.json b/guns/00shot_mod.json
index a7f0d82..a100c7e 100644
--- a/guns/00shot_mod.json
+++ b/guns/00shot_mod.json
@@ -427,44 +427,5 @@
"guns/reload/shotgun/pumpreload4.ogg",
"guns/reload/shotgun/pumpreload5.ogg"
]
- },
- {
- "type": "sound_effect",
- "id": "fire_gun",
- "volume": 100,
- "variant": "m26_mass",
- "files": [
- "guns/shot/shot1.ogg",
- "guns/shot/shot2.ogg",
- "guns/shot/shot3.ogg",
- "guns/shot/shot4.ogg",
- "guns/shot/shot5.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "fire_gun_distant",
- "volume": 60,
- "variant": "m26_mass",
- "files": [
- "guns/shot/shot1.ogg",
- "guns/shot/shot2.ogg",
- "guns/shot/shot3.ogg",
- "guns/shot/shot4.ogg",
- "guns/shot/shot5.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "reload",
- "volume": 90,
- "variant": "m26_mass",
- "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"
- ]
}
]
diff --git a/guns/308.json b/guns/308.json
index 14a0a9b..1a05283 100644
--- a/guns/308.json
+++ b/guns/308.json
@@ -733,103 +733,5 @@
"guns/reload/rifle/rifle_4.ogg",
"guns/reload/rifle/rifle_5.ogg"
]
- },
- {
- "type": "sound_effect",
- "id": "fire_gun",
- "volume": 100,
- "variant": "hk_psg1a1",
- "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": "hk_psg1a1",
- "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": "hk_psg1a1",
- "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",
- "volume": 100,
- "variant": "hk_msg90a2",
- "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": "hk_msg90a2",
- "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": "hk_msg90a2",
- "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"
- ]
}
]
diff --git a/guns/40.json b/guns/40.json
index 0ba54b1..1fbcec7 100644
--- a/guns/40.json
+++ b/guns/40.json
@@ -427,44 +427,5 @@
"guns/reload/pistol_l/pistol_4.ogg",
"guns/reload/pistol_l/pistol_5.ogg"
]
- },
- {
- "type": "sound_effect",
- "id": "fire_gun",
- "volume": 100,
- "variant": "usp_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": "usp_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": "usp_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"
- ]
}
]
diff --git a/guns/46.json b/guns/46.json
index ed4ac02..37125cf 100644
--- a/guns/46.json
+++ b/guns/46.json
@@ -37,44 +37,5 @@
"guns/reload/smg/smg_4.ogg",
"guns/reload/smg/smg_5.ogg"
]
- },
- {
- "type": "sound_effect",
- "id": "fire_gun",
- "volume": 100,
- "variant": "hk_ucp",
- "files": [
- "guns/46/46_1.ogg",
- "guns/46/46_2.ogg",
- "guns/46/46_3.ogg",
- "guns/46/46_4.ogg",
- "guns/46/46_5.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "fire_gun_distant",
- "volume": 60,
- "variant": "hk_ucp",
- "files": [
- "guns/46/46_1.ogg",
- "guns/46/46_2.ogg",
- "guns/46/46_3.ogg",
- "guns/46/46_4.ogg",
- "guns/46/46_5.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "reload",
- "volume": 90,
- "variant": "hk_ucp",
- "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/473.json b/guns/473.json
deleted file mode 100644
index 798b3c9..0000000
--- a/guns/473.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
- {
- "type": "sound_effect",
- "id": "fire_gun",
- "volume": 100,
- "variant": "hk_g11",
- "files": [
- "guns/8x40/8x40_1.ogg",
- "guns/8x40/8x40_2.ogg",
- "guns/8x40/8x40_3.ogg",
- "guns/8x40/8x40_4.ogg",
- "guns/8x40/8x40_5.ogg",
- "guns/8x40/8x40_6.ogg",
- "guns/8x40/8x40_7.ogg",
- "guns/8x40/8x40_8.ogg",
- "guns/8x40/8x40_9.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "fire_gun_distant",
- "volume": 60,
- "variant": "hk_g11",
- "files": [
- "guns/8x40/8x40_1.ogg",
- "guns/8x40/8x40_2.ogg",
- "guns/8x40/8x40_3.ogg",
- "guns/8x40/8x40_4.ogg",
- "guns/8x40/8x40_5.ogg",
- "guns/8x40/8x40_6.ogg",
- "guns/8x40/8x40_7.ogg",
- "guns/8x40/8x40_8.ogg",
- "guns/8x40/8x40_9.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "reload",
- "volume": 90,
- "variant": "hk_g11",
- "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"
- ]
- }
-]
diff --git a/guns/ups.json b/guns/ups.json
index 9e15633..5c7427d 100644
--- a/guns/ups.json
+++ b/guns/ups.json
@@ -101,48 +101,6 @@
"type": "sound_effect",
"id": "fire_gun",
"volume": 100,
- "variant": "laser_rifle_a7m",
- "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_a7m",
- "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": "laser_rifle_a7m_shotgun",
- "files": [
- "guns/eweapons/bio_blaster_gun_1.ogg",
- "guns/eweapons/bio_blaster_gun_2.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "fire_gun_distant",
- "volume": 40,
- "variant": "laser_rifle_a7m_shotgun",
- "files": [
- "guns/eweapons/bio_blaster_gun_1.ogg",
- "guns/eweapons/bio_blaster_gun_2.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "fire_gun",
- "volume": 100,
"variant": "v29",
"files": [
"guns/eweapons/v29_1.ogg",