From 9eb0043c5d1536cf74708fff4b110f9461841eed Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 22 Jul 2021 13:05:49 -0700
Subject: Move lilypad to furniture-flora

---
 furniture-flora.json   | 36 ++++++++++++++++++++++++++++++++++++
 furniture_effects.json | 36 ------------------------------------
 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
@@ -395,6 +395,42 @@
       "terrain/tree/hit_grass_10.ogg"
     ]
   },
+  {
+    "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",
diff --git a/furniture_effects.json b/furniture_effects.json
index 29e7f19..a4fd53e 100644
--- a/furniture_effects.json
+++ b/furniture_effects.json
@@ -1,40 +1,4 @@
 [
-  {
-    "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",
-- 
cgit v1.2.1