From e654cff467fce19ed9759fdfd1db5a49f73f8d10 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Wed, 7 Dec 2011 23:32:18 +0100
Subject: Remove hairstyle id -26 from items.xml. Village indoor2 : Correct
 chair placements, Correct bed saturation. Add ground variation on 000-2-3
 map. Add new die frame on hairstyle 22 and corrected some bad pixels ghosts.

---
 graphics/sprites/hairstyles/hairstyle22.png | Bin 6983 -> 5499 bytes
 graphics/tiles/Indoor/Village-indoor2.png   | Bin 44179 -> 44469 bytes
 items.xml                                   |   3 ---
 maps/000-2-0.tmx                            |   4 ++--
 maps/000-2-3.tmx                            |   4 ++--
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/graphics/sprites/hairstyles/hairstyle22.png b/graphics/sprites/hairstyles/hairstyle22.png
index de2fe15c..0022a179 100644
Binary files a/graphics/sprites/hairstyles/hairstyle22.png and b/graphics/sprites/hairstyles/hairstyle22.png differ
diff --git a/graphics/tiles/Indoor/Village-indoor2.png b/graphics/tiles/Indoor/Village-indoor2.png
index eaeae5b2..26ff810b 100644
Binary files a/graphics/tiles/Indoor/Village-indoor2.png and b/graphics/tiles/Indoor/Village-indoor2.png differ
diff --git a/items.xml b/items.xml
index 5b58fa75..2bd5a8ee 100644
--- a/items.xml
+++ b/items.xml
@@ -103,9 +103,6 @@ Colors is now seted up by itemcolors.xml.
     <item id="-25" type="hairsprite" name="Tousled layers">
         <sprite>hairstyles/hairstyle25.xml</sprite>
     </item>
-    <item id="-26" type="hairsprite" name="Short punk">
-        <sprite>hairstyles/hairstyle26.xml</sprite>
-    </item>
 
 
     <!-- Races -->
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index ea7e05f4..a975eac5 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -17,7 +17,7 @@
  </tileset>
  <layer name="Ground" width="52" height="53">
   <data encoding="base64" compression="zlib">
-   eJzt0rEKgCAARVF/szFqiVoa+/sICiSktEWMM5xBp3fRLoTQAQAAAPBZn6H2Rj3/6ZnPzUNGUwtt1964Z2m4Z3rpaOnvHfvWxOaja2y0aTv3x2/z9E61975Jbb/fxefae3P+XInae0u6Ss4AAAAAfLMDZZDChg==
+   eJzt0qEOwyAUhlFeE7l0ptnMZN9+BkGa3hQwjOWII6j6v9zmlFIGAAAAYNijweyNev6n51U2bw1NK7RdbX8v3LMHHdG9Zu+9u80nuM8z6Pn1pqPsr29z9b+t0JKD7edv9Xv23pZ/rsfsvT1dPW8AAAAAxnwBY9DChg==
   </data>
  </layer>
  <layer name="Ground 2" width="52" height="53">
@@ -27,7 +27,7 @@
  </layer>
  <layer name="Fringe" width="52" height="53">
   <data encoding="base64" compression="zlib">
-   eJztz7sJAkEUBdB5mpiqWIkdWIItWICJuYiViLVYgv34wEBZGJDdhXHhHLjJfODeUgAAAAAY06J1gYF2UUpkZpl55ta5fzRp1d8+Nywzq8w6c8+zQ3zun82aDXOJd05fW7ZRfz8F10r/zcR3ddV2/ptjjz/n0VsAAAAAAPzmBW/1B9w=
+   eJztz8EJAjEQBdCMXryqWIkdWIIdiAV42buIlYi1WIL9OOBBURZkdyEuvAefQCaBP6UAAAAAMKRZ7QI9baKUyEwy08zlY36r0qq7be4wzywyy8w17/bxmt+rNevnFM80b7uso/39GJxb+q9GvNcuvs+2Pf/NocOf4+AtAAAAAAB+8wArmQkC
   </data>
  </layer>
  <layer name="Over" width="52" height="53">
diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx
index c42bdc55..7c25d37c 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -20,7 +20,7 @@
  </tileset>
  <layer name="Ground" width="52" height="53">
   <data encoding="base64" compression="zlib">
-   eJzt0j0KwkAQxfEEbAQbEQsJXkSjpeAJJGX63MBz+BXNXX0LCQwSUSOYXfkXP4Zkm/eYyaIoygAAAAAAAH5kKesWactb6kHeV1YylqkxkZ3szZv7t/Egb9c+sWwD7OPMZG4kdZ+FeUs8yPmuvMVQBnJQsaOc4v5zftKnqNn8rs9Z8yJlYH0aNv9I31fNm1SB9Hm8M9fH7amsZ7O73IOsXe7N7sd2CamPzWzvy+6t8CBn15t7pu+c3/TpOxMAAAAAAMA/uwMRHbwp
+   eJzt0j0KwkAQxfEEbAQbEQsJXkSjpeAJJGWwzQ08h996V99CAkOIqBHMrvyLH0OyzXvMZFEUZQAAAAAAAD8yl2WDtOEt9SDvKwsZytgYyUZ25s39W3mQt22fWNYB9nEmMjWSss/MvCUe5HxXXrOVvvRkr2IHOcbd5/ykT1Gy+V2fk+ZZLoH1qdj8A31fNW9yD6RP/dZcH7enSzmr3eUeZG1zb3Y/tktIfWxme192b4UHOdve3DNd5/ymT9eZAAAAAAAA/tkDP328Kw==
   </data>
  </layer>
  <layer name="Ground 2" width="52" height="53">
@@ -38,7 +38,7 @@
    eJzt0UsKgzAUBdBnV9OhG3DUz9SxK3GjLqgZKA1FBcFBYs+BS4K8wLsYAQAAAADXM6R0B+bf85tS/UOfpom4pUwr8zX22VNDn/HAfA19rvZ/tvr0Ka8s95RnlN/nEd9983PZfUmb3Uu1tm/78z0PAAAAAOf4AF55EpE=
   </data>
  </layer>
- <layer name="Collision" width="52" height="53">
+ <layer name="Collision" width="52" height="53" visible="0">
   <data encoding="base64" compression="zlib">
    eJzt0SEOACAMBEH4v+PFKBxFYJrCNBl/m47e2gAAAACAT63L3nGzO2qp1BPdCz2nzuydN7+p3vPaf3a7o8veqafedgAAAICKJtNIC00=
   </data>
-- 
cgit v1.2.3-70-g09d2