summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-12-06 19:25:23 +0000
committerJesusaves <cpntb1@ymail.com>2020-12-06 19:25:23 +0000
commit5c4854df43c01ba0809525140d621b8ba3a216b1 (patch)
tree0dcf557767637a45db4f251688d1b95af591e6b8
parent72db43ae6c96fae370df089b984903b23e68dc8c (diff)
parentd908f17c1e9b61042550abe519dcc00e98d99651 (diff)
downloadclientdata-5c4854df43c01ba0809525140d621b8ba3a216b1.tar.gz
clientdata-5c4854df43c01ba0809525140d621b8ba3a216b1.tar.bz2
clientdata-5c4854df43c01ba0809525140d621b8ba3a216b1.tar.xz
clientdata-5c4854df43c01ba0809525140d621b8ba3a216b1.zip
Merge branch 'Ledmitz/clientdata-fireball-sfx' into 'master'
Ledmitz/clientdata fireball sfx See merge request evol/clientdata!195
-rw-r--r--LICENSE6
-rw-r--r--effects.xml2
-rw-r--r--sfx/env/fireball.ogg (renamed from sfx/magic/fireball.ogg)bin18942 -> 18942 bytes
3 files changed, 5 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index e2be6335..1d325ad2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1464,14 +1464,15 @@ legal@themanaworld.org
maps/jail.tmx (Kytty) (CC BY-SA 3.0) (Micksha)
# Sound Effects
+
## Items
### Rubber Bat
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) (-)
+
## Monsters
### Bat
sfx/monsters/bat/die1.ogg (Cosmostrator) (GPLv2) (-)
@@ -1642,6 +1643,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/magic/fireball.ogg b/sfx/env/fireball.ogg
index 3e7cc48e..3e7cc48e 100644
--- a/sfx/magic/fireball.ogg
+++ b/sfx/env/fireball.ogg
Binary files differ