From d29ead09da75d0f13ccae2eb205ea8a1ed170580 Mon Sep 17 00:00:00 2001
From: Alige <aligetmw@hotmail.fr>
Date: Mon, 4 Jun 2012 11:24:34 +0200
Subject: Reduced few NPC spritesheets and adapted their respective XML files.
 Renamed several NPC files to give them more sense. Correcter several entries
 in npcs.xml.

---
 graphics/sprites/npcs/sprite/animated_hammock.png | Bin 11435 -> 0 bytes
 graphics/sprites/npcs/sprite/billybons.png        | Bin 4604 -> 4591 bytes
 graphics/sprites/npcs/sprite/hammock-animated.png | Bin 0 -> 11435 bytes
 graphics/sprites/npcs/sprite/interactive.png      | Bin 0 -> 2527 bytes
 graphics/sprites/npcs/sprite/magic_arpan.png      | Bin 4113 -> 0 bytes
 graphics/sprites/npcs/sprite/magicarpan.png       | Bin 0 -> 4113 bytes
 graphics/sprites/npcs/sprite/npc.png              | Bin 13942 -> 0 bytes
 graphics/sprites/npcs/sprite/rattosailor.png      | Bin 3844 -> 4319 bytes
 graphics/sprites/npcs/sprite/silvio.png           | Bin 3366 -> 3551 bytes
 graphics/sprites/npcs/sprite/smallnpc.png         | Bin 2527 -> 0 bytes
 graphics/sprites/npcs/sprite/unanimated.png       | Bin 0 -> 13942 bytes
 graphics/sprites/npcs/xml/animated_hammock1.xml   |  22 ------
 graphics/sprites/npcs/xml/animated_hammock2.xml   |  22 ------
 graphics/sprites/npcs/xml/hammock-animated1.xml   |  22 ++++++
 graphics/sprites/npcs/xml/hammock-animated2.xml   |  22 ++++++
 graphics/sprites/npcs/xml/interactive.xml         |  12 ++++
 graphics/sprites/npcs/xml/magic_arpan.xml         |  25 -------
 graphics/sprites/npcs/xml/magicarpan.xml          |  25 +++++++
 graphics/sprites/npcs/xml/npc.xml                 |  12 ----
 graphics/sprites/npcs/xml/rattosailor.xml         |   2 +-
 graphics/sprites/npcs/xml/silvio.xml              |   2 +-
 graphics/sprites/npcs/xml/smallnpc.xml            |  12 ----
 graphics/sprites/npcs/xml/unanimated.xml          |  12 ++++
 npcs.xml                                          |  80 ++++++++++------------
 24 files changed, 133 insertions(+), 137 deletions(-)
 delete mode 100644 graphics/sprites/npcs/sprite/animated_hammock.png
 create mode 100644 graphics/sprites/npcs/sprite/hammock-animated.png
 create mode 100644 graphics/sprites/npcs/sprite/interactive.png
 delete mode 100644 graphics/sprites/npcs/sprite/magic_arpan.png
 create mode 100644 graphics/sprites/npcs/sprite/magicarpan.png
 delete mode 100644 graphics/sprites/npcs/sprite/npc.png
 delete mode 100644 graphics/sprites/npcs/sprite/smallnpc.png
 create mode 100644 graphics/sprites/npcs/sprite/unanimated.png
 delete mode 100644 graphics/sprites/npcs/xml/animated_hammock1.xml
 delete mode 100644 graphics/sprites/npcs/xml/animated_hammock2.xml
 create mode 100644 graphics/sprites/npcs/xml/hammock-animated1.xml
 create mode 100644 graphics/sprites/npcs/xml/hammock-animated2.xml
 create mode 100644 graphics/sprites/npcs/xml/interactive.xml
 delete mode 100644 graphics/sprites/npcs/xml/magic_arpan.xml
 create mode 100644 graphics/sprites/npcs/xml/magicarpan.xml
 delete mode 100644 graphics/sprites/npcs/xml/npc.xml
 delete mode 100644 graphics/sprites/npcs/xml/smallnpc.xml
 create mode 100644 graphics/sprites/npcs/xml/unanimated.xml

