From 770889fb1c7e7811139a0a6336302f05c7890a7b Mon Sep 17 00:00:00 2001 From: Led Mitz Date: Wed, 22 Feb 2023 14:37:56 +0000 Subject: Moved spawn_burst.ogg to env and cnaged all references to it (as it once was originally, I think. *ahem*) --- effects.xml | 20 ++++++++++---------- license.md | 2 +- monsters/monster1119_Thug.xml | 2 +- monsters/monster1121_Grenadier.xml | 2 +- monsters/monster1122_TheDreadPirateMarley.xml | 2 +- monsters/monster1123_TheDreadPirateMarley.xml | 2 +- sfx/env/spawn_burst.ogg | Bin 0 -> 46465 bytes sfx/magic/spawn_burst.ogg | Bin 46465 -> 0 bytes 8 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 sfx/env/spawn_burst.ogg delete mode 100644 sfx/magic/spawn_burst.ogg diff --git a/effects.xml b/effects.xml index 5d558a45..4a095a57 100644 --- a/effects.xml +++ b/effects.xml @@ -65,13 +65,13 @@ - + - + @@ -127,7 +127,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -191,27 +191,27 @@ - + - + - + - + - + - + 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 @@ equipment/feet/boots.xml equipment/chest/tanktop.xml equipment/legs/pants.xml - system/spawn_burst.ogg + env/spawn_burst.ogg weapons/punch1.ogg weapons/punch2.ogg weapons/punch3.ogg 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 @@ equipment/head/piratehat.xml equipment/hands/generic.xml equipment/feet/boots.xml|#212121,444444 - system/spawn_burst.ogg + env/spawn_burst.ogg system/crit.ogg system/crit.ogg 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 @@ equipment/head/eyepatch.xml equipment/feet/assassin-boots.xml equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d - system/spawn_burst.ogg + env/spawn_burst.ogg weapons/bows/forest/forest-hit1.ogg weapons/bows/forest/forest-miss1.ogg 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 @@ equipment/head/eyepatch.xml equipment/feet/assassin-boots.xml equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d - system/spawn_burst.ogg + env/spawn_burst.ogg weapons/bows/forest/forest-hit1.ogg weapons/bows/forest/forest-miss1.ogg diff --git a/sfx/env/spawn_burst.ogg b/sfx/env/spawn_burst.ogg new file mode 100644 index 00000000..677b7355 Binary files /dev/null and b/sfx/env/spawn_burst.ogg differ diff --git a/sfx/magic/spawn_burst.ogg b/sfx/magic/spawn_burst.ogg deleted file mode 100644 index 677b7355..00000000 Binary files a/sfx/magic/spawn_burst.ogg and /dev/null differ -- cgit v1.2.3-60-g2f50