Merge branch 'monsters' into 'master'

new mobs and fixes

See merge request legacy/clientdata!475

28 files changed, 229 insertions, 4 deletions

diff --git a/graphics/particles/monster-virus-foefire.particle.xml b/graphics/particles/monster-virus-foefire.particle.xml
index fdb76438..eede2af3 100644
--- a/graphics/particles/monster-virus-foefire.particle.xml
+++ b/graphics/particles/monster-virus-foefire.particle.xml
@@ -14,7 +14,7 @@ used for the foefire attack of the Virus.
       <property name="power" min="1" max="1.5"/>
       <property name="momentum" value="0.99"/>
       <property name="gravity" value="-0.02"/>
-      <animation imageset="graphics/particles/mist-face-b.particle.png|W:#00FF22" width="30" height="30">
+      <animation imageset="graphics/particles/mist-face-b.png|W:#00FF22" width="30" height="30">
         <frame index="0" delay="20"/>
         <frame index="1" delay="30"/>
         <frame index="2" delay="35"/>
diff --git a/graphics/particles/snow-burst.xml b/graphics/particles/snow-burst.xml
new file mode 100644
index 00000000..2932d6a9
--- /dev/null
+++ b/graphics/particles/snow-burst.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<!--
+    Snow Burst
+    a ball of snow that leaves a tail on its way
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="32" lifetime="128">
+    <emitter>
+      <property name="image" value="graphics/particles/snowflake-7x7.png"/>
+      <property name="lifetime" value="111"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="40"/>
+      <property name="output" min="3" max="4"/>
+      <property name="power" min="1" max="2"/>
+      <property name="horizontal-angle" min="-180" max="180"/>
+      <property name="gravity" value="0.05"/>
+      <property name="bounce" value="1"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="100"/>
+      <property name="vertical-angle" min="-180" max="180"/>
+    </emitter>
+<!--
+    it looks good with the 9x9 snowflakes but its very unrealistic when a snowflake is 1/4 size of the head
+-->
+<!--
+    <emitter>
+      <property name="image" value="graphics/particles/snowflake-9x9.png"/>
+      <property name="lifetime" value="111"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="40"/>
+      <property name="output" min="0" max="1"/>
+      <property name="power" min="2" max="3"/>
+      <property name="horizontal-angle" min="-180" max="180"/>
+      <property name="gravity" value="0.05"/>
+      <property name="bounce" value="1"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="200"/>
+      <property name="vertical-angle" min="-180" max="180"/>
+    </emitter>
+-->
+    <emitter>
+      <property name="image" value="graphics/particles/star-small.png"/>
+      <property name="lifetime" value="111"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="40"/>
+      <property name="output" min="3" max="4"/>
+      <property name="power" min="1" max="2"/>
+      <property name="horizontal-angle" min="-180" max="180"/>
+      <property name="gravity" value="0.01"/>
+      <property name="bounce" value="1"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="200"/>
+      <property name="vertical-angle" min="-180" max="180"/>
+    </emitter>
+    <emitter>
+      <property name="image" value="graphics/particles/snowflake-7x7.png"/>
+      <property name="lifetime" value="111"/>
+      <property name="alpha" value="1"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="40"/>
+      <property name="output" min="8" max="10"/>
+      <property name="power" min="1" max="1"/>
+      <property name="horizontal-angle" min="-180" max="180"/>
+      <property name="gravity" value="0.1"/>
+      <property name="bounce" value="1"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="100"/>
+      <property name="vertical-angle" min="-180" max="180"/>
+      <property name="follow-parent" value="1"/>
+    </emitter>
+    <emitter>
+      <property name="image" value="graphics/particles/snowflake-7x7.png"/>
+      <property name="lifetime" value="12"/>
+      <property name="alpha" value="1"/>
+      <property name="fade-in" value="4"/>
+      <property name="fade-out" value="4"/>
+      <property name="output" min="66" max="66"/>
+      <property name="power" min="2" max="2"/>
+      <property name="horizontal-angle" min="-180" max="180"/>
+      <property name="gravity" value="0.1"/>
+      <property name="bounce" value="1"/>
+      <property name="vertical-angle" min="-180" max="180"/>
+      <property name="follow-parent" value="1"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/snowflake-7x7.png b/graphics/particles/snowflake-7x7.png
new file mode 100644
index 00000000..221b4d08
--- /dev/null
+++ b/graphics/particles/snowflake-7x7.png
diff --git a/graphics/particles/snowflake-9x9.png b/graphics/particles/snowflake-9x9.png
new file mode 100644
index 00000000..2ac1c5e8
--- /dev/null
+++ b/graphics/particles/snowflake-9x9.png
diff --git a/graphics/sprites/monsters/golem-blackcrystal.png b/graphics/sprites/monsters/golem-blackcrystal.png
new file mode 100644
index 00000000..be28544e
--- /dev/null
+++ b/graphics/sprites/monsters/golem-blackcrystal.png
diff --git a/graphics/sprites/monsters/golem-blackcrystal.xml b/graphics/sprites/monsters/golem-blackcrystal.xml
new file mode 100644
index 00000000..941229a1
--- /dev/null
+++ b/graphics/sprites/monsters/golem-blackcrystal.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="mob" src="graphics/sprites/monsters/golem-blackcrystal.png" width="128" height="128" offsetY="3"/>
+  <include file="monsters/golem.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/golem-crystal.png b/graphics/sprites/monsters/golem-crystal.png
new file mode 100644
index 00000000..c564f850
--- /dev/null
+++ b/graphics/sprites/monsters/golem-crystal.png
diff --git a/graphics/sprites/monsters/golem-crystal.xml b/graphics/sprites/monsters/golem-crystal.xml
new file mode 100644
index 00000000..91eace79
--- /dev/null
+++ b/graphics/sprites/monsters/golem-crystal.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="mob" src="graphics/sprites/monsters/golem-crystal.png" width="128" height="128" offsetY="3"/>
+  <include file="monsters/golem.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/presente-surpresa.png b/graphics/sprites/monsters/presente-surpresa.png
new file mode 100644
index 00000000..2c6e6376
--- /dev/null
+++ b/graphics/sprites/monsters/presente-surpresa.png
diff --git a/graphics/sprites/monsters/presente-surpresa.xml b/graphics/sprites/monsters/presente-surpresa.xml
new file mode 100644
index 00000000..04dbbff0
--- /dev/null
+++ b/graphics/sprites/monsters/presente-surpresa.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<sprite>
+
+  <imageset name="base" src="graphics/sprites/monsters/presente-surpresa.png" width="60" height="61"/>
+
+  <action name="stand" imageset="base">
+    <animation>
+      <frame index="0" offsetX="-3" offsetY="10"/>
+    </animation>
+  </action>
+
+  <action name="dead" imageset="base">
+    <animation>
+      <frame index="1" delay="50" offsetX="-3" offsetY="10"/>
+      <frame index="2" delay="50" offsetX="-3" offsetY="10"/>
+      <frame index="3" delay="50" offsetX="-3" offsetY="10"/>
+      <frame index="4" delay="100" offsetX="-3" offsetY="10"/>
+      <frame index="5" delay="50" offsetX="-3" offsetY="10"/>
+      <frame index="6" delay="50" offsetX="-3" offsetY="10"/>
+      <frame index="7" delay="50" offsetX="-3" offsetY="10"/>
+      <frame index="8" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="9" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="10" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="11" delay="100" offsetX="-3" offsetY="10"/>
+      <frame index="12" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="13" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="14" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="15" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="16" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="17" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="18" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="19" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="15" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="14" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="13" delay="75" offsetX="-3" offsetY="10"/>
+      <frame index="12" offsetX="-3" offsetY="10"/>
+    </animation>
+  </action>
+
+</sprite>
diff --git a/graphics/sprites/monsters/snowman-boss.png b/graphics/sprites/monsters/snowman-boss.png
new file mode 100644
index 00000000..d521ab61
--- /dev/null
+++ b/graphics/sprites/monsters/snowman-boss.png
diff --git a/graphics/sprites/monsters/snowman-boss.xml b/graphics/sprites/monsters/snowman-boss.xml
new file mode 100644
index 00000000..9857638f
--- /dev/null
+++ b/graphics/sprites/monsters/snowman-boss.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="mob" src="graphics/sprites/monsters/snowman-boss.png" width="128" height="128" offsetY="0"/>
+  <include file="monsters/golem.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/snowman.png b/graphics/sprites/monsters/snowman.png
new file mode 100644
index 00000000..272eb49d
--- /dev/null
+++ b/graphics/sprites/monsters/snowman.png
diff --git a/graphics/sprites/monsters/snowman.xml b/graphics/sprites/monsters/snowman.xml
new file mode 100644
index 00000000..32de5e49
--- /dev/null
+++ b/graphics/sprites/monsters/snowman.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="mob" src="graphics/sprites/monsters/snowman.png" width="64" height="64" offsetY="0"/>
+  <include file="monsters/golem.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/spider-crystal.png b/graphics/sprites/monsters/spider-crystal.png
new file mode 100644
index 00000000..650f0538
--- /dev/null
+++ b/graphics/sprites/monsters/spider-crystal.png
diff --git a/graphics/sprites/monsters/spider-crystal.xml b/graphics/sprites/monsters/spider-crystal.xml
new file mode 100644
index 00000000..f9979732
--- /dev/null
+++ b/graphics/sprites/monsters/spider-crystal.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/monsters/spider-crystal.png" width="35" height="35"/>
+  <include file="monsters/spider.xml"/>
+</sprite>
diff --git a/monsters/_include.xml b/monsters/_include.xml
index bcca4647..f6395856 100644
--- a/monsters/_include.xml
+++ b/monsters/_include.xml
@@ -157,5 +157,11 @@
   <include name="monsters/monster1160_VoidShroom.xml"/>
   <include name="monsters/monster1161_Xakelbael.xml"/>
   <include name="monsters/monster1162_Grinchboo.xml"/>
