summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLedmitz <69915785+Ledmitz@users.noreply.github.com>2022-04-26 16:23:31 +0000
committerGitHub <noreply@github.com>2022-04-26 13:23:31 -0300
commit1cb161d650c54db45e6e256a6beeb370a7eb3a01 (patch)
treed6545c1aaea8dce0d4e15c7decbc7509858f99fc
parentb400aca0f75eaa75fefe11905690b76f2c042e4f (diff)
downloadclientdata-1cb161d650c54db45e6e256a6beeb370a7eb3a01.tar.gz
clientdata-1cb161d650c54db45e6e256a6beeb370a7eb3a01.tar.bz2
clientdata-1cb161d650c54db45e6e256a6beeb370a7eb3a01.tar.xz
clientdata-1cb161d650c54db45e6e256a6beeb370a7eb3a01.zip
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 <cpntb1@ymail.com>
-rw-r--r--license.md26
-rw-r--r--monsters/monster1041_Snail.xml5
-rw-r--r--monsters/monster1049_Bee.xml4
-rw-r--r--sfx/monsters/bee/bee-die1.oggbin0 -> 20650 bytes
-rw-r--r--sfx/monsters/bee/bee-hit1.oggbin0 -> 13571 bytes
-rw-r--r--sfx/monsters/bee/bee-miss1.oggbin0 -> 9359 bytes
-rw-r--r--sfx/monsters/bee/bee-move1.oggbin0 -> 18152 bytes
-rw-r--r--sfx/monsters/snail/snail-die1.oggbin0 -> 10556 bytes
-rw-r--r--sfx/monsters/snail/snail-hit1.oggbin0 -> 13798 bytes
-rw-r--r--sfx/monsters/snail/snail-hurt1.oggbin0 -> 7091 bytes
-rw-r--r--sfx/monsters/snail/snail-hurt2.oggbin0 -> 7670 bytes
11 files changed, 25 insertions, 10 deletions
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 @@
<monster id="1041" name="Snail">
<sprite>monsters/snail.xml|#FDC689;#E0A6E3;#E0A6E3;#F06EAA;#C69C6D;#A9FF02</sprite>
<particlefx>graphics/particles/monster-snail-trail.particle.xml</particlefx>
- <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+ <sound event="hit">monsters/snail/snail-hit1.ogg</sound>
+ <sound event="hurt">monsters/snail/snail-hurt1.ogg</sound>
+ <sound event="hurt">monsters/snail/snail-hurt1.ogg</sound>
+ <sound event="die">monsters/snail/snail-die1.ogg</sound>
</monster>
</monsters>
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 @@
<monster id="1049" name="Bee" targetCursor="small">
<sprite>monsters/bee.xml</sprite>
<sprite>monsters/accessories/generic-shadow-small-circle.xml</sprite>
+ <sound event="die">monsters/bee/bee-die1.ogg</sound>
+ <sound event="hit">monsters/bee/bee-hit1.ogg</sound>
+ <sound event="miss">monsters/bee/bee-miss1.ogg</sound>
+ <sound event="move">monsters/bee/bee-move1.ogg</sound>
</monster>
</monsters>
diff --git a/sfx/monsters/bee/bee-die1.ogg b/sfx/monsters/bee/bee-die1.ogg
new file mode 100644
index 00000000..1b447d74
--- /dev/null
+++ b/sfx/monsters/bee/bee-die1.ogg
Binary files differ
diff --git a/sfx/monsters/bee/bee-hit1.ogg b/sfx/monsters/bee/bee-hit1.ogg
new file mode 100644
index 00000000..3ad019db
--- /dev/null
+++ b/sfx/monsters/bee/bee-hit1.ogg
Binary files differ
diff --git a/sfx/monsters/bee/bee-miss1.ogg b/sfx/monsters/bee/bee-miss1.ogg
new file mode 100644
index 00000000..c00741c3
--- /dev/null
+++ b/sfx/monsters/bee/bee-miss1.ogg
Binary files differ
diff --git a/sfx/monsters/bee/bee-move1.ogg b/sfx/monsters/bee/bee-move1.ogg
new file mode 100644
index 00000000..4bda422f
--- /dev/null
+++ b/sfx/monsters/bee/bee-move1.ogg
Binary files differ
diff --git a/sfx/monsters/snail/snail-die1.ogg b/sfx/monsters/snail/snail-die1.ogg
new file mode 100644
index 00000000..886b7a0c
--- /dev/null
+++ b/sfx/monsters/snail/snail-die1.ogg
Binary files differ
diff --git a/sfx/monsters/snail/snail-hit1.ogg b/sfx/monsters/snail/snail-hit1.ogg
new file mode 100644
index 00000000..b31f6312
--- /dev/null
+++ b/sfx/monsters/snail/snail-hit1.ogg
Binary files differ
diff --git a/sfx/monsters/snail/snail-hurt1.ogg b/sfx/monsters/snail/snail-hurt1.ogg
new file mode 100644
index 00000000..ffb1452d
--- /dev/null
+++ b/sfx/monsters/snail/snail-hurt1.ogg
Binary files differ
diff --git a/sfx/monsters/snail/snail-hurt2.ogg b/sfx/monsters/snail/snail-hurt2.ogg
new file mode 100644
index 00000000..1ced3141
--- /dev/null
+++ b/sfx/monsters/snail/snail-hurt2.ogg
Binary files differ