From 2ae04884a23b84d33cd07e418c35767132230a73 Mon Sep 17 00:00:00 2001
From: Ledmitz <smoothshifter@tuta.io>
Date: Wed, 11 Nov 2020 17:19:12 +0000
Subject: Moved fireball.ogg back to env DIR as it is used for different
 effects and added as a sound for fire-explosion in effects.xml

---
 LICENSE                |   3 +--
 effects.xml            |   2 +-
 sfx/env/fireball.ogg   | Bin 0 -> 18942 bytes
 sfx/magic/fireball.ogg | Bin 18942 -> 0 bytes
 4 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 sfx/env/fireball.ogg
 delete mode 100644 sfx/magic/fireball.ogg

diff --git a/LICENSE b/LICENSE
index 0b7818c1..5576f1de 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1456,8 +1456,6 @@ legal@themanaworld.org
     sfx/items/legacy/rubberbat.ogg (Cosmotrator)                            (GPL v2)              (-)
 
 ## Magic
-### Fireball
-    sfx/magic/fireball.ogg (Ledmitz)                                        (CC BY-SA 3.0)        (-)
 ### Heal
     sfx/magic/heal.ogg (Ledmitz)                                            (CC BY-SA 3.0)        (-)
 
@@ -1596,6 +1594,7 @@ legal@themanaworld.org
     sfx/weapons/bow-wooden/miss1.ogg (Ledmitz)                              (CC BY-SA 3.0)        (smcameron)
 ## Env
     sfx/env/fart.ogg (LEGACY)                                               (GUMI)                (-)
+    sfx/env/fireball.ogg (Ledmitz)                                          (CC BY-SA 3.0)        (-)
 
 # /
     palette.gpl (Reid)                                                      (CC BY-SA 3.0)        (-)
diff --git a/effects.xml b/effects.xml
index f0ed4831..8568a656 100644
--- a/effects.xml
+++ b/effects.xml
@@ -37,7 +37,7 @@ Copyright (C) 2010-2020 Evol Online -->
     <effect id="29" audio="npcs/fishing-cast.ogg"/> <!-- Throwing the bait in the water, in the fishing script. -->
     <effect id="30" audio="npcs/fishing-bite.ogg"/> <!-- Fish biting the bait, in the fishing script. -->
     <effect id="33" audio="monsters/piou/hit1.ogg"/> <!-- when clicking the flying piou -->
-    <effect id="34" particle="graphics/particles/fire-explosion.xml"/> <!-- An explosion of white particles / LEGACY -->
+    <effect id="34" audio="env/fireball.ogg" particle="graphics/particles/fire-explosion.xml"/> <!-- An explosion of white particles / LEGACY -->
     <effect id="35" particle="graphics/particles/magic-shield.xml"/> <!-- A magic shield particle effect. -->
     <effect id="36" particle="graphics/particles/magic.shield-ends.xml"/>
     <effect id="37" particle="graphics/particles/lightning1.xml"/>
diff --git a/sfx/env/fireball.ogg b/sfx/env/fireball.ogg
new file mode 100644
index 00000000..3e7cc48e
Binary files /dev/null and b/sfx/env/fireball.ogg differ
diff --git a/sfx/magic/fireball.ogg b/sfx/magic/fireball.ogg
deleted file mode 100644
index 3e7cc48e..00000000
Binary files a/sfx/magic/fireball.ogg and /dev/null differ
-- 
cgit v1.2.3-70-g09d2