diff options
author | Led Mitz <smoothshifter@tuta.io> | 2023-04-29 06:20:34 +0000 |
---|---|---|
committer | Led Mitz <smoothshifter@tuta.io> | 2023-04-29 06:20:34 +0000 |
commit | 4901f5c5e7879b529f2bdba6455fd5317812efd3 (patch) | |
tree | ac8a5404c9034da044dcf5d26c6f0a19a4f9ca82 | |
parent | 33337aa8bb782289172da64872176d963f5b2aa1 (diff) | |
parent | 7b7464d49275e577f572c0df786c70fc90024d72 (diff) | |
download | clientdata-4901f5c5e7879b529f2bdba6455fd5317812efd3.tar.gz clientdata-4901f5c5e7879b529f2bdba6455fd5317812efd3.tar.bz2 clientdata-4901f5c5e7879b529f2bdba6455fd5317812efd3.tar.xz clientdata-4901f5c5e7879b529f2bdba6455fd5317812efd3.zip |
Merge branch 'zap_effect' into 'master'
readded zap effect as it was missing and causing errors right before Blanc's 2nd raid
See merge request legacy/clientdata!537
-rw-r--r-- | effects.xml | 1 | ||||
m--------- | music | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/effects.xml b/effects.xml index 4a095a57..1510bdde 100644 --- a/effects.xml +++ b/effects.xml @@ -54,6 +54,7 @@ <!-- <effect id="20" particle="graphics/particles/magic.barrier.xml"/> --> <effect id="21" particle="graphics/particles/pentagram-buildup-short.xml"/> <effect id="22" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="23" audio="env/zap.ogg" particle="graphics/particles/zap.xml"/> <effect id="24" audio="system/warp.ogg" particle="graphics/particles/magic.teleport.xml"/> <!-- #kaflosh (rain) hit --> <effect id="25" particle="graphics/particles/rain.xml" audio="magic/kaflosh.ogg"/> diff --git a/music b/music -Subproject f84c61e6ac18ff8a6e19d21265ff8818169cac6 +Subproject feb739ae5b4385829985b28e9e8dd2f4281d73e |