Merge branch 'spawn_burst_fix' into 'master'

Moved spawn_burst.ogg to env and cnaged all references to it (as it once was originally, I think. *ahem*)

See merge request legacy/clientdata!503

7 files changed, 15 insertions, 15 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 -->
diff --git a/license.md b/license.md
index 51cf6599..ef76d32c 100644
--- a/license.md
+++ b/license.md
@@ -1158,6 +1158,7 @@ File | Artists | Licenses
 `sfx/env/env-waterfall1.ogg` | Dariuna | GPLv2
 `sfx/env/fart.ogg` | unknown | CC0
 `sfx/env/flame.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/env/spawn_burst.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/env/zap.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/astral.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/betsanc-on.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
@@ -1183,7 +1184,6 @@ File | Artists | Licenses
 `sfx/magic/itenplz-hit.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/kaflosh.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/nature.ogg` | Ledmitz (nord_analog_howling_wind_storm.wav / medialint / Sampling Plus 1.0) | GPLv2, CC BY-SA 3.0
-`sfx/magic/spawn_burst.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/transmute.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/war.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/warp.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
diff --git a/monsters/monster1119_Thug.xml b/monsters/monster1119_Thug.xml
index 9b3e8130..175e84a0 100644
--- a/monsters/monster1119_Thug.xml
+++ b/monsters/monster1119_Thug.xml
@@ -7,7 +7,7 @@
     <sprite>equipment/feet/boots.xml</sprite>
     <sprite>equipment/chest/tanktop.xml</sprite>
     <sprite>equipment/legs/pants.xml</sprite>
-    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="die">env/spawn_burst.ogg</sound>
     <sound event="hit">weapons/punch1.ogg</sound>
     <sound event="hit">weapons/punch2.ogg</sound>
     <sound event="hit">weapons/punch3.ogg</sound>
diff --git a/monsters/monster1121_Grenadier.xml b/monsters/monster1121_Grenadier.xml
index 7eec61e7..50e6872a 100644
--- a/monsters/monster1121_Grenadier.xml
+++ b/monsters/monster1121_Grenadier.xml
@@ -8,7 +8,7 @@
     <sprite>equipment/head/piratehat.xml</sprite>
     <sprite>equipment/hands/generic.xml</sprite>
     <sprite>equipment/feet/boots.xml|#212121,444444</sprite>
-    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="die">env/spawn_burst.ogg</sound>
     <sound event="hit">system/crit.ogg</sound>
     <sound event="miss">system/crit.ogg</sound>
     <attack id="1" critical-hit-effect-id="30" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/>
diff --git a/monsters/monster1122_TheDreadPirateMarley.xml b/monsters/monster1122_TheDreadPirateMarley.xml
index ddac0e84..83e66e32 100644
--- a/monsters/monster1122_TheDreadPirateMarley.xml
+++ b/monsters/monster1122_TheDreadPirateMarley.xml
@@ -8,7 +8,7 @@
     <sprite>equipment/head/eyepatch.xml</sprite>
     <sprite>equipment/feet/assassin-boots.xml</sprite>
     <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="die">env/spawn_burst.ogg</sound>
     <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
     <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
diff --git a/monsters/monster1123_TheDreadPirateMarley.xml b/monsters/monster1123_TheDreadPirateMarley.xml
index 939e88e0..a4135a8e 100644
--- a/monsters/monster1123_TheDreadPirateMarley.xml
+++ b/monsters/monster1123_TheDreadPirateMarley.xml
@@ -8,7 +8,7 @@
     <sprite>equipment/head/eyepatch.xml</sprite>
     <sprite>equipment/feet/assassin-boots.xml</sprite>
     <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="die">env/spawn_burst.ogg</sound>
     <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
     <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
diff --git a/sfx/magic/spawn_burst.ogg b/sfx/env/spawn_burst.ogg
index 677b7355..677b7355 100644
--- a/sfx/magic/spawn_burst.ogg
+++ b/sfx/env/spawn_burst.ogg