Add the new brimmed hat on LICENSE.

3 files changed, 30 insertions, 20 deletions

diff --git a/LICENSE b/LICENSE
index 3f3cddd5..dfab2906 100644
--- a/LICENSE
+++ b/LICENSE
@@ -153,6 +153,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 ### Head
     graphics/sprites/equipment/head/bandana-female.png (Modanung)           (CC BY-SA 3.0)        (Alige, Reid)
     graphics/sprites/equipment/head/bandana-male.png (Modanung)             (CC BY-SA 3.0)        (Alige)
+    graphics/sprites/equipment/head/brimmedfeatherhat.png (Reid)            (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/head/brimmedhat.png (Reid)                   (CC BY-SA 3.0)        (Reid)
     graphics/sprites/equipment/head/fancyhat.png (Crush)                    (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/head/pumpkinhat.png (Modanung)               (CC BY-SA 3.0)        (-)
diff --git a/items.xml b/items.xml
index 46038c6e..dba8630a 100644
--- a/items.xml
+++ b/items.xml
@@ -720,7 +720,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
             <item from="-23" to="-27"/>
         </replace>
     </item>
-    <item id="2903"
+    <item id="2904"
         image="equipment/head/brimmedhat.png"
         name="Brimmed Hat"
         description="-"
@@ -729,6 +729,15 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         weight="20">
         <sprite>equipment/head/brimmedhat.xml</sprite>
     </item>
+    <item id="2903"
+        image="equipment/head/brimmedhat.png"
+        name="Brimmed Hat"
+        description="-"
+        defense="2"
+        type="equip-head"
+        weight="20">
+        <sprite>equipment/head/brimmedfeatherhat.xml</sprite>
+    </item>
 
     <!-- Neck Armors
     <item id="3200"
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index 49203136..bd2516d0 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="70" height="66" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="66" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -17,58 +17,58 @@
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
  </tileset>
  <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="192"/>
+  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="553" name="Indoor x2 x4" tilewidth="64" tileheight="128">
+ <tileset firstgid="569" name="Indoor x2 x4" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="561" name="Box" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/box.png" width="128" height="192"/>
  </tileset>
- <tileset firstgid="585" name="Box x1 x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="601" name="Box x1 x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
  </tileset>
- <tileset firstgid="589" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="605" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="717" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="733" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="721" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="737" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="977" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="993" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="983" name="Level Height" tilewidth="32" tileheight="32">
+ <tileset firstgid="999" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="70" height="66">
   <data encoding="base64" compression="zlib">
-   eJzt1rsNwjAUhWFHlDxaOlYhA8AumYaSgpkCA1B4DmxhS5crOwjkYGT9xScn4aY4R07CYIwZAAAAAAAAAAAAgB9bOpuM1RdzLfBZe6dzzovn2onzfcgc506JGb/Gudp5Slk7x5Bxa14z+/ODsxNzqZlOzNXOU7qXW2CDeKx7sZnZ1noZREa9Rv4Z6VUPmm20F5lPH/u9IPeK7EzeWzvHHL1cROYxkM+S7EX+LvurnaM0q3q5KvdAX9e9mD/IMkcv8dkYldiLvq7fR7VzlKbzfbJfWu9FZ3y3X/Q7uMX3S+p7lPre5L5H8bh2jtJS/12m8uf6q51jrj2Tyz3VUat7BQAAAAAAAAAAAACAB3oXHWI=
+   eJzt1rsNwjAUhWFHlDxaOlYhA8AumYmCkmkCA1B4DmxhS5crOwjkYGT9xScn4aY4R07CYIwZAAAAAAAAAAAAgB9bOpuM1RdzLfBZe6dzLovn2onzfcgc586JGb/Gudp5Slk7x5Bxa14z+/ODsxNzqZlOzNXOU7qXW2CDeKx7sZnZ1noZREa9Rv4Z6VUPmm20F5lPH/u9IPeK7EzeWzvHHL2cROYxkM+S7EX+LvurnaM0q3q5KvdAX9e9mD/IMkcv8dkYldiLvq7fR7VzlKbzfbJfWu9FZ3y3X/Q7uMX3S+p7lPre5L5H8bh2jtJS/12m8uf6q51jrj2Tyz3VUat7BQAAAAAAAAAAAACAB448HaI=
   </data>
  </layer>
  <layer name="Ground 2" width="70" height="66">
   <data encoding="base64" compression="zlib">
-   eJzt080JwkAQhuEh4N/Bo57UBqzCErzr2XrUCsSK1AokWkD8uTvBhCzDRiEQEpL3gY9kJxPYHVgRAAAAAAAAAAAAAHXTM+u+p8fW7D9oh2VOivY1wdqsB4HISDPWrExfR2tdzTzIeoemrym2mp1mrzlpzkkunt5/35vkkDyPmqtTf8n3/Kn4/e2sw5L3VbW8uaTCH/WJ3qGpZhaUtbvqxHPZSLG5tAVzySycOxBp7ua7by43zbPUXdVPPJuHk/T8vhoAAAAAAAAAAAAAAABEPjgyMOM=
+   eJzt008KglAQx/FB6N+iZa2qi3QK97XuPNUJohNVJwjrAFntG0nxMTwLBFH0+4Ef+sYR3ht4IgAAAAAAAAAAAACaZmDWQ0+Prdl/0A1hQcr2tcHarEeByEQz1axMX09rfc0yyHvHpq8ttpqdZq85ac5pLp7ef9/b5JA+j5qrU3/J9/yZ5P3trKOK91W3orlkoh/1md6huWYRVLW7+iRz2Ui5uXQFc8mFzh14aO7mu28uN82z0l01TzKb2El2fl8NAAAAAAAAAAAAAAAAIh/xLjED
   </data>
  </layer>
  <layer name="Fringe" width="70" height="66">
   <data encoding="base64" compression="zlib">
-   eJzt070JgEAMBtBD13IBf0bQVpzGmb3CTpGAxcn5HoQ0KZIPkhIAAAAAAAAA1KNrYnNtcK5G+49vf9LLJWzOtZReooD17FvRLb5nzL8z+Z9bg1wuZAIAAAAAAAAA8M4BqtkD2Q==
+   eJzt0zEKgDAMBdCi1/MCal3FU3lWO7gpEnCo1PcgZMmQfEhKAAAAAAAAANCOoYvN9cG5Fu0/vv3JKJewXGqpvUQF69m3qlt8z1x+J/ufW5NcLmQCAAAAAAAAAPDOAeRJBEk=
   </data>
  </layer>
  <layer name="Over" width="70" height="66">
   <data encoding="base64" compression="zlib">
-   eJzt0k0KwjAQBtDYvSeo7dal7vRYXtSfI5lAS4tUqaC2pu/BUCZMYfKREAAAAAAAAIB/V6+m3gDmYT31AjPVz+VchHCJdY11K7o+jJhJff3Tzb/rk+9FLsPkMmxpuexi7UfMLS2X+o25XJTh9VtIb2XzxlxO0p2rWNvmW/X6dNdTU+WTmSrkl0kr3fsQugxSHR/6obP2HwAAAAAAAADIzR03chZo
+   eJzt0k0KwjAQBtDYvSeo7dal7vRYXtifo5hAS4tUqaC2pu/BUCZMYfKREAAAAAAAAIB/V6+m3gDmYT31AjPVz+VchHCJdY11K7o+jJhJff3Tzb/rk+9FLsPkMmxpuexi7UfMLS2X+o25XJTh9VtIb2XzxlxO0p2rWNvmW/X6dNdTU+WTmSrkl0kr3fsQugxSHR/6obP2HwAAAAAAAADIzR2nEhc4
   </data>
  </layer>
- <layer name="Collision" width="70" height="66">
+ <layer name="Collision" width="70" height="66" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzt0lEKgCAQQEGh+19O6D79RmCrQS3aLMyfgvuwbqVUAAAAAAAAAFjIdUbuZb/9yy6tRr3nVrCf3P2daLL3ePOv6BI3Gp3st+syTxNd/tWlZ19ddIl2fnoOAAAAAAAAgHkcmHKICg==
+   eJzt0lEKgCAQQEGh+19S6B79RmCrQS3aLMyfgvuwbqVUAAAAAAAAAFjIdUbuZb/9yy6tRr3nVrCf3P2daLL3ePOv6BI3Gp3st+syTxNd/tWlZ19ddIl2fnoOAAAAAAAAgHkcghGfeQ==
   </data>
  </layer>
- <objectgroup name="Object" width="70" height="66">
+ <objectgroup name="Object" visible="0">
   <object name="To First Level" type="warp" x="832" y="992" width="96" height="32">
    <properties>
     <property name="dest_map" value="001-2-2"/>
@@ -77,9 +77,9 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="70" height="66">
+ <layer name="Heights" width="70" height="66" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzt0jEOgCAQRUES7n8+9TZWFK5CMHTLTLIdFv/FUgAAAAAAAAAgl6M+7893mZ31++Lu2XcZxP8kbm56Ta7wLitd3nrbR6fL+LJaaaLLXl1m9uqiSzO7dacmAAAAAAAAALu4AReKgEw=
+   eJzt0jEOgCAQRUES7n9O9RZWFK5CMHTLTLIdFv/FUgAAAAAAAAAgl6M+7893mZ31++Lu2XcZxP8kbm56Ta7wLitd3nrbR6fL+LJaaaLLXl1m9uqiSzO7dacmAAAAAAAAALu4ARjgiaw=
   </data>
  </layer>
 </map>