summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2022-10-14 18:35:04 -0300
committerJesusaves <cpntb1@ymail.com>2022-10-14 18:35:04 -0300
commitbb5eaf30fdbe7e6cb06b77633e419b54c55f4e8b (patch)
treed1aefa67b01a7984ea81c025ecb21736a01cbe96
parenta9a7403868b45ae03fee6c2d61c961ca1a97d09e (diff)
parent6a80af3704d5cbde47064e1e7ad5c9127f818bef (diff)
downloadclientdata-bb5eaf30fdbe7e6cb06b77633e419b54c55f4e8b.tar.gz
clientdata-bb5eaf30fdbe7e6cb06b77633e419b54c55f4e8b.tar.bz2
clientdata-bb5eaf30fdbe7e6cb06b77633e419b54c55f4e8b.tar.xz
clientdata-bb5eaf30fdbe7e6cb06b77633e419b54c55f4e8b.zip
Merge remote-tracking branch 'Ledmitz/Golem_sfx'
-rw-r--r--LICENSE4
-rw-r--r--monsters.xml9
-rw-r--r--sfx/monsters/golem/die1.oggbin0 -> 98007 bytes
-rw-r--r--sfx/monsters/golem/hit1.oggbin0 -> 10220 bytes
-rw-r--r--sfx/monsters/golem/miss1.oggbin0 -> 11480 bytes
5 files changed, 7 insertions, 6 deletions
diff --git a/LICENSE b/LICENSE
index c9aee96c..95191d57 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1545,6 +1545,10 @@ legal@themanaworld.org
sfx/monsters/loghead/hurt3.ogg (Cosmostrator) (GPLv2) (-)
sfx/monsters/loghead/hurt4.ogg (Cosmostrator) (GPLv2) (-)
sfx/monsters/loghead/hurt5.ogg (Cosmostrator) (GPLv2) (-)
+### Golem
+ sfx/monsters/golem/die1.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/monsters/golem/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/monsters/golem/miss1.ogg (Ledmitz) (CC BY-SA 3.0) (-)
### Piou
sfx/monsters/piou/die1.ogg (Ezili) (CC BY-SA 3.0) (Reid, Socapex)
sfx/monsters/piou/hit1.ogg (Ezili) (CC BY-SA 3.0) (Reid, Socapex)
diff --git a/monsters.xml b/monsters.xml
index 913ab138..83ca3553 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -687,12 +687,9 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or
</monster>
<monster id="1121" name="Golem" walkType="walk" targetCursor="large">
<sprite>monsters/golem.xml</sprite>
- <sound event="die">monsters/tortuga/die1.ogg</sound>
- <sound event="hit">monsters/tortuga/hit1.ogg</sound>
- <sound event="hit">monsters/tortuga/hit2.ogg</sound>
- <sound event="hurt">monsters/tortuga/hurt1.ogg</sound>
- <sound event="miss">monsters/tortuga/miss1.ogg</sound>
- <sound event="spawn">monsters/tortuga/spawn1.ogg</sound>
+ <sound event="die">monsters/golem/die1.ogg</sound>
+ <sound event="hit">monsters/golem/hit1.ogg</sound>
+ <sound event="miss">monsters/golem/miss1.ogg</sound>
</monster>
<monster id="1122" name="General Krukan">
<sprite>monsters/skeleton.xml</sprite>
diff --git a/sfx/monsters/golem/die1.ogg b/sfx/monsters/golem/die1.ogg
new file mode 100644
index 00000000..b9e5c1e5
--- /dev/null
+++ b/sfx/monsters/golem/die1.ogg
Binary files differ
diff --git a/sfx/monsters/golem/hit1.ogg b/sfx/monsters/golem/hit1.ogg
new file mode 100644
index 00000000..4e0fcc34
--- /dev/null
+++ b/sfx/monsters/golem/hit1.ogg
Binary files differ
diff --git a/sfx/monsters/golem/miss1.ogg b/sfx/monsters/golem/miss1.ogg
new file mode 100644
index 00000000..4c29a876
--- /dev/null
+++ b/sfx/monsters/golem/miss1.ogg
Binary files differ