From 1cb161d650c54db45e6e256a6beeb370a7eb3a01 Mon Sep 17 00:00:00 2001 From: Ledmitz <69915785+Ledmitz@users.noreply.github.com> Date: Tue, 26 Apr 2022 16:23:31 +0000 Subject: Added bee and snail sounds (#384) * Added bee and snail sounds * Added edits in license.md * Tried to resolve license conflict. Co-authored-by: Jesusaves --- license.md | 26 +++++++++++++++++--------- monsters/monster1041_Snail.xml | 5 ++++- monsters/monster1049_Bee.xml | 4 ++++ sfx/monsters/bee/bee-die1.ogg | Bin 0 -> 20650 bytes sfx/monsters/bee/bee-hit1.ogg | Bin 0 -> 13571 bytes sfx/monsters/bee/bee-miss1.ogg | Bin 0 -> 9359 bytes sfx/monsters/bee/bee-move1.ogg | Bin 0 -> 18152 bytes sfx/monsters/snail/snail-die1.ogg | Bin 0 -> 10556 bytes sfx/monsters/snail/snail-hit1.ogg | Bin 0 -> 13798 bytes sfx/monsters/snail/snail-hurt1.ogg | Bin 0 -> 7091 bytes sfx/monsters/snail/snail-hurt2.ogg | Bin 0 -> 7670 bytes 11 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 sfx/monsters/bee/bee-die1.ogg create mode 100644 sfx/monsters/bee/bee-hit1.ogg create mode 100644 sfx/monsters/bee/bee-miss1.ogg create mode 100644 sfx/monsters/bee/bee-move1.ogg create mode 100644 sfx/monsters/snail/snail-die1.ogg create mode 100644 sfx/monsters/snail/snail-hit1.ogg create mode 100644 sfx/monsters/snail/snail-hurt1.ogg create mode 100644 sfx/monsters/snail/snail-hurt2.ogg diff --git a/license.md b/license.md index dcbfcac3..d0e241c4 100644 --- a/license.md +++ b/license.md @@ -1157,6 +1157,10 @@ File | Artists | Licenses `sfx/magic/kaflosh.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/bat/bat-dying1.ogg` | Cosmostrator | GPLv2 `sfx/monsters/bat/bat-hit1.ogg` | Cosmostrator | GPLv2 +`sfx/monsters/bee/bee-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/bee/bee-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/bee/bee-miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/bee/bee-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/casket-monster/casket-monster.ogg` | Dariuna | GPLv2 `sfx/monsters/cavesnake/cavesnake-hit1.ogg` | Krazyjakee | GPLv2 `sfx/monsters/fallen-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 @@ -1225,15 +1229,19 @@ File | Artists | Licenses `sfx/monsters/skeleton_lady/ladyskel-hurt1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/skeleton_lady/ladyskel-miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/slime/slime-hit1.ogg` | Cosmostrator | GPLv2 -`sfx/monsters/spider/spider-die1.ogg | alpha, Ledmitz | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-hit1.ogg | alpha, Ledmitz | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-hit2.ogg | alpha, Ledmitz | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-hit3.ogg | alpha, Ledmitz | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-move1.ogg | alpha, Ledmitz | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-move2.ogg | alpha, Ledmitz | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-move3.ogg | alpha, Ledmitz | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-move4.ogg | alpha, Ledmitz | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-move5.ogg | alpha, Ledmitz | GPLv2, CC BY-SA 3.0` +`sfx/monsters/snail/snail-die1.ogg` | alpha [Ledmitz] | GPLv2 +`sfx/monsters/snail/snail-hit1.ogg` | alpha [Ledmitz] | GPLv2 +`sfx/monsters/snail/snail-hurt1.ogg` | alpha [Ledmitz] | GPLv2 +`sfx/monsters/snail/snail-hurt2.ogg` | alpha [Ledmitz] | GPLv2 +`sfx/monsters/spider/spider-die1.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` +`sfx/monsters/spider/spider-hit1.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` +`sfx/monsters/spider/spider-hit2.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` +`sfx/monsters/spider/spider-hit3.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` +`sfx/monsters/spider/spider-move1.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` +`sfx/monsters/spider/spider-move2.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` +`sfx/monsters/spider/spider-move3.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` +`sfx/monsters/spider/spider-move4.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` +`sfx/monsters/spider/spider-move5.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` `sfx/monsters/squirrel/squirrel-die1.ogg` | Krazyjakee | GPLv2 `sfx/monsters/squirrel/squirrel-die2.ogg` | Krazyjakee | GPLv2 `sfx/monsters/squirrel/squirrel-hurt1.ogg` | Krazyjakee | GPLv2 diff --git a/monsters/monster1041_Snail.xml b/monsters/monster1041_Snail.xml index 335b9c33..41571b2c 100644 --- a/monsters/monster1041_Snail.xml +++ b/monsters/monster1041_Snail.xml @@ -3,6 +3,9 @@ monsters/snail.xml|#FDC689;#E0A6E3;#E0A6E3;#F06EAA;#C69C6D;#A9FF02 graphics/particles/monster-snail-trail.particle.xml - monsters/slime/slime-hit1.ogg + monsters/snail/snail-hit1.ogg + monsters/snail/snail-hurt1.ogg + monsters/snail/snail-hurt1.ogg + monsters/snail/snail-die1.ogg diff --git a/monsters/monster1049_Bee.xml b/monsters/monster1049_Bee.xml index 90fff55b..2da9cd9c 100644 --- a/monsters/monster1049_Bee.xml +++ b/monsters/monster1049_Bee.xml @@ -3,5 +3,9 @@ monsters/bee.xml monsters/accessories/generic-shadow-small-circle.xml + monsters/bee/bee-die1.ogg + monsters/bee/bee-hit1.ogg + monsters/bee/bee-miss1.ogg + monsters/bee/bee-move1.ogg diff --git a/sfx/monsters/bee/bee-die1.ogg b/sfx/monsters/bee/bee-die1.ogg new file mode 100644 index 00000000..1b447d74 Binary files /dev/null and b/sfx/monsters/bee/bee-die1.ogg differ diff --git a/sfx/monsters/bee/bee-hit1.ogg b/sfx/monsters/bee/bee-hit1.ogg new file mode 100644 index 00000000..3ad019db Binary files /dev/null and b/sfx/monsters/bee/bee-hit1.ogg differ diff --git a/sfx/monsters/bee/bee-miss1.ogg b/sfx/monsters/bee/bee-miss1.ogg new file mode 100644 index 00000000..c00741c3 Binary files /dev/null and b/sfx/monsters/bee/bee-miss1.ogg differ diff --git a/sfx/monsters/bee/bee-move1.ogg b/sfx/monsters/bee/bee-move1.ogg new file mode 100644 index 00000000..4bda422f Binary files /dev/null and b/sfx/monsters/bee/bee-move1.ogg differ diff --git a/sfx/monsters/snail/snail-die1.ogg b/sfx/monsters/snail/snail-die1.ogg new file mode 100644 index 00000000..886b7a0c Binary files /dev/null and b/sfx/monsters/snail/snail-die1.ogg differ diff --git a/sfx/monsters/snail/snail-hit1.ogg b/sfx/monsters/snail/snail-hit1.ogg new file mode 100644 index 00000000..b31f6312 Binary files /dev/null and b/sfx/monsters/snail/snail-hit1.ogg differ diff --git a/sfx/monsters/snail/snail-hurt1.ogg b/sfx/monsters/snail/snail-hurt1.ogg new file mode 100644 index 00000000..ffb1452d Binary files /dev/null and b/sfx/monsters/snail/snail-hurt1.ogg differ diff --git a/sfx/monsters/snail/snail-hurt2.ogg b/sfx/monsters/snail/snail-hurt2.ogg new file mode 100644 index 00000000..1ced3141 Binary files /dev/null and b/sfx/monsters/snail/snail-hurt2.ogg differ -- cgit v1.2.3-60-g2f50