From 35ab471a65e9a0d7cfd513aa606a86135d2dc614 Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 16 Apr 2014 16:46:15 -0500
Subject: Fix Scarab Armlet Fix Jester Mask Fix Red Bone Fix Stalker Fix
 General Terogan Fix The Lost

---
 .../sprites/equipment/head/jestermask-male.xml     | 152 +++++++++++++++++++++
 items.xml                                          |   4 +-
 monsters.xml                                       |  12 +-
 3 files changed, 163 insertions(+), 5 deletions(-)
 create mode 100644 graphics/sprites/equipment/head/jestermask-male.xml

diff --git a/graphics/sprites/equipment/head/jestermask-male.xml b/graphics/sprites/equipment/head/jestermask-male.xml
new file mode 100644
index 00000000..34c3d495
--- /dev/null
+++ b/graphics/sprites/equipment/head/jestermask-male.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+  <imageset name="base" src="graphics/sprites/equipment/head/jestermask.png" width="64" height="64"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <sequence start="1" end="6" delay="75"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="19" end="24" delay="75"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="37" end="42" delay="75"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="55" end="60" delay="75"/>
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="down">
+      <frame index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame index="62"/>
+    </animation>
+  </action>
+  <action name="attack_dagger_stab" imageset="base">
+    <animation direction="down">
+      <sequence start="9" end="12" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="27" end="30" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="45" end="48" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="63" end="66" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <sequence start="13" end="17" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="31" end="35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="49" end="53" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="67" end="71" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_2hand" imageset="base">
+    <animation direction="down">
+      <end/>
+    </animation>
+    <animation direction="left">
+      <end/>
+    </animation>
+    <animation direction="up">
+      <end/>
+    </animation>
+    <animation direction="right">
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_sword_stab" imageset="base">
+    <animation direction="down">
+      <end/>
+    </animation>
+    <animation direction="left">
+      <end/>
+    </animation>
+    <animation direction="up">
+      <end/>
+    </animation>
+    <animation direction="right">
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_spear" imageset="base">
+    <animation direction="down">
+      <end/>
+    </animation>
+    <animation direction="left">
+      <end/>
+    </animation>
+    <animation direction="up">
+      <end/>
+    </animation>
+    <animation direction="right">
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_chop" imageset="base">
+    <animation direction="down">
+      <end/>
+    </animation>
+    <animation direction="left">
+      <end/>
+    </animation>
+    <animation direction="up">
+      <end/>
+    </animation>
+    <animation direction="right">
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/items.xml b/items.xml
index 1720da64..ad29f52b 100644
--- a/items.xml
+++ b/items.xml
@@ -923,7 +923,7 @@
         attack-range="2"
         weight="100">
     </item -->
-    <!-- item id="585"
+    <item id="585"
         image="equipment/shield/scarabarmlet.png"
         name="Scarab Armlet"
         description="A scarab armlet."
@@ -931,7 +931,7 @@
         type="equip-arms"
         weight="200"
         sellProtected="true">
-    </item -->
+    </item>
     <item id="586"
         image="equipment/legs/shorts.png|W:#a4b2b2,ffffff"
         name="Cotton Shorts"
diff --git a/monsters.xml b/monsters.xml
index 50f5da42..d794746e 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -339,9 +339,15 @@
   <monster id="71" name="The Lost">
     <sprite>monsters/skeleton.xml|#aca379</sprite>
     <sprite>equipment/chest/robe-male.xml|#333333</sprite>
+    <sprite>equipment/head/phylactery-male.xml</sprite>
+  </monster>
+  <monster id="72" name="Red Bone">
+    <sprite>monsters/skeleton.xml|#994040,772020,440808,000000</sprite>
+    <particlefx>graphics/particles/necroblast.particle.xml</particlefx>
+  </monster>
+  <monster id="73" name="Stalker">
+    <sprite>monsters/wraith.xml</sprite>
   </monster>
-  <!-- 72 RedBone -->
-  <!-- 73 Stalker -->
   <!-- 74 DreadWing -->
   <monster id="75" name="Drunken Skeleton">
     <sprite>monsters/skeleton.xml|#ffe8bf</sprite>
@@ -653,7 +659,7 @@
   <monster id="127" name="General Terogan">
     <sprite>monsters/skeleton.xml|#aca379</sprite>
     <sprite>equipment/chest/robe-male.xml|#ea0000,333333</sprite>
-    <sprite>equipment/head/phylactery.xml</sprite>
+    <sprite>equipment/head/phylactery-male.xml</sprite>
     <sprite>equipment/head/evileyes.xml</sprite>
     <sprite>equipment/hands/magefire.xml</sprite>
     <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/thelost-attack.particle.xml" action="attack"/>
-- 
cgit v1.2.3-60-g2f50