diff --git a/graphics/sprites/npcs/sprite/animated_hammock.png b/graphics/sprites/npcs/sprite/animated_hammock.png
deleted file mode 100644
index 7d393780..00000000
Binary files a/graphics/sprites/npcs/sprite/animated_hammock.png and /dev/null differ
diff --git a/graphics/sprites/npcs/sprite/billybons.png b/graphics/sprites/npcs/sprite/billybons.png
index 7d0d42b2..adf41d7d 100644
Binary files a/graphics/sprites/npcs/sprite/billybons.png and b/graphics/sprites/npcs/sprite/billybons.png differ
diff --git a/graphics/sprites/npcs/sprite/hammock-animated.png b/graphics/sprites/npcs/sprite/hammock-animated.png
new file mode 100644
index 00000000..7d393780
Binary files /dev/null and b/graphics/sprites/npcs/sprite/hammock-animated.png differ
diff --git a/graphics/sprites/npcs/sprite/interactive.png b/graphics/sprites/npcs/sprite/interactive.png
new file mode 100644
index 00000000..f3a1cbe8
Binary files /dev/null and b/graphics/sprites/npcs/sprite/interactive.png differ
diff --git a/graphics/sprites/npcs/sprite/magic_arpan.png b/graphics/sprites/npcs/sprite/magic_arpan.png
deleted file mode 100644
index 53b50f13..00000000
Binary files a/graphics/sprites/npcs/sprite/magic_arpan.png and /dev/null differ
diff --git a/graphics/sprites/npcs/sprite/magicarpan.png b/graphics/sprites/npcs/sprite/magicarpan.png
new file mode 100644
index 00000000..53b50f13
Binary files /dev/null and b/graphics/sprites/npcs/sprite/magicarpan.png differ
diff --git a/graphics/sprites/npcs/sprite/npc.png b/graphics/sprites/npcs/sprite/npc.png
deleted file mode 100644
index d18bb1fa..00000000
Binary files a/graphics/sprites/npcs/sprite/npc.png and /dev/null differ
diff --git a/graphics/sprites/npcs/sprite/rattosailor.png b/graphics/sprites/npcs/sprite/rattosailor.png
index eda1b976..30b57cee 100644
Binary files a/graphics/sprites/npcs/sprite/rattosailor.png and b/graphics/sprites/npcs/sprite/rattosailor.png differ
diff --git a/graphics/sprites/npcs/sprite/silvio.png b/graphics/sprites/npcs/sprite/silvio.png
index 4e393e52..b00f87de 100644
Binary files a/graphics/sprites/npcs/sprite/silvio.png and b/graphics/sprites/npcs/sprite/silvio.png differ
diff --git a/graphics/sprites/npcs/sprite/smallnpc.png b/graphics/sprites/npcs/sprite/smallnpc.png
deleted file mode 100644
index f3a1cbe8..00000000
Binary files a/graphics/sprites/npcs/sprite/smallnpc.png and /dev/null differ
diff --git a/graphics/sprites/npcs/sprite/unanimated.png b/graphics/sprites/npcs/sprite/unanimated.png
new file mode 100644
index 00000000..d18bb1fa
Binary files /dev/null and b/graphics/sprites/npcs/sprite/unanimated.png differ
diff --git a/graphics/sprites/npcs/xml/animated_hammock1.xml b/graphics/sprites/npcs/xml/animated_hammock1.xml
deleted file mode 100644
index 4605309c..00000000
--- a/graphics/sprites/npcs/xml/animated_hammock1.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!-- Author: Reid
-Copyright (C) 2011-2012 Evol Online -->
-<sprite>
-    <imageset name="npc" src="graphics/sprites/npcs/sprite/animated_hammock.png" width="96" height="64"/>
-
-    <action name="stand" imageset="npc">
-        <!-- Moving -->
-        <animation direction="left">
-            <frame index="3" delay="300"/>
-            <frame index="2" delay="180"/>
-            <frame index="1" delay="150"/>
-            <frame index="0" delay="400"/>
-            <frame index="1" delay="180"/>
-            <frame index="2" delay="150"/>
-        </animation>
-        <!-- Static -->
-        <animation direction="up">
-            <frame index="3"/>
-        </animation>
-    </action>
-</sprite>
diff --git a/graphics/sprites/npcs/xml/animated_hammock2.xml b/graphics/sprites/npcs/xml/animated_hammock2.xml
deleted file mode 100644
index 9e0a9cf1..00000000
--- a/graphics/sprites/npcs/xml/animated_hammock2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!-- Author: Reid
-Copyright (C) 2011-2012 Evol Online -->
-<sprite>
-    <imageset name="npc" src="graphics/sprites/npcs/sprite/animated_hammock.png" width="96" height="64"/>
-
-    <action name="stand" imageset="npc">
-        <!-- Moving -->
-        <animation direction="left">
-            <frame index="7" delay="300"/>
-            <frame index="6" delay="180"/>
-            <frame index="5" delay="150"/>
-            <frame index="4" delay="400"/>
-            <frame index="5" delay="180"/>
-            <frame index="6" delay="150"/>
-        </animation>
-        <!-- Static -->
-        <animation direction="up">
-            <frame index="7"/>
-        </animation>
-    </action>
-</sprite>
diff --git a/graphics/sprites/npcs/xml/hammock-animated1.xml b/graphics/sprites/npcs/xml/hammock-animated1.xml
new file mode 100644
index 00000000..19e624a7
--- /dev/null
+++ b/graphics/sprites/npcs/xml/hammock-animated1.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!-- Author: Reid
+Copyright (C) 2011-2012 Evol Online -->
+<sprite>
+    <imageset name="npc" src="graphics/sprites/npcs/sprite/hammock-animated.png" width="96" height="64"/>
+
+    <action name="stand" imageset="npc">
+        <!-- Moving -->
+        <animation direction="left">
+            <frame index="3" delay="300"/>
+            <frame index="2" delay="180"/>
+            <frame index="1" delay="150"/>
+            <frame index="0" delay="400"/>
+            <frame index="1" delay="180"/>
+            <frame index="2" delay="150"/>
+        </animation>
+        <!-- Static -->
+        <animation direction="up">
+            <frame index="3"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/hammock-animated2.xml b/graphics/sprites/npcs/xml/hammock-animated2.xml
new file mode 100644
index 00000000..af85e3b0
--- /dev/null
+++ b/graphics/sprites/npcs/xml/hammock-animated2.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!-- Author: Reid
+Copyright (C) 2011-2012 Evol Online -->
+<sprite>
+    <imageset name="npc" src="graphics/sprites/npcs/sprite/hammock-animated2.png" width="96" height="64"/>
+
+    <action name="stand" imageset="npc">
+        <!-- Moving -->
+        <animation direction="left">
+            <frame index="7" delay="300"/>
+            <frame index="6" delay="180"/>
+            <frame index="5" delay="150"/>
+            <frame index="4" delay="400"/>
+            <frame index="5" delay="180"/>
+            <frame index="6" delay="150"/>
+        </animation>
+        <!-- Static -->
+        <animation direction="up">
+            <frame index="7"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/interactive.xml b/graphics/sprites/npcs/xml/interactive.xml
new file mode 100644
index 00000000..76fd612a
--- /dev/null
+++ b/graphics/sprites/npcs/xml/interactive.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- Author: Reid
+Copyright (C) 2012 Evol Online -->
+<sprite variants="2" variant_offset="1">
+    <imageset name="npc" src="graphics/sprites/npcs/sprite/interactive.png" width="32" height="32"/>
+
+    <action name="stand" imageset="npc">
+        <animation direction="default">
+            <frame index="0"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/magic_arpan.xml b/graphics/sprites/npcs/xml/magic_arpan.xml
deleted file mode 100644
index 293dcc1c..00000000
--- a/graphics/sprites/npcs/xml/magic_arpan.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!-- Author: Reid
-Copyright (C) 2011-2012 Evol Online -->
-<sprite>
-    <imageset name="npc" src="graphics/sprites/npcs/sprite/magic_arpan.png" width="29" height="62"/>
-
-    <action name="stand" imageset="npc">
-        <animation direction="default">
-            <!-- Eyes animation -->
-            <frame index="0" delay="7000"/>
-            <frame index="3" delay="60"/>
-            <frame index="4" delay="120"/>
-            <frame index="3" delay="70"/>
-            <!-- Mouth Animation -->
-            <frame index="0" delay="6000"/>
-            <sequence start="1" end="2" delay="130" repeat="4"/>
-            <frame index="1" delay="90"/>
-            <!-- Eyes Animation -->
-            <frame index="0" delay="3500"/>
-            <frame index="3" delay="60"/>
-            <frame index="4" delay="120"/>
-            <frame index="3" delay="70"/>
-        </animation>
-    </action>
-</sprite>
diff --git a/graphics/sprites/npcs/xml/magicarpan.xml b/graphics/sprites/npcs/xml/magicarpan.xml
new file mode 100644
index 00000000..0c3e82a4
--- /dev/null
+++ b/graphics/sprites/npcs/xml/magicarpan.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- Author: Reid
+Copyright (C) 2011-2012 Evol Online -->
+<sprite>
+    <imageset name="npc" src="graphics/sprites/npcs/sprite/magic-arpan.png" width="29" height="62"/>
+
+    <action name="stand" imageset="npc">
+        <animation direction="default">
+            <!-- Eyes animation -->
+            <frame index="0" delay="7000"/>
+            <frame index="3" delay="60"/>
+            <frame index="4" delay="120"/>
+            <frame index="3" delay="70"/>
+            <!-- Mouth Animation -->
+            <frame index="0" delay="6000"/>
+            <sequence start="1" end="2" delay="130" repeat="4"/>
+            <frame index="1" delay="90"/>
+            <!-- Eyes Animation -->
+            <frame index="0" delay="3500"/>
+            <frame index="3" delay="60"/>
+            <frame index="4" delay="120"/>
+            <frame index="3" delay="70"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/npc.xml b/graphics/sprites/npcs/xml/npc.xml
deleted file mode 100644
index 87bba581..00000000
--- a/graphics/sprites/npcs/xml/npc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!-- Author: Reid
-Copyright (C) 2012 Evol Online -->
-<sprite variants="5" variant_offset="1">
-    <imageset name="npc" src="graphics/sprites/npcs/sprite/npc.png|S" width="64" height="64"/>
-
-    <action name="stand" imageset="npc">
-        <animation direction="default">
-            <frame index="0"/>
-        </animation>
-    </action>
-</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/npcs/xml/rattosailor.xml b/graphics/sprites/npcs/xml/rattosailor.xml
index 57c25e7d..3196a467 100644
--- a/graphics/sprites/npcs/xml/rattosailor.xml
+++ b/graphics/sprites/npcs/xml/rattosailor.xml
@@ -2,7 +2,7 @@
 <!-- Author: Reid
 Copyright (C) 2010-2012 Evol Online -->
 <sprite>
