summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-08-25 13:44:43 +0000
committerJesusaves <cpntb1@ymail.com>2020-08-25 13:44:43 +0000
commit86c1a16bf37db61053744fe5a83986441c2fbf7d (patch)
treef51dafd4bd7d0b39284ca03152da7d45613c6cbb
parentc6af3852ffb37bbda5645cec6fe8da82d42b0f5c (diff)
parent55cb4bdfe4150440115c7df31ae9a07b91138a8b (diff)
downloadclientdata-86c1a16bf37db61053744fe5a83986441c2fbf7d.tar.gz
clientdata-86c1a16bf37db61053744fe5a83986441c2fbf7d.tar.bz2
clientdata-86c1a16bf37db61053744fe5a83986441c2fbf7d.tar.xz
clientdata-86c1a16bf37db61053744fe5a83986441c2fbf7d.zip
Merge branch 'bee-sfx' into 'master'
Bee SFX; die, hit, miss, move See merge request evol/clientdata!160
-rw-r--r--LICENSE5
-rw-r--r--monsters.xml4
-rw-r--r--sfx/monsters/bee/die1.oggbin0 -> 20650 bytes
-rw-r--r--sfx/monsters/bee/hit1.oggbin0 -> 13571 bytes
-rw-r--r--sfx/monsters/bee/miss1.oggbin0 -> 9359 bytes
-rw-r--r--sfx/monsters/bee/move1.oggbin0 -> 18152 bytes
6 files changed, 9 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 4593c801..b346c419 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1144,6 +1144,11 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
### Rubber Bat
sfx/items/legacy/rubberbat.ogg (Cosmotrator) (GPL v2) (-)
## Monsters
+### Bee
+ sfx/monsters/bee/die1.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/monsters/bee/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/monsters/bee/miss1.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/monsters/bee/move1.ogg (Ledmitz) (CC BY-SA 3.0) (-)
### Blub
sfx/monsters/blub/die1.ogg (Cosmostrator) (CC BY-SA 3.0) (Alige, Socapex)
sfx/monsters/blub/hit1.ogg (Cosmostrator) (CC BY-SA 3.0) (Alige, Socapex)
diff --git a/monsters.xml b/monsters.xml
index f0cb8c14..28e24b19 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -196,6 +196,10 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or
</monster>
<monster id="1029" name="Bee" walkType="fly" targetCursor="small">
<sprite>monsters/bee.xml</sprite>
+ <sound event="die">monsters/bee/die1.ogg</sound>
+ <sound event="hit">monsters/bee/hit1.ogg</sound>
+ <sound event="miss">monsters/bee/miss1.ogg</sound>
+ <sound event="move">monsters/bee/move1.ogg</sound>
</monster>
<monster id="1030" name="Pinkie" walkType="walk" targetCursor="small">
<sprite>monsters/pinkie.xml</sprite>
diff --git a/sfx/monsters/bee/die1.ogg b/sfx/monsters/bee/die1.ogg
new file mode 100644
index 00000000..1b447d74
--- /dev/null
+++ b/sfx/monsters/bee/die1.ogg
Binary files differ
diff --git a/sfx/monsters/bee/hit1.ogg b/sfx/monsters/bee/hit1.ogg
new file mode 100644
index 00000000..3ad019db
--- /dev/null
+++ b/sfx/monsters/bee/hit1.ogg
Binary files differ
diff --git a/sfx/monsters/bee/miss1.ogg b/sfx/monsters/bee/miss1.ogg
new file mode 100644
index 00000000..c00741c3
--- /dev/null
+++ b/sfx/monsters/bee/miss1.ogg
Binary files differ
diff --git a/sfx/monsters/bee/move1.ogg b/sfx/monsters/bee/move1.ogg
new file mode 100644
index 00000000..4bda422f
--- /dev/null
+++ b/sfx/monsters/bee/move1.ogg
Binary files differ