Merge branch 'magic-heal' into 'master'

magic-heal-sfx: Originally inma.ogg in my TMW patch. I assume this is for a...

See merge request evol/clientdata!164

3 files changed, 3 insertions, 1 deletions

diff --git a/LICENSE b/LICENSE
index 64842767..6241d785 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1146,6 +1146,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 ## Magic
 ### Fireball
     sfx/magic/fireball.ogg (Ledmitz)                                        (CC BY-SA 3.0)        (-)
+### Heal
+    sfx/magic/heal.ogg (Ledmitz)                                            (CC BY-SA 3.0) (-)
 ## Monsters
 ### Bee
     sfx/monsters/bee/die1.ogg (Ledmitz)                                     (CC BY-SA 3.0)        (-)
diff --git a/effects.xml b/effects.xml
index 2cb98d8a..85065267 100644
--- a/effects.xml
+++ b/effects.xml
@@ -12,7 +12,7 @@ Copyright (C) 2010-2014 Evol Online -->
     <effect id="5" particle="graphics/particles/warp.xml"/> <!-- Warp particle effect. -->
     <!-- !!! 6 - already used. one of mix effects -->
     <effect id="6" particle="graphics/particles/savepoint-32x32.xml"/> <!-- Savepoint particle effect on the save location. -->
-    <effect id="7" particle="graphics/particles/healing.xml"/> <!-- Healing particle effect. -->
+    <effect id="7" audio="magic/heal.ogg" particle="graphics/particles/healing.xml"/> <!-- Healing particle effect. -->
     <effect id="8" particle="graphics/particles/poison.xml"/> <!-- Poison particle effect. -->
     <effect id="9" particle="graphics/particles/invisibility.xml"/> <!-- Invisibility particle effect. -->
     <effect id="10" particle="graphics/particles/afk.xml"/> <!-- AFK particle effect. -->
diff --git a/sfx/magic/heal.ogg b/sfx/magic/heal.ogg
new file mode 100644
index 00000000..41e5772f
--- /dev/null
+++ b/sfx/magic/heal.ogg