-    <imageset name="npc" src="graphics/sprites/npcs/sprite/rattosailor.png" width="31" height="58"/>
+    <imageset name="npc" src="graphics/sprites/npcs/sprite/rattosailor.png" width="27" height="58" offsetX="3"/>
 
     <action name="stand" imageset="npc">
         <animation direction="default">
diff --git a/graphics/sprites/npcs/xml/silvio.xml b/graphics/sprites/npcs/xml/silvio.xml
index d1ebc36f..672c656a 100644
--- a/graphics/sprites/npcs/xml/silvio.xml
+++ b/graphics/sprites/npcs/xml/silvio.xml
@@ -2,7 +2,7 @@
 <!-- Author: Reid
 Copyright (C) 2011-2012 Evol Online -->
 <sprite>
-    <imageset name="npc" src="graphics/sprites/npcs/sprite/silvio.png" width="36" height="49"/>
+    <imageset name="npc" src="graphics/sprites/npcs/sprite/silvio.png" width="30" height="49" offsetX="-4"/>
 
     <action name="stand" imageset="npc">
         <animation direction="default">
diff --git a/graphics/sprites/npcs/xml/smallnpc.xml b/graphics/sprites/npcs/xml/smallnpc.xml
deleted file mode 100644
index 81305271..00000000
--- a/graphics/sprites/npcs/xml/smallnpc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!-- Author: Reid
-Copyright (C) 2012 Evol Online -->
-<sprite variants="2" variant_offset="1">
-    <imageset name="npc" src="graphics/sprites/npcs/sprite/smallnpc.png" width="32" height="32"/>
-
-    <action name="stand" imageset="npc">
-        <animation direction="default">
-            <frame index="0"/>
-        </animation>
-    </action>
-</sprite>
diff --git a/graphics/sprites/npcs/xml/unanimated.xml b/graphics/sprites/npcs/xml/unanimated.xml
new file mode 100644
index 00000000..3f0a761f
--- /dev/null
+++ b/graphics/sprites/npcs/xml/unanimated.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- Author: Reid
+Copyright (C) 2012 Evol Online -->
+<sprite variants="5" variant_offset="1">
+    <imageset name="npc" src="graphics/sprites/npcs/sprite/unanimated.png|S" width="64" height="64"/>
+
+    <action name="stand" imageset="npc">
+        <animation direction="default">
+            <frame index="0"/>
+        </animation>
+    </action>
+</sprite>
\ No newline at end of file
diff --git a/npcs.xml b/npcs.xml
index 02eb91b0..3898a1fc 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -11,101 +11,97 @@ IDs 990-999 = Special
 <npcs>
     <!-- Unanimated NPCs -->
     <npc id="100">