+  <include name="monsters/monster1163_FridayCat.xml"/>
+  <include name="monsters/monster1166_Snowman.xml"/>
+  <include name="monsters/monster1167_SnowmanBoss.xml"/>
   <include name="monsters/monster1168_Floyd.xml"/>
+  <include name="monsters/monster1169_CrystalSpider.xml"/>
+  <include name="monsters/monster1170_CrystalGolem.xml"/>
+  <include name="monsters/monster1171_BlackCrystalGolem.xml"/>
 </monsters>
diff --git a/monsters/monster1162_Grinchboo.xml b/monsters/monster1162_Grinchboo.xml
index bdfe40df..d638888e 100644
--- a/monsters/monster1162_Grinchboo.xml
+++ b/monsters/monster1162_Grinchboo.xml
@@ -3,7 +3,4 @@
   <monster id="1162" name="Grinchboo">
     <sprite>monsters/grinchboo.xml</sprite>
   </monster>
-  <monster id="1163" name="Friday">
-    <sprite>monsters/pet-black-cat.xml</sprite>
-  </monster>
 </monsters>
diff --git a/monsters/monster1163_FridayCat.xml b/monsters/monster1163_FridayCat.xml
new file mode 100644
index 00000000..dadc08b1
--- /dev/null
+++ b/monsters/monster1163_FridayCat.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<monsters offset="0">
+  <monster id="1163" name="Friday">
+    <sprite>monsters/pet-black-cat.xml</sprite>
+  </monster>
+</monsters>
diff --git a/monsters/monster1164_CristmasTree.xml b/monsters/monster1164_CristmasTree.xml
new file mode 100644
index 00000000..a54a4994
--- /dev/null
+++ b/monsters/monster1164_CristmasTree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<monsters offset="0">
+  <monster id="1164" name="Christmas Tree">
+    <sprite>npcs/christmastree.xml</sprite>
+  </monster>
+</monsters>
diff --git a/monsters/monster1165_CristmasGift.xml b/monsters/monster1165_CristmasGift.xml
new file mode 100644
index 00000000..40d2aadd
--- /dev/null
+++ b/monsters/monster1165_CristmasGift.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<monsters offset="0">
+  <monster id="1165" name="Christmas Gift">
+    <sprite>monsters/presente-surpresa.xml</sprite>
+  </monster>
+</monsters>
diff --git a/monsters/monster1166_Snowman.xml b/monsters/monster1166_Snowman.xml
new file mode 100644
index 00000000..de7607cf
--- /dev/null
+++ b/monsters/monster1166_Snowman.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<monsters offset="0">
+  <monster id="1166" name="Snowman">
+    <sprite>monsters/snowman.xml</sprite>
+    <sound event="hit">weapons/projectiles/snowball/hit1.ogg</sound>
+    <sound event="miss">weapons/projectiles/snowball/miss1.ogg</sound>
+  </monster>
+</monsters>
diff --git a/monsters/monster1167_SnowmanBoss.xml b/monsters/monster1167_SnowmanBoss.xml
new file mode 100644
index 00000000..449999a5
--- /dev/null
+++ b/monsters/monster1167_SnowmanBoss.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<monsters offset="0">
+  <monster id="1167" name="Der Schneemann">
+    <sprite>monsters/snowman-boss.xml</sprite>
+    <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/snow-burst.xml" action="attack"/>
+    <sound event="hit">monsters/snowman_boss/hit1.ogg</sound>
+    <sound event="miss">monsters/snowman_boss/miss1.ogg</sound>
+  </monster>
+</monsters>
diff --git a/monsters/monster1169_CrystalSpider.xml b/monsters/monster1169_CrystalSpider.xml
new file mode 100644
index 00000000..29a12a00
--- /dev/null
+++ b/monsters/monster1169_CrystalSpider.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<monsters offset="0">
+  <monster id="1169" name="Crystal Spider">
+    <sprite>monsters/spider-crystal.xml</sprite>
+    <sound event="hit">monsters/spider/spider-hit1.ogg</sound>
+    <sound event="hit">monsters/spider/spider-hit2.ogg</sound>
+    <sound event="hit">monsters/spider/spider-hit3.ogg</sound>
+    <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound>
+    <sound event="move">monsters/spider/spider-move1.ogg</sound>
+    <sound event="move">monsters/spider/spider-move2.ogg</sound>
+    <sound event="move">monsters/spider/spider-move3.ogg</sound>
+    <sound event="move">monsters/spider/spider-move4.ogg</sound>
+    <sound event="move">monsters/spider/spider-move5.ogg</sound>
+    <sound event="die">monsters/spider/spider-die1.ogg</sound>
+  </monster>
+</monsters>
diff --git a/monsters/monster1170_CrystalGolem.xml b/monsters/monster1170_CrystalGolem.xml
new file mode 100644
index 00000000..7b8f5791
--- /dev/null
+++ b/monsters/monster1170_CrystalGolem.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<monsters offset="0">
+  <monster id="1170" name="Crystal Golem">
+    <sprite>monsters/golem-crystal.xml</sprite>
+    <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/>
+    <sound event="die">monsters/golem/die.ogg</sound>
+    <sound event="hit">monsters/golem/hit1.ogg</sound>
+    <sound event="miss">monsters/golem/miss1.ogg</sound>
+  </monster>
+</monsters>
diff --git a/monsters/monster1171_BlackCrystalGolem.xml b/monsters/monster1171_BlackCrystalGolem.xml
new file mode 100644
index 00000000..51598021
--- /dev/null
+++ b/monsters/monster1171_BlackCrystalGolem.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<monsters offset="0">
+  <monster id="1171" name="Black Crystal Golem">
+    <sprite>monsters/golem-blackcrystal.xml</sprite>
+    <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/>
+    <sound event="die">monsters/golem/die.ogg</sound>
+    <sound event="hit">monsters/golem/hit1.ogg</sound>
+    <sound event="miss">monsters/golem/miss1.ogg</sound>
+  </monster>
+</monsters>
diff --git a/sfx/monsters/snowman_boss/hit1.ogg b/sfx/monsters/snowman_boss/hit1.ogg
new file mode 100644
index 00000000..af55daf1
--- /dev/null
+++ b/sfx/monsters/snowman_boss/hit1.ogg
diff --git a/sfx/monsters/snowman_boss/miss1.ogg b/sfx/monsters/snowman_boss/miss1.ogg
new file mode 100644
index 00000000..bcc1ec1c
--- /dev/null
+++ b/sfx/monsters/snowman_boss/miss1.ogg