Resynchronize with TMWA

16 files changed, 257 insertions, 0 deletions

diff --git a/graphics/items/equipment/head/leprechaunhat.png b/graphics/items/equipment/head/leprechaunhat.png
new file mode 100644
index 00000000..0e22eaee
--- /dev/null
+++ b/graphics/items/equipment/head/leprechaunhat.png
diff --git a/graphics/sprites/equipment/head/leprechaunhat.png b/graphics/sprites/equipment/head/leprechaunhat.png
new file mode 100644
index 00000000..13ae63a8
--- /dev/null
+++ b/graphics/sprites/equipment/head/leprechaunhat.png
diff --git a/graphics/sprites/equipment/head/leprechaunhat.xml b/graphics/sprites/equipment/head/leprechaunhat.xml
new file mode 100644
index 00000000..916e2dc2
--- /dev/null
+++ b/graphics/sprites/equipment/head/leprechaunhat.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/leprechaunhat.png" width="32" height="64" offsetY="1"/>
+  <include file="equipment/head/headmodel.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/head/party-blue.png b/graphics/sprites/equipment/head/party-blue.png
new file mode 100644
index 00000000..68d192b0
--- /dev/null
+++ b/graphics/sprites/equipment/head/party-blue.png
diff --git a/graphics/sprites/equipment/head/party-blue.xml b/graphics/sprites/equipment/head/party-blue.xml
new file mode 100644
index 00000000..0da804c1
--- /dev/null
+++ b/graphics/sprites/equipment/head/party-blue.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/party-blue.png" width="32" height="64" offsetY="1"/>
+  <include file="equipment/head/headmodel.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/head/party-green.png b/graphics/sprites/equipment/head/party-green.png
new file mode 100644
index 00000000..21307b51
--- /dev/null
+++ b/graphics/sprites/equipment/head/party-green.png
diff --git a/graphics/sprites/equipment/head/party-green.xml b/graphics/sprites/equipment/head/party-green.xml
new file mode 100644
index 00000000..f2e4106a
--- /dev/null
+++ b/graphics/sprites/equipment/head/party-green.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/party-green.png" width="32" height="64" offsetY="1"/>
+  <include file="equipment/head/headmodel.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/head/party-red.png b/graphics/sprites/equipment/head/party-red.png
new file mode 100644
index 00000000..874a10fa
--- /dev/null
+++ b/graphics/sprites/equipment/head/party-red.png
diff --git a/graphics/sprites/equipment/head/party-red.xml b/graphics/sprites/equipment/head/party-red.xml
new file mode 100644
index 00000000..e29890bb
--- /dev/null
+++ b/graphics/sprites/equipment/head/party-red.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/party-red.png" width="32" height="64" offsetY="1"/>
+  <include file="equipment/head/headmodel.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/floyd.png b/graphics/sprites/monsters/floyd.png
new file mode 100644
index 00000000..9e8b787c
--- /dev/null
+++ b/graphics/sprites/monsters/floyd.png
diff --git a/graphics/sprites/monsters/floyd.xml b/graphics/sprites/monsters/floyd.xml
new file mode 100644
index 00000000..1ff6bd1d
--- /dev/null
+++ b/graphics/sprites/monsters/floyd.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Authors: Hocus
+Copyright (C) 2004-2022 The Mana World -->
+<sprite>
+    <imageset name="mob"
+              src="graphics/sprites/monsters/floyd.png"
+              width="64"
+              height="64"
+              offsetY="3"/>
+
+    <action name="spawn" imageset="mob">
+
+        <animation direction="default">
+            <frame index="8" delay="100"/>
+            <frame index="9" delay="100"/>
+            <frame index="10" delay="100"/>
+            <frame index="11" delay="100"/>
+            <frame index="12" delay="100"/>
+            <end />
+
+        </animation>
+    </action>
+    
+    <action name="stand" imageset="mob">
+        <animation direction="down">
+            <frame index="0"/>
+        </animation>
+
+        <animation direction="downright">
+            <frame index="7"/>
+        </animation>
+
+        <animation direction="right">
+            <frame index="6"/>
+        </animation>
+
+        <animation direction="upright">
+            <frame index="5"/>
+        </animation>
+
+        <animation direction="up">
+            <frame index="4"/>
+        </animation>
+
+        <animation direction="upleft">
+            <frame index="3"/>
+        </animation>
+
+        <animation direction="left">
+            <frame index="2"/>
+        </animation>
+
+        <animation direction="downleft">
+            <frame index="1"/>
+        </animation>
+    </action>
+
+    <action name="walk" imageset="mob">
+        <animation direction="down">
+            <sequence start="72" end="79" delay="120"/>
+        </animation>
+
+        <animation direction="downright">
+            <sequence start="128" end="135" delay="120"/>
+        </animation>
+
+        <animation direction="right">
+            <sequence start="120" end="127" delay="120"/>
+        </animation>
+
+        <animation direction="upright">
+            <sequence start="112" end="119" delay="120"/>
+        </animation>
+
+        <animation direction="up">
+            <sequence start="104" end="111" delay="120"/>
+        </animation>
+
+        <animation direction="upleft">
+            <sequence start="96" end="103" delay="120"/>
+        </animation>
+
+        <animation direction="left">
+            <sequence start="88" end="95" delay="120"/>
+        </animation>
+
+        <animation direction="downleft">
+            <sequence start="80" end="87" delay="120"/>
+        </animation>
+    </action>
+
+    <action name="attack" imageset="mob">
+        <animation direction="down">
+            <sequence start="136" end="138" delay="80"/>
+            <end />
+        </animation>
+
+        <animation direction="downright">
+            <sequence start="192" end="194" delay="80"/>
+            <end />
+        </animation>
+
+        <animation direction="right">
+            <sequence start="184" end="186" delay="80"/>
+            <end />
+        </animation>
+
+        <animation direction="upright">
+            <sequence start="176" end="178" delay="80"/>
+            <end />
+        </animation>
+
+        <animation direction="up">
+            <sequence start="168" end="170" delay="80"/>
+            <end />
+        </animation>
+
+        <animation direction="upleft">
+            <sequence start="160" end="162" delay="80"/>
+            <end />
+        </animation>
+
+        <animation direction="left">
+            <sequence start="152" end="154" delay="80"/>
+            <end />
+        </animation>
+
+        <animation direction="downleft">
+            <sequence start="144" end="146" delay="80"/>
+            <end />
+        </animation>
+    </action>
+    
+    <action name="dead" imageset="mob">
+
+        <animation direction="down">
+            <sequence start="200" end="207" delay="100"/>
+            <frame index="195" />
+            <end />
+        </animation>
+
+        <animation direction="downright">
+            <sequence start="256" end="263" delay="100"/>
+            <frame index="195" />
+            <end />
+        </animation>
+
+        <animation direction="right">
+            <sequence start="248" end="255" delay="100"/>
+            <frame index="195" />
+            <end />
+        </animation>
+
+        <animation direction="upright">
+            <sequence start="240" end="247" delay="100"/>
+            <frame index="195" />
+            <end />
+        </animation>
+
+        <animation direction="up">
+            <sequence start="232" end="239" delay="100"/>
+            <frame index="195" />
+            <end />
+        </animation>
+
+        <animation direction="upleft">
+            <sequence start="224" end="231" delay="100"/>
+            <frame index="195" />
+            <end />
+        </animation>
+
+        <animation direction="left">
+            <sequence start="216" end="223" delay="100"/>
+            <frame index="195" />
+            <end />
+        </animation>
+
+        <animation direction="downleft">
+            <sequence start="208" end="215" delay="100"/>
+            <frame index="195" />
+            <end />
+        </animation>
+
+    </action>
+
+</sprite>
diff --git a/graphics/sprites/npcs/elli.png b/graphics/sprites/npcs/elli.png
new file mode 100644
index 00000000..e876878c
--- /dev/null
+++ b/graphics/sprites/npcs/elli.png
diff --git a/graphics/sprites/npcs/elli.xml b/graphics/sprites/npcs/elli.xml
new file mode 100644
index 00000000..017739a7
--- /dev/null
+++ b/graphics/sprites/npcs/elli.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite variants="1" variant_offset="1">
+  <imageset name="base" src="graphics/sprites/npcs/elli.png" width="32" height="64"/>
+  <action name="stand" imageset="base">
+    <animation direction="default">
+      <frame index="0"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/items/equip-head.xml b/items/equip-head.xml
index 025618ff..335632ba 100644
--- a/items/equip-head.xml
+++ b/items/equip-head.xml
@@ -3108,4 +3108,40 @@
     <sprite gender="unisex">equipment/head/assassin-mask.xml</sprite>
     <replace sprite="hair" />
   </item>