-          <!-- Knife-pit. -->
-          <sprite variant="0">npcs/xml/smallnpc.xml</sprite>
+          <!-- Knifes -->
+          <sprite variant="0">npcs/xml/interactive.xml</sprite>
      </npc>
     <npc id="101">
-        <!-- Demon-Man, siting on a chair... -->
-          <sprite variant="0">npcs/xml/npc.xml</sprite>
+        <!-- Demon Man, sitting on a chair. -->
+          <sprite variant="0">npcs/xml/unanimated.xml</sprite>
      </npc>
     <npc id="102">
-          <!-- Hat-box. -->
-          <sprite variant="1">npcs/xml/smallnpc.xml</sprite>
+          <!-- Hat Box -->
+          <sprite variant="1">npcs/xml/interactive.xml</sprite>
      </npc>
     <npc id="103">
-        <!-- Raijin-Man, standing on a mat. -->
-          <sprite variant="1">npcs/xml/npc.xml</sprite>
+        <!-- Raijin Man, standing at the top of a mat. -->
+          <sprite variant="1">npcs/xml/unanimated.xml</sprite>
      </npc>
     <npc id="104">
-        <!-- Orc-Man, standing with a box on his hand. -->
-          <sprite variant="2">npcs/xml/npc.xml</sprite>
+        <!-- Orc Man, standing with a box in his hands. -->
+          <sprite variant="2">npcs/xml/unanimated.xml</sprite>
      </npc>
     <npc id="105">
