From: bluelads <blu...@us...> - 2012-06-02 20:43:48
|
Update of /cvsroot/arianne/stendhal/tiled/interiors/ados In directory vz-cvs-4.sog:/tmp/cvs-serv26196/tiled/interiors/ados Modified Files: buraucrazy_1.tmx Log Message: Deleting collision tiles in int_ados_town_hall_1 at (2,4) for giving players a chance to walk around players who might block the stairs (Fixes bug ID: 3531327) Index: buraucrazy_1.tmx =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/interiors/ados/buraucrazy_1.tmx,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** buraucrazy_1.tmx 5 Oct 2011 22:04:29 -0000 1.18 --- buraucrazy_1.tmx 2 Jun 2012 20:43:45 -0000 1.19 *************** *** 1,128 **** <?xml version="1.0" encoding="UTF-8"?> - <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="40" height="19" tilewidth="32" tileheight="32"> <tileset firstgid="1" name="../../tileset/furniture/carpet/carpets_2.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/carpet/carpets_2.png" trans="ff00ff"/> </tileset> <tileset firstgid="13" name="../../tileset/furniture/carpet/carpets.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/carpet/carpets.png"/> </tileset> <tileset firstgid="21" name="../../tileset/ground/indoor/brown_hole.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/ground/indoor/brown_hole.png" trans="ff00ff"/> </tileset> <tileset firstgid="33" name="../../tileset/building/wall/int_wall_pale.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/wall/int_wall_pale.png" trans="ff00ff"/> </tileset> <tileset firstgid="49" name="../../tileset/building/wall/int_wall_purple.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/wall/int_wall_purple.png" trans="ff00ff"/> </tileset> <tileset firstgid="69" name="../../tileset/item/pot/barrel_flat.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/item/pot/barrel_flat.png" trans="ff00ff"/> </tileset> <tileset firstgid="70" name="../../tileset/building/stairs/int_ew.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/stairs/int_ew.png" trans="ff00ff"/> </tileset> <tileset firstgid="79" name="../../tileset/furniture/table/tree_stump_table.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/table/tree_stump_table.png" trans="ff00ff"/> </tileset> <tileset firstgid="83" name="../../tileset/plant/indoor/pot_plant.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/plant/indoor/pot_plant.png"/> </tileset> <tileset firstgid="86" name="../../tileset/furniture/table/wooden_rectangular.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/table/wooden_rectangular.png" trans="ff00ff"/> </tileset> <tileset firstgid="92" name="../../tileset/furniture/chair/wooden_pale.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/chair/wooden_pale.png"/> </tileset> <tileset firstgid="96" name="../../tileset/building/entrance/pale_red_ns.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/entrance/pale_red_ns.png" trans="ff00ff"/> </tileset> <tileset firstgid="132" name="../../tileset/furniture/shelve/bright_bookshelf.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/shelve/bright_bookshelf.png"/> </tileset> <tileset firstgid="141" name="../../tileset/plant/indoor/flower_vase.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/plant/indoor/flower_vase.png"/> </tileset> <tileset firstgid="144" name="../../tileset/item/brush.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/item/brush.png"/> </tileset> <tileset firstgid="147" name="../../tileset/furniture/kitchen/warmer.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/kitchen/warmer.png"/> </tileset> <tileset firstgid="149" name="../../tileset/plant/indoor/flowering_plant.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/plant/indoor/flowering_plant.png"/> </tileset> <tileset firstgid="151" name="../../tileset/furniture/carpet/rug_border.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/carpet/rug_border.png"/> </tileset> <tileset firstgid="160" name="../../tileset/ground/eye.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/ground/eye.png" trans="ffffff"/> </tileset> <tileset firstgid="169" name="../../tileset/building/stairs/stairs.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/stairs/stairs.png"/> </tileset> <tileset firstgid="173" name="../../tileset/building/wall/bricked_edges.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/wall/bricked_edges.png" trans="ff00ff"/> </tileset> <tileset firstgid="188" name="../../tileset/item/food/rustic_meals.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/item/food/rustic_meals.png" trans="ff00ff"/> </tileset> <tileset firstgid="190" name="../../tileset/furniture/picture/large_island.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/picture/large_island.png"/> </tileset> <tileset firstgid="192" name="../../tileset/item/documents/book.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/item/documents/book.png"/> </tileset> <tileset firstgid="196" name="../../tileset/furniture/picture/small.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/picture/small.png"/> </tileset> <tileset firstgid="199" name="../../tileset/furniture/light/small_lamp.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/light/small_lamp.png"/> </tileset> <tileset firstgid="200" name="../../tileset/building/entrance/detail_ns.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/entrance/detail_ns.png" trans="ff00ff"/> </tileset> <tileset firstgid="206" name="../../tileset/logic/portal.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/logic/portal.png"/> </tileset> <tileset firstgid="213" name="../../tileset/logic/collision.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/logic/collision.png"/> </tileset> <tileset firstgid="214" name="protection" tilewidth="32" tileheight="32"> ! <image source="../../tileset/logic/protection.png"/> </tileset> <layer name="0_floor" width="40" height="19"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAO3OKw4AIRCD4RGI9Rh2ee39T0klIXOATqj4koqKP5lZktAeh/fLG/XF6zs3C7aeiAq88BG0eCo06AQtEfsGTPgJWkTkDgue4IWp4AsAAA== </data> </layer> <layer name="1_terrain" width="40" height="19"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAM2Vy0rDUBCGz6to3VQLdaO16s671ksFra0V1NdQ1167EYsXrOJK8Cn9AwaGYc5kJkTIwEdI5iPzhzBJLYQwrjAFahmOx/P4iTMBFsGcwAKoZDgez+NTZzbINWNwJO8a3IBb4tBr3H8yzl4Fa2A94hwY892Be/BAHHpNe+4fJd8G2ARbimPJl1UWX3JaYBvsGO7Td8zrs/O8+azOIeiAI6PXMfpF5euCHjg2ej2jX1Q+j3fCjjH/GbyA14x7rhScz+q/gS/wrji7YI9kzPt9GSjZBkq+byVfkqkN9iNz50GDcArOwDloMo/2GgLUT/ONwAf4jORLS3q/k2CMQSs5rxKP9ySqwmxa1v2oB/nfTcvTo0z/zR7mzLcU4v/4C3AJrpw9znJktnfn/qMelV4Z8sWK7zjfzTKQ7ri0m2Uh2fFfMfqMmOALAAA= </data> </layer> <layer name="2_object" width="40" height="19"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGF5gHxDvh7KP0tnudUh4sIENQLwTiNcD8Q4g3jiwzsELQG4dbO4DuWkLAyRuNzMMPveBwHokTAgcItLM41C1x8l11CgYMWAPEO8daEeMIJBFphy9QDGZcjAwgVoOoRGYONAOGAWjgAAAAIo93NLgCwAA </data> </layer> <layer name="3_roof" width="40" height="19"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGD4gmEh1LUDcCsRtBMRgYDKF7oKBECqZMwpGwSigPyC2fBkoMFq+jByQCcQngTibRDl6gSIgPgPEJSTKjYJRMAqoBwCQBPoa4AsAAA== </data> </layer> <layer name="objects" width="40" height="19"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAO3JMQ0AAAgDsPmXhyIc7CHhat8m8GeODwBAtx4muUjgCwAA </data> </layer> ! <layer name="collision" width="40" height="19" opacity="0.37"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAO2SUQoAIAhDvf/9uk//sXKzIsEEP8Llnlkzs/ZzO1EwGqRDd1R/VF+dlTlUPqbnWPM0bK+oPvJ+r/lYDTvHbJfV+aK6097Z+Nj9eL2UWU7zeX+Jqd3ab1U+5J+Jj/HOFpn5lH/xc50da2NVwuALAAA= </data> </layer> ! <layer name="protection" width="40" height="19" opacity="0.24"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAO3DAQkAAAwEoesf8POsx1Bw1VRV1RcP1c6b8OALAAA= </data> </layer> --- 1,127 ---- <?xml version="1.0" encoding="UTF-8"?> <map version="1.0" orientation="orthogonal" width="40" height="19" tilewidth="32" tileheight="32"> <tileset firstgid="1" name="../../tileset/furniture/carpet/carpets_2.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/carpet/carpets_2.png" trans="ff00ff" width="128" height="96"/> </tileset> <tileset firstgid="13" name="../../tileset/furniture/carpet/carpets.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/carpet/carpets.png" width="128" height="64"/> </tileset> <tileset firstgid="21" name="../../tileset/ground/indoor/brown_hole.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/ground/indoor/brown_hole.png" trans="ff00ff" width="96" height="128"/> </tileset> <tileset firstgid="33" name="../../tileset/building/wall/int_wall_pale.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/wall/int_wall_pale.png" trans="ff00ff" width="64" height="256"/> </tileset> <tileset firstgid="49" name="../../tileset/building/wall/int_wall_purple.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/wall/int_wall_purple.png" trans="ff00ff" width="64" height="320"/> </tileset> <tileset firstgid="69" name="../../tileset/item/pot/barrel_flat.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/item/pot/barrel_flat.png" trans="ff00ff" width="32" height="32"/> </tileset> <tileset firstgid="70" name="../../tileset/building/stairs/int_ew.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/stairs/int_ew.png" trans="ff00ff" width="96" height="96"/> </tileset> <tileset firstgid="79" name="../../tileset/furniture/table/tree_stump_table.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/table/tree_stump_table.png" trans="ff00ff" width="64" height="64"/> </tileset> <tileset firstgid="83" name="../../tileset/plant/indoor/pot_plant.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/plant/indoor/pot_plant.png" width="32" height="96"/> </tileset> <tileset firstgid="86" name="../../tileset/furniture/table/wooden_rectangular.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/table/wooden_rectangular.png" trans="ff00ff" width="96" height="64"/> </tileset> <tileset firstgid="92" name="../../tileset/furniture/chair/wooden_pale.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/chair/wooden_pale.png" width="64" height="64"/> </tileset> <tileset firstgid="96" name="../../tileset/building/entrance/pale_red_ns.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/entrance/pale_red_ns.png" trans="ff00ff" width="288" height="128"/> </tileset> <tileset firstgid="132" name="../../tileset/furniture/shelve/bright_bookshelf.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/shelve/bright_bookshelf.png" width="96" height="96"/> </tileset> <tileset firstgid="141" name="../../tileset/plant/indoor/flower_vase.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/plant/indoor/flower_vase.png" width="96" height="32"/> </tileset> <tileset firstgid="144" name="../../tileset/item/brush.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/item/brush.png" width="32" height="96"/> </tileset> <tileset firstgid="147" name="../../tileset/furniture/kitchen/warmer.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/kitchen/warmer.png" width="32" height="64"/> </tileset> <tileset firstgid="149" name="../../tileset/plant/indoor/flowering_plant.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/plant/indoor/flowering_plant.png" width="64" height="32"/> </tileset> <tileset firstgid="151" name="../../tileset/furniture/carpet/rug_border.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/carpet/rug_border.png" width="96" height="96"/> </tileset> <tileset firstgid="160" name="../../tileset/ground/eye.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/ground/eye.png" trans="ffffff" width="96" height="96"/> </tileset> <tileset firstgid="169" name="../../tileset/building/stairs/stairs.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/stairs/stairs.png" width="64" height="64"/> </tileset> <tileset firstgid="173" name="../../tileset/building/wall/bricked_edges.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/wall/bricked_edges.png" trans="ff00ff" width="160" height="96"/> </tileset> <tileset firstgid="188" name="../../tileset/item/food/rustic_meals.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/item/food/rustic_meals.png" trans="ff00ff" width="64" height="32"/> </tileset> <tileset firstgid="190" name="../../tileset/furniture/picture/large_island.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/picture/large_island.png" width="64" height="32"/> </tileset> <tileset firstgid="192" name="../../tileset/item/documents/book.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/item/documents/book.png" width="64" height="64"/> </tileset> <tileset firstgid="196" name="../../tileset/furniture/picture/small.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/picture/small.png" width="96" height="32"/> </tileset> <tileset firstgid="199" name="../../tileset/furniture/light/small_lamp.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/furniture/light/small_lamp.png" width="32" height="32"/> </tileset> <tileset firstgid="200" name="../../tileset/building/entrance/detail_ns.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/entrance/detail_ns.png" trans="ff00ff" width="96" height="64"/> </tileset> <tileset firstgid="206" name="../../tileset/logic/portal.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/logic/portal.png" width="224" height="32"/> </tileset> <tileset firstgid="213" name="../../tileset/logic/collision.png" tilewidth="32" tileheight="32"> ! <image source="../../tileset/logic/collision.png" width="32" height="32"/> </tileset> <tileset firstgid="214" name="protection" tilewidth="32" tileheight="32"> ! <image source="../../tileset/logic/protection.png" width="32" height="32"/> </tileset> <layer name="0_floor" width="40" height="19"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAC+3OKw4AIRCD4RGI9Rh2ee39T0klIXOATqj4koqKP5lZktAeh/fLG/XF6zs3C7aeiAq88BG0eCo06AQtEfsGTPgJWkTkDgue4IWp4AsAAA== </data> </layer> <layer name="1_terrain" width="40" height="19"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAC82Vy0rDUBCGz6to3VQLdaO16s671ksFra0V1NdQ1167EYsXrOJK8Cn9AwaGYc5kJkTIwEdI5iPzhzBJLYQwrjAFahmOx/P4iTMBFsGcwAKoZDgez+NTZzbINWNwJO8a3IBb4tBr3H8yzl4Fa2A94hwY892Be/BAHHpNe+4fJd8G2ARbimPJl1UWX3JaYBvsGO7Td8zrs/O8+azOIeiAI6PXMfpF5euCHjg2ej2jX1Q+j3fCjjH/GbyA14x7rhScz+q/gS/wrji7YI9kzPt9GSjZBkq+byVfkqkN9iNz50GDcArOwDloMo/2GgLUT/ONwAf4jORLS3q/k2CMQSs5rxKP9ySqwmxa1v2oB/nfTcvTo0z/zR7mzLcU4v/4C3AJrpw9znJktnfn/qMelV4Z8sWK7zjfzTKQ7ri0m2Uh2fFfMfqMmOALAAA= </data> </layer> <layer name="2_object" width="40" height="19"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAC2NgGF5gHxDvh7KP0tnudUh4MIKdQLweiHcA8cYBdgs+sIFhcLpvCwMkbjczDE73rUfChMAhIs08DlV7nFxHjYIRA/YA8d6BdsQIAllkytELFJMpBwMTqOUQGoGJA+2AUTAKCAAAJmHZuuALAAA= </data> </layer> <layer name="3_roof" width="40" height="19"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAC2NgGD4gmEh1LUDcCsRtBMRgYDKF7oKBECqZMwpGwSigPyC2fBkoMFq+jByQCcQngTibRDl6gSIgPgPEJSTKjYJRMAqoBwCQBPoa4AsAAA== </data> </layer> <layer name="objects" width="40" height="19"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAC+3JMQ0AAAgDsPmXhyIc7CHhat8m8GeODwBAtx4muUjgCwAA </data> </layer> ! <layer name="collision" width="40" height="19" visible="0" opacity="0.37"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAC+1SQQoAIAjz///zP93FcprBIIVdcm0rVRHRwTW8Qjgez7uT9Y90dpov8iGathdxUK0qv/J/DPkQjj3LzHTy1Xnd3mz50PlEWpm3dOeLdgnpvZrvr/k8f6Z8iDdbMefL7MXgjAUmNpXz4AsAAA== </data> </layer> ! <layer name="protection" width="40" height="19" visible="0" opacity="0.24"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAC+3DAQkAAAwEoesf8POsx1Bw1VRV1RcP1c6b8OALAAA= </data> </layer> |