From: Katie <ky...@us...> - 2009-04-06 17:01:29
|
Update of /cvsroot/arianne/stendhal/tiled/interiors/ados In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5688/interiors/ados Modified Files: house_72.tmx Log Message: put the new tiles from ornamental_border2.png onto ornamental border, correctly tiling together. fix the 2 maps that used them and remove now defunct ornamental_border2 Index: house_72.tmx =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/interiors/ados/house_72.tmx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** house_72.tmx 2 Apr 2009 21:36:50 -0000 1.1 --- house_72.tmx 6 Apr 2009 17:00:48 -0000 1.2 *************** *** 82,151 **** <image source="../../tileset/item/furniture/bed/large_white2_top_sheet.png"/> </tileset> ! <tileset name="border" firstgid="238" tilewidth="32" tileheight="32"> ! <image source="../../tileset/building/wall/ornamental_border.png"/> ! </tileset> ! <tileset name="sink" firstgid="246" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/sink/dark_side_on.png"/> </tileset> ! <tileset name="lamp" firstgid="252" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/light/weird_lamp.png"/> </tileset> ! <tileset name="bed" firstgid="264" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/bed/large_white2.png"/> </tileset> ! <tileset name="armchair" firstgid="270" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/chair/armchair_red.png"/> </tileset> ! <tileset name="red rug" firstgid="282" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/carpet/red_carpet.png"/> </tileset> ! <tileset name="sofa" firstgid="291" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/chair/sofa_red.png"/> </tileset> ! <tileset name="picture" firstgid="297" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/picture/city_picture.png"/> </tileset> ! <tileset name="paintings" firstgid="301" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/picture/oil_paintings.png"/> </tileset> ! <tileset name="grass" firstgid="317" tilewidth="32" tileheight="32"> <image source="../../tileset/plant/grass_2.png"/> </tileset> ! <tileset name="flowers" firstgid="329" tilewidth="32" tileheight="32"> <image source="../../tileset/plant/flower/hothouse_flowers.png"/> </tileset> ! <tileset name="edge" firstgid="401" tilewidth="32" tileheight="32"> <image source="../../tileset/building/wall/bricked_edges.png"/> </tileset> ! <tileset name="table" firstgid="416" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/table/square.png"/> </tileset> ! <tileset name="sheepfood" firstgid="417" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/item/sheepfood.png"/> </tileset> ! <tileset name="veg" firstgid="418" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/item/vegetable.png"/> </tileset> ! <tileset name="table" firstgid="429" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/table/wooden.png"/> </tileset> <layer name="0_floor" width="16" height="22"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAALvCwMBwhQY4g0T1LFA9yBhZPg0NY7NvKOvHhUXQ2NewqHmPB4vgkYPpf4cHi+CRQ3ZDKxI7C4qxuR9ZbhSPYhh2YUTggdA/UBgAqmzkF4AFAAA= </data> </layer> <layer name="1_terrain" width="16" height="22"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAKXTuQ3CQBCF4XFEAyTcR4cgQQUcBQAZATExNEDmgJgbOgBz5bwVYwkNjPHujvQFPn6vZWsjIjo7usINGtC11IQ7932YUvKsYM020BN9hu/bKf2Wrxn7H/2/8e0PcGQn0begoyDlfJv7R4q1tXlC5NGn+f8jcTyDOX3/fzMLi7Xl9w8t3132S8/eduI+y/IBUQGKgVtfQleGimUfv38VXQ3qjr02OX7eRDxX9oPgbey5/tChT9p/ms/9d3Fk9t8LP4YmM4AFAAA= </data> </layer> <layer name="2_object" width="16" height="22"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgQIB1DKjAgBGVbw7kW6CJoQNpIJZB4j8CYlMg/gfE1kC9NowQNjpYicSWB2INKPspEJsAMQtQHwcQczJC2OQALqA+bhx6vwHxDwL6eYB6eXHo/wnEv5H4vGjyyG4m1v0dQNwJxF3EKccAPVC6jwi1nljEJkDpSUCsCXSzFh537wPi/VD6AFRsCpSeBsTaQL06QLwByN6IRf8uIN4NxXvwuHMTEG/GIu4MpTlx6AsB4lA85sLAWqAbeYhQRy0wC4jnE1CjDHSTChSrosXBPCL0qwH1qEOxBpr+RUC8GIc+EaBaUTLzGghIAPXyQdkLoOYIAWlhLGbWQ8VqCNgnBpQXx6ImFCiWSKRbtYhTRhcAAAlsrdeABQAA </data> </layer> <layer name="3_roof" width="16" height="22"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGDngDRC/JVPvPxzswQx6gLgXiPvI1D8BiCcC8SQi1B6F0spk2nWSgLwfEPuTafZgB7NpZK4AI+VmCGIxg58Cc/mo4CZ1yo0YNAAAZGtDKYAFAAA= </data> </layer> --- 82,151 ---- <image source="../../tileset/item/furniture/bed/large_white2_top_sheet.png"/> </tileset> ! <tileset name="sink" firstgid="238" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/sink/dark_side_on.png"/> </tileset> ! <tileset name="lamp" firstgid="244" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/light/weird_lamp.png"/> </tileset> ! <tileset name="bed" firstgid="256" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/bed/large_white2.png"/> </tileset> ! <tileset name="armchair" firstgid="262" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/chair/armchair_red.png"/> </tileset> ! <tileset name="red rug" firstgid="274" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/carpet/red_carpet.png"/> </tileset> ! <tileset name="sofa" firstgid="283" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/chair/sofa_red.png"/> </tileset> ! <tileset name="picture" firstgid="289" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/picture/city_picture.png"/> </tileset> ! <tileset name="paintings" firstgid="293" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/picture/oil_paintings.png"/> </tileset> ! <tileset name="grass" firstgid="309" tilewidth="32" tileheight="32"> <image source="../../tileset/plant/grass_2.png"/> </tileset> ! <tileset name="flowers" firstgid="321" tilewidth="32" tileheight="32"> <image source="../../tileset/plant/flower/hothouse_flowers.png"/> </tileset> ! <tileset name="edge" firstgid="393" tilewidth="32" tileheight="32"> <image source="../../tileset/building/wall/bricked_edges.png"/> </tileset> ! <tileset name="table" firstgid="408" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/table/square.png"/> </tileset> ! <tileset name="sheepfood" firstgid="409" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/item/sheepfood.png"/> </tileset> ! <tileset name="veg" firstgid="410" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/item/vegetable.png"/> </tileset> ! <tileset name="table" firstgid="421" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/table/wooden.png"/> </tileset> + <tileset name="border" firstgid="422" tilewidth="32" tileheight="32"> + <image source="../../tileset/building/wall/ornamental_border.png"/> + </tileset> <layer name="0_floor" width="16" height="22"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAALvCwMBwhQY4g0T1LFA9yBhZPg0NY7NvKOvHhUXQ2NewqFnOiBuL4JGH6V/GiBuL4JFHdkMrEjsLirG5H1luFI9iGLZhROCB0D9QGADO1UKYgAUAAA== </data> </layer> <layer name="1_terrain" width="16" height="22"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAKWTOQ7CMBBFxxU1+3JLkOAELAWUIHECCAl0cAE6Cmp2uArfykRCAw5eRnrKOPHzWBlNpIgWnqxADNpENHCkAxL2R8hjyo8TODMXMBR+gffdDP6Vv2nuP/x/Eeo/wJN5Cb+LvG+ADO977K+VRXFDbOBGAb5N/2divQU7+u6/jr1Dbfn/D453l/4x0HeNzK9QSgl5Wa8t+yH9KvIaqDv62f0beDZBy9M3RZHPm4tzpT9WKdPA+hMPP2/+THzO39ITPX9vHh2brYAFAAA= </data> </layer> <layer name="2_object" width="16" height="22"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgQIB1DKhAgxGVrw/kG6CJoQNpIJZB4j8CYlMg/gbExkC9JowQNjpYicSWB9kNZT8FYhMg/gPiAPUyMkLZZAAmoF5mHO5/B8QfCOhnAeplxaH/IxB/RuLzosn/wcHGBzqAuBOIu4hUjw56oHQfEWo9sYhNgNKTgFgR6G8lPHG/D4j3Q+kDULEpUHoaECsD9aoA8QYgeyMW/buAeDcU78Hjzk1AvBmLuDOU5sShLwSIQ/GYCwNLgW7kIUIdtcAsIJ5PQI000E0yUCyLFgfziNAvB9QjD8UKaPoXAfFiHPp4gGp5CeR3fEAAqJcPyp4BNYcLSHNjMbMcKlZCwD4+oDw/FjW+QLFIIt2qRZwyugAA8VF3joAFAAA= </data> </layer> <layer name="3_roof" width="16" height="22"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGDngDRC/JVPvNxzswQx6gLgXiPvI1D8BiCcC8SQi1B6F0spk2nWSgLwfEPuTafZgB7NpZC4HI+VmcGIxg50Cc9mo4CZ1yo0YNAAAyZ5//YAFAAA= </data> </layer> *************** *** 157,161 **** <layer name="objects" width="16" height="22" visible="0"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGAWjYBSMgoEFCxmpY84qKplDLwAAbNeN5YAFAAA= </data> </layer> --- 157,161 ---- <layer name="objects" width="16" height="22" visible="0"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGAWjYBSMgoEFMxmpY84iKplDLwAA4+o8rYAFAAA= </data> </layer> |