-        <!-- Demon-Man, sitting sailor. -->
-          <sprite variant="3">npcs/xml/npc.xml</sprite>
+        <!-- Demon Man, sitting sailor with his boots near him. -->
+          <sprite variant="3">npcs/xml/unanimated.xml</sprite>
      </npc>
     <npc id="106">
-        <!-- Elven-Man, strong, standing sailor with blonde hair. -->
-          <sprite variant="4">npcs/xml/npc.xml|#474747,5a4333,6e6e6e,8c6946,898989,a98645,9d9d9d,ba9c50,b3b3b3,c9b467,e2e2e2,ede4ab</sprite>
+        <!-- Elven Man, strong standing sailor with blonde hair. -->
+          <sprite variant="4">npcs/xml/unanimated.xml|#474747,5a4333,6e6e6e,8c6946,898989,a98645,9d9d9d,ba9c50,b3b3b3,c9b467,e2e2e2,ede4ab</sprite>
      </npc>
     <npc id="107">
-        <!-- Elven-Man, strong, standing sailor with red hair. -->
-          <sprite variant="4">npcs/xml/npc.xml|#474747,643a40,6e6e6e,812f2f,898989,ab4343,9d9d9d,cc5858,b3b3b3,e0897e,e2e2e2,fdc6b3</sprite>
+        <!-- Elven Man, strong standing sailor with red hair. -->
+          <sprite variant="4">npcs/xml/unanimated.xml|#474747,643a40,6e6e6e,812f2f,898989,ab4343,9d9d9d,cc5858,b3b3b3,e0897e,e2e2e2,fdc6b3</sprite>
      </npc>
 
     <!-- Animated NPCs -->
     <npc id="301">
-        <!-- Eyes animation. -->
+        <!-- Awesome Eyes -->
         <sprite>npcs/xml/alige.xml</sprite>
     </npc>
     <npc id="302">
-        <!-- Orc-Sailor, sleeping. -->
+        <!-- Orc Sailor, sleeping. -->
         <sprite>npcs/xml/sleepingorc.xml</sprite>
     </npc>
     <npc id="303">
