Merge branch 'easter'

Conflicts:
	items.xml

7 files changed, 95 insertions, 3 deletions

diff --git a/graphics/items/equipment/head/eggshell-hat.png b/graphics/items/equipment/head/eggshell-hat.png
index a23ef84d..882d9d3a 100644
--- a/graphics/items/equipment/head/eggshell-hat.png
+++ b/graphics/items/equipment/head/eggshell-hat.png
diff --git a/graphics/sprites/equipment/head/eggshell.png b/graphics/sprites/equipment/head/eggshell.png
index 1c66d53a..067c5994 100644
--- a/graphics/sprites/equipment/head/eggshell.png
+++ b/graphics/sprites/equipment/head/eggshell.png
diff --git a/graphics/sprites/equipment/head/eggshell.xml b/graphics/sprites/equipment/head/eggshell.xml
index 3685a4ff..b8c63a5c 100644
--- a/graphics/sprites/equipment/head/eggshell.xml
+++ b/graphics/sprites/equipment/head/eggshell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/eggshell.png" width="40" height="40"/>
+  <imageset name="base" src="graphics/sprites/equipment/head/eggshell.png|W" width="40" height="40"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-29"/>
diff --git a/graphics/sprites/npcs/npc-annualeaster.png b/graphics/sprites/npcs/npc-annualeaster.png
new file mode 100644
index 00000000..ec3e6fd4
--- /dev/null
+++ b/graphics/sprites/npcs/npc-annualeaster.png
diff --git a/graphics/sprites/npcs/npc-annualeaster.xml b/graphics/sprites/npcs/npc-annualeaster.xml
new file mode 100644
index 00000000..3f396423
--- /dev/null
+++ b/graphics/sprites/npcs/npc-annualeaster.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/npcs/npc-annualeaster.png" width="32" height="32"/>
+  <action name="stand" imageset="base">
+    <animation direction="default">
+      <frame index="0"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/items.xml b/items.xml
index 280f78c7..f57dc263 100644
--- a/items.xml
+++ b/items.xml
@@ -3431,6 +3431,84 @@
         <sprite gender="male">equipment/legs/shorts-male.xml|#95887F,E0D1C9</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#95887F,E0D1C9</sprite>
     </item>
+    <item id="882"
+        image="equipment/head/eggshell-hat.png|W:#BC5959,E33636,FFA0A0"
+        name="Red Eggshell Hat"
+        description="A novelty hat shaped like an eggshell half."
+        type="equip-head"
+        effect="M. Defense +3"
+        defense="9"
+        weight="15">
+        <sprite>equipment/head/eggshell.xml|#BC5959,E33636,FFA0A0</sprite>
+        <replace direction="upall" sprite="hair">
+            <item from="-5"/>
+        </replace>
+    </item>
+    <item id="883"
+        image="equipment/head/eggshell-hat.png|W:#7eabfe,6590C7,cccfe7"
+        name="Blue Eggshell Hat"
+        description="A novelty hat shaped like an eggshell half."
+        type="equip-head"
+        effect="M. Defense +3"
+        defense="9"
+        weight="15">
+        <sprite>equipment/head/eggshell.xml|#7eabfe,6590C7,cccfe7</sprite>
+        <replace direction="upall" sprite="hair">
+            <item from="-5"/>
+        </replace>
+    </item>
+    <item id="884"
+        image="equipment/head/eggshell-hat.png|W:#EFD806,D7C821,FFF476"
+        name="Yellow Eggshell Hat"
+        description="A novelty hat shaped like an eggshell half."
+        type="equip-head"
+        effect="M. Defense +3"
+        defense="9"
+        weight="15">
+        <sprite>equipment/head/eggshell.xml|#EFD806,D7C821,FFF476</sprite>
+        <replace direction="upall" sprite="hair">
+            <item from="-5"/>
+        </replace>
+    </item>
+    <item id="885"
+        image="equipment/head/eggshell-hat.png|W:#2A9409,70BA59,ACF696"
+        name="Green Eggshell Hat"
+        description="A novelty hat shaped like an eggshell half."
+        type="equip-head"
+        effect="M. Defense +3"
+        defense="9"
+        weight="15">
+        <sprite>equipment/head/eggshell.xml|#2A9409,70BA59,ACF696</sprite>
+        <replace direction="upall" sprite="hair">
+            <item from="-5"/>
+        </replace>
+    </item>
+    <item id="886"
+        image="equipment/head/eggshell-hat.png|W:#9B5D00,E17828,F7B37E"
+        name="Orange Eggshell Hat"
+        description="A novelty hat shaped like an eggshell half."
+        type="equip-head"
+        effect="M. Defense +3"
+        defense="9"
+        weight="15">
+        <sprite>equipment/head/eggshell.xml|#9B5D00,E17828,F7B37E</sprite>
+        <replace direction="upall" sprite="hair">
+            <item from="-5"/>
+        </replace>
+    </item>
+    <item id="887"
+        image="equipment/head/eggshell-hat.png|W:#482D07,574123,877863"
+        name="Dark Eggshell Hat"
+        description="A novelty hat shaped like an eggshell half."
+        type="equip-head"
+        effect="M. Defense +3"
+        defense="9"
+        weight="15">
+        <sprite>equipment/head/eggshell.xml|#482D07,574123,877863</sprite>
+        <replace direction="upall" sprite="hair">
+            <item from="-5"/>
+        </replace>
+    </item>
     <item id="888"
         image="equipment/head/magicgmtophat.png"
         name="Magic GM Top Hat"
@@ -3466,6 +3544,7 @@
         weight="20">
         <sprite>equipment/head/beaniecopter.xml</sprite>
     </item>
+
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
     <item id="1198"
@@ -3928,14 +4007,14 @@
         <sprite>equipment/head/rabbit-ears.xml|#ffffff</sprite>
     </item>
     <item id="1256"
-        image="equipment/head/eggshell-hat.png"
+        image="equipment/head/eggshell-hat.png|W:#727272,A0A9AC,DBECF2"
         name="Eggshell Hat"
         description="A novelty hat shaped like an eggshell half."
         type="equip-head"
         defense="12"
         agi="-1"
         weight="15">
-        <sprite>equipment/head/eggshell.xml</sprite>
+        <sprite>equipment/head/eggshell.xml|#727272,A0A9AC,DBECF2</sprite>
         <replace direction="upall" sprite="hair">
             <item from="-5"/>
         </replace>
diff --git a/npcs.xml b/npcs.xml
index 71cd59b5..e6be10f8 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -926,6 +926,10 @@
   <npc id="374">
     <particlefx>graphics/particles/demonfire.particle.xml</particlefx>
   </npc>
+  <npc id="375">
+    <sprite variant="0">npcs/npc-annualeaster.xml</sprite>
+  </npc>
+
   <!-- Put new unique sprites above here.  For huge npcs, see range 216-250. For poses/outfits npcs, see 251-299 -->
   <!-- note: don't go above 999, because the 1000's are reserved for mob id -->
 </npcs>