+  <item id="5280"
+        image="equipment/head/leprechaunhat.png"
+        name="Leprechaun Hat"
+        description="Have you found the gold pot yet?"
+        type="equip-head"
+        defense="5"
+        weight="20">
+    <sprite gender="unisex">equipment/head/leprechaunhat.xml</sprite>
+  </item>
+  <item id="5281"
+        image="equipment/head/party-red.png"
+        name="Party Hat (Red)"
+        description="You were invited to the celebration!"
+        type="equip-head"
+        defense="5"
+        weight="20">
+    <sprite gender="unisex">equipment/head/party-red.xml</sprite>
+  </item>
+  <item id="5282"
+        image="equipment/head/party-green.png"
+        name="Party Hat (Green)"
+        description="You were invited to the celebration!"
+        type="equip-head"
+        defense="5"
+        weight="20">
+    <sprite gender="unisex">equipment/head/party-green.xml</sprite>
+  </item>
+  <item id="5283"
+        image="equipment/head/party-blue.png"
+        name="Party Hat (Blue)"
+        description="You were invited to the celebration!"
+        type="equip-head"
+        defense="5"
+        weight="20">
+    <sprite gender="unisex">equipment/head/party-blue.xml</sprite>
+  </item>
 </items>
diff --git a/monsters.xml b/monsters.xml
index 45e6702b..d380f637 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1039,4 +1039,7 @@
     <sound event="hit">monsters/snowman_boss/hit1.ogg</sound>
     <sound event="miss">monsters/snowman_boss/miss1.ogg</sound>
   </monster>
+  <monster id="1168" name="Floyd">
+    <sprite>monsters/floyd.xml</sprite>
+  </monster>
 </monsters>
diff --git a/npcs.xml b/npcs.xml
index b9ef84f0..76bf3c51 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -1431,4 +1431,7 @@
     <sprite variant="0">monsters/skeleton.xml</sprite>
     <sprite>equipment/head/blinkingevil-halloween.xml</sprite>
   </npc>
+  <npc id="441">
+    <sprite>npcs/elli.xml</sprite>
+  </npc>
 </npcs>