Add desert hat, cotton headband, fix cat ears

8 files changed, 370 insertions, 5 deletions

diff --git a/graphics/items/armor-head-deserthat.png b/graphics/items/armor-head-deserthat.png
new file mode 100644
index 00000000..13270645
--- /dev/null
+++ b/graphics/items/armor-head-deserthat.png
diff --git a/graphics/items/armor-head-standardheadband.png b/graphics/items/armor-head-standardheadband.png
index 3e501bfe..1b28e473 100644
--- a/graphics/items/armor-head-standardheadband.png
+++ b/graphics/items/armor-head-standardheadband.png
diff --git a/graphics/sprites/head-catears.xml b/graphics/sprites/head-catears.xml
index 974f9283..525f9394 100644
--- a/graphics/sprites/head-catears.xml
+++ b/graphics/sprites/head-catears.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>

 <sprite>

-	<imageset name="base" src="graphics/sprites/head-rabbitears.png|M" width="24" height="24" />

+	<imageset name="base" src="graphics/sprites/head-catears.png|M" width="24" height="24" />

 

 	<action name="stand" imageset="base">

 		<animation direction="down">

diff --git a/graphics/sprites/head-deserthat.png b/graphics/sprites/head-deserthat.png
new file mode 100644
index 00000000..8c61e886
--- /dev/null
+++ b/graphics/sprites/head-deserthat.png
diff --git a/graphics/sprites/head-deserthat.xml b/graphics/sprites/head-deserthat.xml
new file mode 100644
index 00000000..6c7a94a6
--- /dev/null
+++ b/graphics/sprites/head-deserthat.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<sprite>
+   <imageset name="base" src="graphics/sprites/head-deserthat.png|R;W" width="32" height="35" />
+
+   <action name="stand" imageset="base">
+      <animation direction="down">
+        <frame index="0" offsetX="-1" offsetY ="-32" />
+      </animation>
+      <animation direction="left">
+        <frame index="7" offsetX="-1" offsetY ="-32"/>
+      </animation>
+      <animation direction="up">
+        <frame index="15" offsetX="-2" offsetY ="-32"/>
+      </animation>
+      <animation direction="right">
+        <frame index="22" offsetX="0" offsetY ="-32"/>
+      </animation>
+   </action>
+
+   <action name="walk" imageset="base">
+      <animation direction="down">
+        <frame index="0" offsetX="-1" offsetY ="-30" delay="75"/>
+        <frame index="1" offsetX="-1" offsetY ="-32" delay="75" />
+        <frame index="2" offsetX="-1" offsetY ="-32" delay="75" />
+        <frame index="3" offsetX="-1" offsetY ="-31" delay="75" />
+        <frame index="4" offsetX="-1" offsetY ="-32" delay="75" />
+        <frame index="5" offsetX="-1" offsetY ="-32" delay="75" />
+      </animation>
+      <animation direction="left">
+        <frame index="8" offsetX="-1" offsetY ="-32" delay="75"/>
+        <frame index="9" offsetX="-1" offsetY ="-32" delay="75"/>
+        <frame index="10" offsetX="-1" offsetY ="-31" delay="75"/>
+        <frame index="11" offsetX="-1" offsetY ="-32" delay="75"/>
+        <frame index="12" offsetX="-1" offsetY ="-31" delay="75"/>
+        <frame index="13" offsetX="-1" offsetY ="-32" delay="75"/>
+      </animation>
+      <animation direction="up">
+        <frame index="16" offsetX="-2" offsetY ="-32" delay="75"/>
+        <frame index="17" offsetX="-2" offsetY ="-32" delay="75"/>
+        <frame index="18" offsetX="-2" offsetY ="-33" delay="75"/>
+        <frame index="19" offsetX="-2" offsetY ="-32" delay="75"/>
+        <frame index="20" offsetX="-2" offsetY ="-33" delay="75"/>
+        <frame index="21" offsetX="-2" offsetY ="-32" delay="75"/>
+      </animation>
+      <animation direction="right">
+        <frame index="23" offsetX="0" offsetY ="-32" delay="75"/>
+        <frame index="24" offsetX="0" offsetY ="-32" delay="75"/>
+        <frame index="25" offsetX="0" offsetY ="-31" delay="75"/>
+        <frame index="26" offsetX="0" offsetY ="-32" delay="75"/>
+        <frame index="27" offsetX="0" offsetY ="-31" delay="75"/>
+        <frame index="28" offsetX="0" offsetY ="-32" delay="75"/>
+      </animation>
+   </action>
+
+   <action name="attack" imageset="base">
+      <animation direction="down">
+        <frame index="1" offsetX="-1" offsetY ="-30" delay="75" />
+        <frame index="2" offsetX="-1" offsetY ="-31" delay="75" />
+        <frame index="3" offsetX="-1" offsetY ="-29" delay="75" />
+        <frame index="4" offsetX="-1" offsetY ="-26" delay="75" />
+        <end />
+      </animation>
+      <animation direction="left">
+        <frame index="8" offsetX="3" offsetY ="-33" delay="75" />
+        <frame index="9" offsetX="3" offsetY ="-34" delay="75" />
+        <frame index="10" offsetX="0" offsetY ="-32" delay="75" />
+        <frame index="11" offsetX="-1" offsetY ="-31" delay="75" />
+        <end />
+      </animation>
+      <animation direction="up">
+        <frame index="16" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="17" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="18" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="19" offsetX="-3" offsetY ="-31" delay="75"/>
+        <end />
+      </animation>
+      <animation direction="right">
+        <frame index="23" offsetX="-3" offsetY ="-33" delay="75"/>
+        <frame index="24" offsetX="-3" offsetY ="-33" delay="75"/>
+        <frame index="25" offsetX="0" offsetY ="-32" delay="75"/>
+        <frame index="26" offsetX="1" offsetY ="-31" delay="75"/>
+        <end />
+      </animation>
+   </action>
+
+   <action name="attack_bow" imageset="base">
+      <animation direction="down">
+        <frame index="1" offsetX="-1" offsetY ="-32" delay="75" />
+        <frame index="2" offsetX="-1" offsetY ="-32" delay="75" />
+        <frame index="3" offsetX="-1" offsetY ="-31" delay="75" />
+        <frame index="4" offsetX="-1" offsetY ="-30" delay="75" />
+        <frame index="5" offsetX="-1" offsetY ="-32" delay="75" />
+        <end />
+      </animation>
+      <animation direction="left">
+        <frame index="8" offsetX="2" offsetY ="-32" delay="75" />
+        <frame index="9" offsetX="2" offsetY ="-32" delay="75" />
+        <frame index="10" offsetX="2" offsetY ="-32" delay="75" />
+        <frame index="11" offsetX="4" offsetY ="-33" delay="75" />
+        <frame index="12" offsetX="4" offsetY ="-33" delay="75" />
+        <end />
+      </animation>
+      <animation direction="up">
+        <frame index="16" offsetX="-2" offsetY ="-33" delay="75"/>
+        <frame index="17" offsetX="-2" offsetY ="-33" delay="75"/>
+        <frame index="18" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="19" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="20" offsetX="-3" offsetY ="-33" delay="75"/>
+        <end />
+      </animation>
+      <animation direction="right">
+        <frame index="23" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="24" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="25" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="26" offsetX="-5" offsetY ="-33" delay="75"/>
+        <frame index="27" offsetX="-5" offsetY ="-33" delay="75"/>
+        <end />
+      </animation>
+   </action>
+
+   <action name="sit" imageset="base">
+      <animation direction="down">
+        <frame index="0" offsetX="-1" offsetY ="-20" />
+      </animation>
+      <animation direction="left">
+        <frame index="7" offsetX="3" offsetY ="-23"/>
+      </animation>
+      <animation direction="up">
+        <frame index="15" offsetX="-1" offsetY ="-24"/>
+      </animation>
+      <animation direction="right">
+        <frame index="22" offsetX="-6" offsetY ="-23"/>
+      </animation>
+   </action>
+
+   <action name="dead" imageset="base">
+      <animation direction="default">
+         <frame index="14" offsetX="20" offsetY="-6"/>
+      </animation>
+   </action>
+
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/item007.png b/graphics/sprites/item007.png
index a8e40610..90cf228e 100644
--- a/graphics/sprites/item007.png
+++ b/graphics/sprites/item007.png
diff --git a/graphics/sprites/item007.xml b/graphics/sprites/item007.xml
index 09e3c6c4..44c60eb7 100644
--- a/graphics/sprites/item007.xml
+++ b/graphics/sprites/item007.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item007.png" width="40" height="40" />
+	<imageset name="base" src="graphics/sprites/item007.png|W" width="40" height="40" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/items.xml b/items.xml
index 090c17a0..a6925bba 100644
--- a/items.xml
+++ b/items.xml
@@ -2081,9 +2081,29 @@
         weight="40">
         <sprite>head-monster-skull-helm.xml</sprite>
     </item>
