From e5cc7fe3c1f8aa0ab4f3884b4d5a3f3c49de3eca Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Tue, 3 Jan 2012 21:57:43 +0100
Subject: Add smallnpc sprite with knifepit npc, Change carpet tileset, Add
 collision on 000-2-3 at piourocket place.

---
 graphics/sprites/npcs/XML1/hammock.xml    |   2 +-
 graphics/sprites/npcs/XML1/smallnpc.xml   |  14 ++++++++++++++
 graphics/sprites/npcs/sprite/smallnpc.png | Bin 0 -> 853 bytes
 graphics/tiles/Indoor/Carpet.png          | Bin 11087 -> 8772 bytes
 graphics/tiles/Indoor/Village-indoor2.png | Bin 43739 -> 43873 bytes
 maps/000-2-3.tmx                          |   6 +++---
 npcs.xml                                  |   5 +++++
 7 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 graphics/sprites/npcs/XML1/smallnpc.xml
 create mode 100644 graphics/sprites/npcs/sprite/smallnpc.png

diff --git a/graphics/sprites/npcs/XML1/hammock.xml b/graphics/sprites/npcs/XML1/hammock.xml
index a2065688..03b51669 100644
--- a/graphics/sprites/npcs/XML1/hammock.xml
+++ b/graphics/sprites/npcs/XML1/hammock.xml
@@ -3,7 +3,7 @@
 Copyright (C) 2011  Evol Online -->
 <sprite variants="2" variant_offset="1">
 
-	<imageset name="base" src="graphics/sprites/npcs/sprite/hammock.png" width="96" height="64" />
+	<imageset name="base" src="graphics/sprites/npcs/sprite/zhammock.png" width="96" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
diff --git a/graphics/sprites/npcs/XML1/smallnpc.xml b/graphics/sprites/npcs/XML1/smallnpc.xml
new file mode 100644
index 00000000..f6b8531c
--- /dev/null
+++ b/graphics/sprites/npcs/XML1/smallnpc.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2012  Evol Online -->
+<sprite variants="1" variant_offset="1">
+
+	<imageset name="base" src="graphics/sprites/npcs/sprite/smallnpc.png" width="32" height="32" />
+
+	<action name="stand" imageset="base">
+		<animation direction="default">
+			<frame index="0" />
+		</animation>
+	</action>
+
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/npcs/sprite/smallnpc.png b/graphics/sprites/npcs/sprite/smallnpc.png
new file mode 100644
index 00000000..fa3f6f14
Binary files /dev/null and b/graphics/sprites/npcs/sprite/smallnpc.png differ
diff --git a/graphics/tiles/Indoor/Carpet.png b/graphics/tiles/Indoor/Carpet.png
index 6211ea1f..aba3a415 100644
Binary files a/graphics/tiles/Indoor/Carpet.png and b/graphics/tiles/Indoor/Carpet.png differ
diff --git a/graphics/tiles/Indoor/Village-indoor2.png b/graphics/tiles/Indoor/Village-indoor2.png
index 09bdf8ef..55e4d3d4 100644
Binary files a/graphics/tiles/Indoor/Village-indoor2.png and b/graphics/tiles/Indoor/Village-indoor2.png differ
diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx
index af8c2a08..2e356faf 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -26,7 +26,7 @@
  </layer>
  <layer name="Ground 2" width="52" height="53">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3RywnCUBCF4WSjVmBldmALdqAJ+FyqDagpID7aEStQQbee4AjZ6r1kQP4PDnOTuzmTJAkAAAAAAABCtNL37Gp2NJ+1u73NTcOdQuS2z6P2bmTzs1s7bbBQoIm6TpWFMlTmSml3S2WlrB37favqn9n3n9l5bM9bZacUXuUiOyhH5eRd5Ad9/ZOz5kDz4l0mkmqf3h/tc1Vuyt27CAAAAAAAAIAoXjVUJLIQKwAA
+   H4sIAAAAAAAAA+3TyQnCUBSF4WSjVmA/Ygt2YAt24ADGYak24FCAUzuSClTQrUe8QlaCvkcuwv/B4SZ5m3MTkiQAAAAAAAAIUUlfs65Z07wXznY2lyV3CjGwfW6FZz2b792qaYmFAmXqOlKmSleZKFs7mylzZeHY71vP/n17/2O7Htr9SlkrG69yke2Vg3L0LvKDtr7JSbOjmXuXiaShXVpK84/+/0/OykW5ehcBAAAAAAAAEMUDlksYDBArAAA=
   </data>
  </layer>
  <layer name="Fringe" width="52" height="53">
@@ -39,9 +39,9 @@
    H4sIAAAAAAAAA+3RQQqDMBAF0BynSy/gqtpt1z1J7+cN9ETOotIgtiC4SPQ9+CTIBOZjSgAAAABwPq9Iu2P+8XlTqiv0GSNTZNiYr7HPPzX0ee+Yr6HP2f7Prz7PSJ/lFulS+X3u6btvfi67L2mye6m29m1W3/MAAAAAcIwZs0xCuRArAAA=
   </data>
  </layer>
- <layer name="Collision" width="52" height="53">
+ <layer name="Collision" width="52" height="53" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3RIQ4AIAwEQfi/48VYBCAwTcs0Gb+Xjt7aAAAAAIAPrRfd8tJeYc/pKuy57YzufPlN9j3V/rPrPl10pz352gEAAAAymuzr9B4QKwAA
+   H4sIAAAAAAAAA+3RIQ4AIAwEQfi/48UoHEVgmsI0GX+bjt7aAAAAAIBPrcvecbM7aqnUE90LPafO7J03v6ne89p/drujy96pp952AAAAgIomHzwjTBArAAA=
   </data>
  </layer>
  <objectgroup name="Object" width="52" height="53" visible="0">
diff --git a/npcs.xml b/npcs.xml
index 8d381af8..74379d4f 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -8,6 +8,11 @@ IDs 901-999 = Special
 -->
 <npcs>
 <!-- Unanimated NPCs -->
+    <npc id="100">
+		  <!-- Knifepit. -->
+		  <sprite variant="0">npcs/XML1/smallnpc.xml</sprite>
+	 </npc>
+
 <!-- Animated NPCs -->
     <npc id="301">
         <!-- Eye animation. -->
-- 
cgit v1.2.3-70-g09d2