Merge remote-tracking branch 'Ledmitz/JackO_sfx'

12 files changed, 22 insertions, 1 deletions

diff --git a/LICENSE b/LICENSE
index 95191d57..f59d9c17 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1521,7 +1521,7 @@ legal@themanaworld.org
 ### Flower
     sfx/monsters/flower/hit1.ogg (Cosmostrator)                             (CC BY-SA 3.0)        (Micksha)
     sfx/monsters/flower/hit2.ogg (Cosmostrator)                             (CC BY-SA 3.0)        (Micksha)
-    sfx/monsters/flower/miss1.ogg (Cosmostrator)                             (CC BY-SA 3.0)       (Micksha)
+    sfx/monsters/flower/miss1.ogg (Cosmostrator)                            (CC BY-SA 3.0)        (Micksha)
 ### Frostiana
     sfx/monsters/frostiana/hit1.ogg (Cosmostrator)                          (CC BY-SA 3.0)        (-)
 ### Ghost
@@ -1549,6 +1549,17 @@ legal@themanaworld.org
     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)        (-)
+### Jack-O
+    sfx/monsters/jacko/die1.ogg (Ledmitz)                                   (CC BY-SA 3.0)        (-)
+    sfx/monsters/jacko/hit1.ogg (Ledmitz)                                   (CC BY-SA 3.0)        (-)
+    sfx/monsters/jacko/hit2.ogg (Ledmitz)                                   (CC BY-SA 3.0)        (-)
+    sfx/monsters/jacko/hit3.ogg (Ledmitz)                                   (CC BY-SA 3.0)        (-)
+    sfx/monsters/jacko/hurt1.ogg (Ledmitz)                                  (CC BY-SA 3.0)        (-)
+    sfx/monsters/jacko/hurt2.ogg (Ledmitz)                                  (CC BY-SA 3.0)        (-)
+    sfx/monsters/jacko/hurt3.ogg (Ledmitz)                                  (CC BY-SA 3.0)        (-)
+    sfx/monsters/jacko/hurt4.ogg (Ledmitz)                                  (CC BY-SA 3.0)        (-)
+    sfx/monsters/jacko/miss1.ogg (Ledmitz)                                  (CC BY-SA 3.0)        (-)
+    sfx/monsters/jacko/move1.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 83ca3553..84b80a7e 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -545,6 +545,16 @@ event=""         Links the sfx to an action, like die, hit, hurt, miss, move or
     </monster>
     <monster id="1091" name="Jack-O" targetCursor="medium">
         <sprite>monsters/ghost-pumpkin.xml</sprite>
+        <sound event="die">monsters/jacko/die1.ogg</sound>
+        <sound event="hit">monsters/jacko/hit1.ogg</sound>
+        <sound event="hit">monsters/jacko/hit2.ogg</sound>
+        <sound event="hit">monsters/jacko/hit3.ogg</sound>
+        <sound event="hurt">monsters/jacko/hurt1.ogg</sound>
+        <sound event="hurt">monsters/jacko/hurt2.ogg</sound>
+        <sound event="hurt">monsters/jacko/hurt3.ogg</sound>
+        <sound event="hurt">monsters/jacko/hurt4.ogg</sound>
+        <sound event="miss">monsters/jacko/miss1.ogg</sound>
+        <sound event="move">monsters/jacko/move1.ogg</sound>
     </monster>
     <monster id="1092" name="Ice Goblin" targetCursor="small">
         <sprite>monsters/goblin-ice.xml</sprite>
diff --git a/sfx/monsters/jacko/die1.ogg b/sfx/monsters/jacko/die1.ogg
new file mode 100644
index 00000000..1cb33bfe
--- /dev/null
+++ b/sfx/monsters/jacko/die1.ogg
diff --git a/sfx/monsters/jacko/hit1.ogg b/sfx/monsters/jacko/hit1.ogg
new file mode 100644
index 00000000..ed51a257
--- /dev/null
+++ b/sfx/monsters/jacko/hit1.ogg
diff --git a/sfx/monsters/jacko/hit2.ogg b/sfx/monsters/jacko/hit2.ogg
new file mode 100644
index 00000000..99920700
--- /dev/null
+++ b/sfx/monsters/jacko/hit2.ogg
diff --git a/sfx/monsters/jacko/hit3.ogg b/sfx/monsters/jacko/hit3.ogg
new file mode 100644
index 00000000..0fad0636
--- /dev/null
+++ b/sfx/monsters/jacko/hit3.ogg
diff --git a/sfx/monsters/jacko/hurt1.ogg b/sfx/monsters/jacko/hurt1.ogg
new file mode 100644
index 00000000..4aa84ce0
--- /dev/null
+++ b/sfx/monsters/jacko/hurt1.ogg
diff --git a/sfx/monsters/jacko/hurt2.ogg b/sfx/monsters/jacko/hurt2.ogg
new file mode 100644
index 00000000..d44199fe
--- /dev/null
+++ b/sfx/monsters/jacko/hurt2.ogg
diff --git a/sfx/monsters/jacko/hurt3.ogg b/sfx/monsters/jacko/hurt3.ogg
new file mode 100644
index 00000000..7c907e68
--- /dev/null
+++ b/sfx/monsters/jacko/hurt3.ogg
diff --git a/sfx/monsters/jacko/hurt4.ogg b/sfx/monsters/jacko/hurt4.ogg
new file mode 100644
index 00000000..7b7e18c3
--- /dev/null
+++ b/sfx/monsters/jacko/hurt4.ogg
diff --git a/sfx/monsters/jacko/miss1.ogg b/sfx/monsters/jacko/miss1.ogg
new file mode 100644
index 00000000..466aece0
--- /dev/null
+++ b/sfx/monsters/jacko/miss1.ogg
diff --git a/sfx/monsters/jacko/move1.ogg b/sfx/monsters/jacko/move1.ogg
new file mode 100644
index 00000000..925d5ca2
--- /dev/null
+++ b/sfx/monsters/jacko/move1.ogg