+    <item id="723"
+        image="armor-head-deserthat.png|R:#FFFFFF"
+        name="Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFFFFF</sprite>
+    </item>
+    <item id="724"
+        image="armor-head-standardheadband.png|W:#FFFFFF"
+        name="Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFFFFF</sprite>
+    </item>
 
 
-    <!-- HERE ARE SOME UNUSED ITEM ID:S -->
+    <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
         
     <item id="1199"
@@ -3095,7 +3115,8 @@
         <sprite gender="male">chest-shorttanktop-male.xml|#887722,ddcc66,ffffaa</sprite>
         <sprite gender="female">chest-shorttanktop-female.xml|#887722,ddcc66,ffffaa</sprite>
     </item>
-    <item id="2124" image="armor-chest-tanktop-short.png|W:#223355,99aadd,bbccff"
+    <item id="2124"
+        image="armor-chest-tanktop-short.png|W:#223355,99aadd,bbccff"
         name="Light Blue Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
         effect="+2% Defense"
@@ -3104,7 +3125,8 @@
         <sprite gender="male">chest-shorttanktop-male.xml|#223355,99aadd,bbccff</sprite>
         <sprite gender="female">chest-shorttanktop-female.xml|#223355,99aadd,bbccff</sprite>
     </item>
-    <item id="2125" image="armor-chest-tanktop-short.png|W:#552255,ff66ff,ffffff"
+    <item id="2125"
+        image="armor-chest-tanktop-short.png|W:#552255,ff66ff,ffffff"
         name="Pink Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
         effect="+2% Defense"
