summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusalva Jesusalva <jesusalva@themanaworld.org>2023-02-09 15:19:43 +0000
committerJesusalva Jesusalva <jesusalva@themanaworld.org>2023-02-09 15:19:43 +0000
commit95e96c4f0a9ba24866a1e32cf0dbb8ad6dbb7b87 (patch)
tree6a22efc1827555672cd39273ab1fea1454c4acee
parent030d6e32bda6a7ce2abebb6eed5640b11ec3af0b (diff)
parent77d2a2ed610af41795b61c64e3fc6826ad7f5c22 (diff)
downloadclientdata-95e96c4f0a9ba24866a1e32cf0dbb8ad6dbb7b87.tar.gz
clientdata-95e96c4f0a9ba24866a1e32cf0dbb8ad6dbb7b87.tar.bz2
clientdata-95e96c4f0a9ba24866a1e32cf0dbb8ad6dbb7b87.tar.xz
clientdata-95e96c4f0a9ba24866a1e32cf0dbb8ad6dbb7b87.zip
Merge branch 'pollett_sfx' into 'master'
Pollett SFX were submitted by clort See merge request legacy/clientdata!495
-rw-r--r--license.md10
-rw-r--r--monsters/monster1113_Pollett.xml10
-rw-r--r--sfx/monsters/pollett/pollett-hit1.oggbin0 -> 5428 bytes
-rw-r--r--sfx/monsters/pollett/pollett-hit2.oggbin0 -> 5651 bytes
-rw-r--r--sfx/monsters/pollett/pollett-hit3.oggbin0 -> 5559 bytes
-rw-r--r--sfx/monsters/pollett/pollett-hit4.oggbin0 -> 5553 bytes
-rw-r--r--sfx/monsters/pollett/pollett-hurt1.oggbin0 -> 5944 bytes
-rw-r--r--sfx/monsters/pollett/pollett-hurt2.oggbin0 -> 5592 bytes
-rw-r--r--sfx/monsters/pollett/pollett-hurt3.oggbin0 -> 5628 bytes
-rw-r--r--sfx/monsters/pollett/pollett-hurt4.oggbin0 -> 5621 bytes
-rw-r--r--sfx/monsters/pollett/pollett-hurt5.oggbin0 -> 5597 bytes
-rw-r--r--sfx/monsters/pollett/pollett-hurt6.oggbin0 -> 5382 bytes
12 files changed, 20 insertions, 0 deletions
diff --git a/license.md b/license.md
index ac8d31f3..08cb5ed3 100644
--- a/license.md
+++ b/license.md
@@ -1236,6 +1236,16 @@ File | Artists | Licenses
`sfx/monsters/ghost/ghost-move3.ogg` | Ledmitz (ghostly-moans / Alivvie / CC by SA 3.0) | GPLv2, CC BY-SA 3.0
`sfx/monsters/pinkie/pinkie-hit1.ogg` | Cosmostrator | GPLv2
`sfx/monsters/pinkie/pinkie-miss1.ogg` | Cosmostrator | GPLv2
+`sfx/monsters/pollett/pollett-hit1.ogg` | clort | GPLv2, CC BY-SA 3.0
+`sfx/monsters/pollett/pollett-hit2.ogg` | clort | GPLv2, CC BY-SA 3.0
+`sfx/monsters/pollett/pollett-hit3.ogg` | clort | GPLv2, CC BY-SA 3.0
+`sfx/monsters/pollett/pollett-hit4.ogg` | clort | GPLv2, CC BY-SA 3.0
+`sfx/monsters/pollett/pollett-hurt1.ogg` | clort | GPLv2, CC BY-SA 3.0
+`sfx/monsters/pollett/pollett-hurt2.ogg` | clort | GPLv2, CC BY-SA 3.0
+`sfx/monsters/pollett/pollett-hurt3.ogg` | clort | GPLv2, CC BY-SA 3.0
+`sfx/monsters/pollett/pollett-hurt4.ogg` | clort | GPLv2, CC BY-SA 3.0
+`sfx/monsters/pollett/pollett-hurt5.ogg` | clort | GPLv2, CC BY-SA 3.0
+`sfx/monsters/pollett/pollett-hurt6.ogg` | clort | GPLv2, CC BY-SA 3.0
`sfx/monsters/pumpkin/pumpkin-explosion.ogg` | Ledmitz (firework_explosion_fizz.wav / soundscalpel.co / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/monsters/reaper/reaper-hurt.ogg` | nmaligec | GPLv2
`sfx/monsters/sasquatch/sasquatch-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
diff --git a/monsters/monster1113_Pollett.xml b/monsters/monster1113_Pollett.xml
index e366369d..55cfa9c1 100644
--- a/monsters/monster1113_Pollett.xml
+++ b/monsters/monster1113_Pollett.xml
@@ -2,5 +2,15 @@
<monsters offset="0">
<monster id="1113" name="Pollett">
<sprite>monsters/penguin.xml</sprite>
+ <sound event="hit">monsters/pollett/pollett-hit1.ogg</sound>
+ <sound event="hit">monsters/pollett/pollett-hit2.ogg</sound>
+ <sound event="hit">monsters/pollett/pollett-hit3.ogg</sound>
+ <sound event="hit">monsters/pollett/pollett-hit4.ogg</sound>
+ <sound event="hurt">monsters/pollett/pollett-hurt1.ogg</sound>
+ <sound event="hurt">monsters/pollett/pollett-hurt2.ogg</sound>
+ <sound event="hurt">monsters/pollett/pollett-hurt3.ogg</sound>
+ <sound event="hurt">monsters/pollett/pollett-hurt4.ogg</sound>
+ <sound event="hurt">monsters/pollett/pollett-hurt5.ogg</sound>
+ <sound event="hurt">monsters/pollett/pollett-hurt6.ogg</sound>
</monster>
</monsters>
diff --git a/sfx/monsters/pollett/pollett-hit1.ogg b/sfx/monsters/pollett/pollett-hit1.ogg
new file mode 100644
index 00000000..50a69289
--- /dev/null
+++ b/sfx/monsters/pollett/pollett-hit1.ogg
Binary files differ
diff --git a/sfx/monsters/pollett/pollett-hit2.ogg b/sfx/monsters/pollett/pollett-hit2.ogg
new file mode 100644
index 00000000..ce20d802
--- /dev/null
+++ b/sfx/monsters/pollett/pollett-hit2.ogg
Binary files differ
diff --git a/sfx/monsters/pollett/pollett-hit3.ogg b/sfx/monsters/pollett/pollett-hit3.ogg
new file mode 100644
index 00000000..db1d5b73
--- /dev/null
+++ b/sfx/monsters/pollett/pollett-hit3.ogg
Binary files differ
diff --git a/sfx/monsters/pollett/pollett-hit4.ogg b/sfx/monsters/pollett/pollett-hit4.ogg
new file mode 100644
index 00000000..21066d38
--- /dev/null
+++ b/sfx/monsters/pollett/pollett-hit4.ogg
Binary files differ
diff --git a/sfx/monsters/pollett/pollett-hurt1.ogg b/sfx/monsters/pollett/pollett-hurt1.ogg
new file mode 100644
index 00000000..c3f8754c
--- /dev/null
+++ b/sfx/monsters/pollett/pollett-hurt1.ogg
Binary files differ
diff --git a/sfx/monsters/pollett/pollett-hurt2.ogg b/sfx/monsters/pollett/pollett-hurt2.ogg
new file mode 100644
index 00000000..c137c4ea
--- /dev/null
+++ b/sfx/monsters/pollett/pollett-hurt2.ogg
Binary files differ
diff --git a/sfx/monsters/pollett/pollett-hurt3.ogg b/sfx/monsters/pollett/pollett-hurt3.ogg
new file mode 100644
index 00000000..8a23e767
--- /dev/null
+++ b/sfx/monsters/pollett/pollett-hurt3.ogg
Binary files differ
diff --git a/sfx/monsters/pollett/pollett-hurt4.ogg b/sfx/monsters/pollett/pollett-hurt4.ogg
new file mode 100644
index 00000000..25701629
--- /dev/null
+++ b/sfx/monsters/pollett/pollett-hurt4.ogg
Binary files differ
diff --git a/sfx/monsters/pollett/pollett-hurt5.ogg b/sfx/monsters/pollett/pollett-hurt5.ogg
new file mode 100644
index 00000000..90bcb03c
--- /dev/null
+++ b/sfx/monsters/pollett/pollett-hurt5.ogg
Binary files differ
diff --git a/sfx/monsters/pollett/pollett-hurt6.ogg b/sfx/monsters/pollett/pollett-hurt6.ogg
new file mode 100644
index 00000000..68c434af
--- /dev/null
+++ b/sfx/monsters/pollett/pollett-hurt6.ogg
Binary files differ