-        <!-- Human-Man, sailor with a ratto in his left hand. -->
+        <!-- Human Man, sailor with a dead ratto in his left hand. -->
         <sprite>npcs/xml/rattosailor.xml</sprite>
     </npc>
     <npc id="304">
-        <!-- Demon-Woman, takes care of the ship. -->
+        <!-- Demon Woman, taking care of the ship. -->
         <sprite>npcs/xml/julia.xml</sprite>
     </npc>
     <npc id="305">
-        <!-- Sailors group. -->
+        <!-- Group of Sailors -->
         <sprite>npcs/xml/sailors.xml</sprite>
     </npc>
     <npc id="306">
-          <!-- Present to an Evol's friend. -->
+          <!-- Capitain, present to an Evol's friend. -->
           <sprite>npcs/xml/nard.xml</sprite>
     </npc>
     <npc id="307">
-        <!-- Tritan-Man, sitting on a barrel. -->
-        <sprite>npcs/xml/magic_arpan.xml</sprite>
+        <!-- Tritan Man, sitting on a barrel. -->
+        <sprite>npcs/xml/magicarpan.xml</sprite>
     </npc>
     <npc id="308">
-        <!-- Piou Rocket, sitting on his iron bar. -->
+        <!-- Piou Rocket, jumping on its iron bar. -->
         <sprite>npcs/xml/piourocket.xml</sprite>
     </npc>
     <npc id="309">
-        <!-- Human-Man, standing elmo. -->
+        <!-- Human Man, standing sailor. -->
         <sprite>npcs/xml/elmo1.xml</sprite>
     </npc>
     <npc id="310">
-          <!-- Ukar-Man, sleeping sailor. -->
+          <!-- Ukar Man, sleeping sailor. -->
           <sprite variant="0">npcs/xml/hammock.xml</sprite>
      </npc>
     <npc id="311">
-          <!-- Elf-Man, drunken sailor. -->
+          <!-- Elf Man, drunk sailor. -->
           <sprite>npcs/xml/billybons.xml</sprite>
      </npc>
     <npc id="312">
-        <!-- Mudget-Man, small and not smart at all... -->
+        <!-- Human Man, small and drunk. -->
         <sprite>npcs/xml/silvio.xml</sprite>
      </npc>
     <npc id="313">
-        <!-- Human-Man, sitting on a box with purple hair. -->
+        <!-- Human Man, sitting on a box with purple hair. -->
         <sprite>npcs/xml/gugli.xml</sprite>
         <sprite>accessories/eye-right-blink.xml</sprite>
     </npc>
     <npc id="314">
-        <!-- Human-Small-Man, standing with a bottle of wine at his hand. -->
-        <sprite>npcs/xml/silvio.xml</sprite>
-    </npc>
-    <npc id="315">
-        <!-- Tritan-Man, standing around a barrel. -->
+        <!-- Tritan Man, with his left arm on a barrel. -->
         <sprite>npcs/xml/sapartan.xml</sprite>
     </npc>
-    <npc id="316">
+    <npc id="315">
         <!-- Tritan-Man, hitting a palm tree. -->
         <sprite>npcs/xml/tarlan.xml</sprite>
         <sprite>accessories/croconut.xml</sprite>
@@ -129,20 +125,20 @@ IDs 990-999 = Special
         <particlefx>graphics/particles/savepoint/savepoint-64x64.xml</particlefx>
      </npc>-->
     <npc id="904">
-        <!-- Left hammock. -->
-        <sprite>npcs/xml/animated_hammock1.xml</sprite>
+        <!-- Left Hammock -->
+        <sprite>npcs/xml/hammock-animated1.xml</sprite>
     </npc>
     <npc id="905">
-        <!-- Right hammock. -->
-        <sprite>npcs/xml/animated_hammock2.xml</sprite>
+        <!-- Right Hammock -->
+        <sprite>npcs/xml/hammock-animated2.xml</sprite>
     </npc>
     <npc id="906">
-        <!-- Left hammock with particle. -->
+        <!-- Left Hammock, with particles. -->
         <sprite>npcs/xml/animated_hammock1.xml</sprite>
         <particlefx>graphics/particles/savepoint/savepoint-32x32.xml</particlefx>
     </npc>
     <npc id="999">
-        <!-- Invisible NPC -->
+        <!-- Invisible -->
     </npc>
 
 </npcs>
-- 
cgit v1.2.3-70-g09d2