@@ -3153,4 +3175,205 @@
         <sprite gender="female">chest-shorttanktop-female.xml|#155515,206620,409940</sprite>
     </item>
 
+    <item id="2130"
+        image="armor-head-deserthat.png|R:#FF0000"
+        name="Red Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FF0000</sprite>
+    </item>
+    <item id="2131"
+        image="armor-head-deserthat.png|R:#55FF55"
+        name="Green Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#55FF55</sprite>
+    </item>
+    <item id="2132"
+        image="armor-head-deserthat.png|R:#0000C0"
+        name="Dark Blue Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#0000C0</sprite>
+    </item>
+    <item id="2133"
+        image="armor-head-deserthat.png|R:#FFFF00"
+        name="Yellow Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFFF00</sprite>
+    </item>
+    <item id="2134"
+        image="armor-head-deserthat.png|R:#5555FF"
+        name="Light Blue Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#5555FF</sprite>
+    </item>
+    <item id="2135"
+        image="armor-head-deserthat.png|R:#FFC0C0"
+        name="Pink Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFC0C0</sprite>
+    </item>
+    <item id="2136"
+        image="armor-head-deserthat.png|R:#666666"
+        name="Black Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#666666</sprite>
+    </item>
+    <item id="2137"
+        image="armor-head-deserthat.png|R:#FFC000"
+        name="Orange Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFC000</sprite>
+    </item>
+    <item id="2138"
+        image="armor-head-deserthat.png|R:#C000FF"
+        name="Purple Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#C000FF</sprite>
+    </item>
+    <item id="2139"
+        image="armor-head-deserthat.png|R:#00C000"
+        name="Dark Green Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#00C000</sprite>
+    </item>
+
+    <item id="2140"
+        image="armor-head-standardheadband.png|W:#FF0000"
+        name="Red Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FF0000</sprite>
+    </item>
+    <item id="2141"
+        image="armor-head-standardheadband.png|W:#55FF55"
+        name="Green Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#55FF55</sprite>
+    </item>
+    <item id="2142"
+        image="armor-head-standardheadband.png|W:#0000C0"
+        name="Dark Blue Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#0000C0</sprite>
+    </item>
+    <item id="2143"
+        image="armor-head-standardheadband.png|W:#FFFF00"
+        name="Yellow Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFFF00</sprite>
+    </item>
+    <item id="2144"
+        image="armor-head-standardheadband.png|W:#5555FF"
+        name="Light Blue Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#5555FF</sprite>
+    </item>
+    <item id="2145"
+        image="armor-head-standardheadband.png|W:#FFC0C0"
+        name="Pink Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFC0C0</sprite>
+    </item>
+    <item id="2146"
+        image="armor-head-standardheadband.png|W:#666666"
+        name="Black Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#666666</sprite>
+    </item>
+    <item id="2147"
+        image="armor-head-standardheadband.png|W:#FFC000"
+        name="Orange Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFC000</sprite>
+    </item>
+    <item id="2148"
+        image="armor-head-standardheadband.png|W:#C000FF"
+        name="Purple Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#C000FF</sprite>
+    </item>
+    <item id="2149"
+        image="armor-head-standardheadband.png|W:#00C000"
+        name="Dark Green Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#00C000</sprite>
+    </item>
 </items>