aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-07-22 13:05:49 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-07-22 13:05:49 -0700
commit9eb0043c5d1536cf74708fff4b110f9461841eed (patch)
tree04f3a98f6ace1cbee3d281d1304d644751c10011
parentAdd more furniture-flora sounds (diff)
downloadcataclysm-dda-soundpack_jcsoundpack-9eb0043c5d1536cf74708fff4b110f9461841eed.tar.xz
Move lilypad to furniture-flora
-rw-r--r--furniture-flora.json36
-rw-r--r--furniture_effects.json36
2 files changed, 36 insertions, 36 deletions
diff --git a/furniture-flora.json b/furniture-flora.json
index 0b88ea1..6c65713 100644
--- a/furniture-flora.json
+++ b/furniture-flora.json
@@ -398,6 +398,42 @@
{
"type": "sound_effect",
"id": "smash_fail",
+ "variant": "f_lilypad",
+ "volume": 50,
+ "files": [
+ "terrain/tree/hit_grass_1.ogg",
+ "terrain/tree/hit_grass_2.ogg",
+ "terrain/tree/hit_grass_3.ogg",
+ "terrain/tree/hit_grass_4.ogg",
+ "terrain/tree/hit_grass_5.ogg",
+ "terrain/tree/hit_grass_6.ogg",
+ "terrain/tree/hit_grass_7.ogg",
+ "terrain/tree/hit_grass_8.ogg",
+ "terrain/tree/hit_grass_9.ogg",
+ "terrain/tree/hit_grass_10.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id": "smash_success",
+ "variant": "f_lilypad",
+ "volume": 50,
+ "files": [
+ "terrain/tree/hit_grass_1.ogg",
+ "terrain/tree/hit_grass_2.ogg",
+ "terrain/tree/hit_grass_3.ogg",
+ "terrain/tree/hit_grass_4.ogg",
+ "terrain/tree/hit_grass_5.ogg",
+ "terrain/tree/hit_grass_6.ogg",
+ "terrain/tree/hit_grass_7.ogg",
+ "terrain/tree/hit_grass_8.ogg",
+ "terrain/tree/hit_grass_9.ogg",
+ "terrain/tree/hit_grass_10.ogg"
+ ]
+ },
+ {
+ "type": "sound_effect",
+ "id": "smash_fail",
"variant": "f_bluebell",
"volume": 50,
"files": [
diff --git a/furniture_effects.json b/furniture_effects.json
index 29e7f19..a4fd53e 100644
--- a/furniture_effects.json
+++ b/furniture_effects.json
@@ -2,42 +2,6 @@
{
"type": "sound_effect",
"id": "smash_fail",
- "variant": "f_lilypad",
- "volume": 50,
- "files": [
- "terrain/tree/hit_grass_1.ogg",
- "terrain/tree/hit_grass_2.ogg",
- "terrain/tree/hit_grass_3.ogg",
- "terrain/tree/hit_grass_4.ogg",
- "terrain/tree/hit_grass_5.ogg",
- "terrain/tree/hit_grass_6.ogg",
- "terrain/tree/hit_grass_7.ogg",
- "terrain/tree/hit_grass_8.ogg",
- "terrain/tree/hit_grass_9.ogg",
- "terrain/tree/hit_grass_10.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "smash_success",
- "variant": "f_lilypad",
- "volume": 50,
- "files": [
- "terrain/tree/hit_grass_1.ogg",
- "terrain/tree/hit_grass_2.ogg",
- "terrain/tree/hit_grass_3.ogg",
- "terrain/tree/hit_grass_4.ogg",
- "terrain/tree/hit_grass_5.ogg",
- "terrain/tree/hit_grass_6.ogg",
- "terrain/tree/hit_grass_7.ogg",
- "terrain/tree/hit_grass_8.ogg",
- "terrain/tree/hit_grass_9.ogg",
- "terrain/tree/hit_grass_10.ogg"
- ]
- },
- {
- "type": "sound_effect",
- "id": "smash_fail",
"variant": "f_flower_marloss",
"volume": 50,
"files": [