diff options
author | Ledmitz <smoothshifter@tuta.io> | 2023-03-21 22:06:25 -0300 |
---|---|---|
committer | Ledmitz <smoothshifter@tuta.io> | 2023-03-21 22:06:25 -0300 |
commit | 86b376f59c7a6d5c6f24f74f825dc8ab54c0494c (patch) | |
tree | 813be522038bbbaad10b6104de96657619a401b0 /effects.xml | |
parent | 968bdbae500eff84c63e3dd2548b89d416e10f09 (diff) | |
parent | bd24b8a8168dc6b2747fc2c2d98e50742ce375e2 (diff) | |
download | clientdata-86b376f59c7a6d5c6f24f74f825dc8ab54c0494c.tar.gz clientdata-86b376f59c7a6d5c6f24f74f825dc8ab54c0494c.tar.bz2 clientdata-86b376f59c7a6d5c6f24f74f825dc8ab54c0494c.tar.xz clientdata-86b376f59c7a6d5c6f24f74f825dc8ab54c0494c.zip |
Conflict resolution 1floyd_book
Diffstat (limited to 'effects.xml')
-rw-r--r-- | effects.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/effects.xml b/effects.xml index 5d558a45..4a095a57 100644 --- a/effects.xml +++ b/effects.xml @@ -65,13 +65,13 @@ <effect id="31" audio="system/crit.ogg" particle="graphics/particles/medium-explosion.xml"/> <effect id="32" particle="graphics/particles/medium-smoke.xml"/> <!-- Illia quest effects --> - <effect id="33" audio="magic/spawn_burst.ogg" particle="graphics/particles/medium-blindinglight.xml"/> + <effect id="33" audio="env/spawn_burst.ogg" particle="graphics/particles/medium-blindinglight.xml"/> <effect id="34" particle="graphics/particles/channelling-raise.particle.xml"/> <effect id="35" particle="graphics/particles/channelling-cast.particle.xml"/> <effect id="36" particle="graphics/particles/enchanted-door-broken.particle.xml"/> <effect id="37" particle="graphics/particles/dark-teleport.particle.xml"/> <effect id="38" audio="magic/astral.ogg" particle="graphics/particles/evil-summon.particle.xml"/> - <effect id="39" audio="magic/spawn_burst.ogg" particle="graphics/particles/ground-spawn.particle.xml"/> + <effect id="39" audio="env/spawn_burst.ogg" particle="graphics/particles/ground-spawn.particle.xml"/> <effect id="40" particle="graphics/particles/blue-magic-cast.particle.xml"/> <effect id="41" particle="graphics/particles/magic-blue-teleport.particle.xml"/> <effect id="42" particle="graphics/particles/magic-dark-explosion.particle.xml"/> @@ -127,7 +127,7 @@ <!-- (grow plant) cast --> <effect id="510" audio="magic/nature.ogg" particle="graphics/particles/magic.grow-plant.xml"/> <!-- (grow plant) spawn --> - <effect id="511" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="511" audio="env/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #lum (lesser heal) cast --> <effect id="512" audio="magic/inma.ogg" particle="graphics/particles/magic.white.xml"/> <!-- #lum (lesser heal) hit --> @@ -139,7 +139,7 @@ <!-- #kalmurk (summon maggot) cast --> <effect id="517" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalmurk (summon maggot) spawn --> - <effect id="518" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="518" audio="env/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #parum (transmute wood) cast --> <effect id="519" audio="magic/transmute.ogg" particle="graphics/particles/magic.red.xml"/> <!-- #frillyar (arrow hail) cast --> @@ -191,27 +191,27 @@ <!-- #kalakarenk (summon fluffy) cast --> <effect id="543" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalakarenk (summon fluffy) spawn --> - <effect id="544" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="544" audio="env/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #kalboo (summon mouboo) cast --> <effect id="545" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalboo (summon mouboo) spawn --> - <effect id="546" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="546" audio="env/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #kalgina (summon pinky) cast --> <effect id="547" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalgina (summon pinky) spawn --> - <effect id="548" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="548" audio="env/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #halhiss (summon snake) cast --> <effect id="549" audio="magic/astral.ogg" particle="graphics/particles/magic.dark-summon.xml"/> <!-- #halhiss (summon snake) spawn --> - <effect id="550" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="550" audio="env/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #kalrenk (summon spiky shroom) cast --> <effect id="551" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalrenk (summon spiky shroom) spawn --> - <effect id="552" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="552" audio="env/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #helorp (summon wicked shroom) cast --> <effect id="553" audio="magic/astral.ogg" particle="graphics/particles/magic.dark-summon.xml"/> <!-- #helorp (summon wicked shroom) spawn --> - <effect id="554" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="554" audio="env/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/> <!-- #phlex (toxic dart) cast --> <effect id="555" audio="magic/astral.ogg" particle="graphics/particles/magic.darkred.xml"/> <!-- Temporary --> |