From: Kimmo R. <ki...@us...> - 2008-02-06 20:39:05
|
Update of /cvsroot/arianne/stendhal/tiled/interiors/fado In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20545/tiled/interiors/fado Modified Files: church.tmx lovers_room_0.tmx lovers_room_13.tmx lovers_room_5.tmx Log Message: updated the maps that use flames.png Index: lovers_room_0.tmx =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/interiors/fado/lovers_room_0.tmx,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** lovers_room_0.tmx 30 Dec 2007 23:23:32 -0000 1.13 --- lovers_room_0.tmx 6 Feb 2008 20:38:31 -0000 1.14 *************** *** 121,128 **** <image source="../../tileset/item/furniture/light/flames.png" trans="ff00ff"/> </tileset> ! <tileset name="../../tileset/logic/collision.png" firstgid="234" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/collision.png"/> </tileset> ! <tileset name="vegetable.png" firstgid="235" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/item/vegetable.png"/> </tileset> --- 121,128 ---- <image source="../../tileset/item/furniture/light/flames.png" trans="ff00ff"/> </tileset> ! <tileset name="../../tileset/logic/collision.png" firstgid="238" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/collision.png"/> </tileset> ! <tileset name="vegetable.png" firstgid="239" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/item/vegetable.png"/> </tileset> *************** *** 154,163 **** <layer name="objects" width="25" height="25" opacity="0.9"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGAWjYBSMglEwCgYXeD3QDhhCYDiGFb38RAt76BkfAJo64JHECQAA </data> </layer> <layer name="collision" width="25" height="25" visible="0" opacity="0.25"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAL2VXQ7AIAiDuf9RPYWvhMhfpZAQXdL6sSnuiMhZSHmMop4zr9bauaeNdF5tnj9afypYjOybshjTPGTvphgdL4vR8TD3ocqaeEfkntmstxvo+oi+2h9WW9FXtb/RqSfyRP8GtM+Rfs/qQRnaY+eTwWRsnKutPvdYjLzUcrGYxAkAAA== </data> </layer> --- 154,163 ---- <layer name="objects" width="25" height="25" opacity="0.9"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGAWjYBSMglEwCgYXeD/QDhhCYDiGFb38RAt76BkfABMMj2vECQAA </data> </layer> <layer name="collision" width="25" height="25" visible="0" opacity="0.25"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAL2VXQ7AIAiDuf9hPYOvhMhfpZAQXdL6sSnuiMhZSHmMop4zr9bauaeNdF5tnj9afypYjOybshjTPGTvphgdL4vR8TD3ocqaeEfkntmstxvo+oi+2h9WW9FXtb/RqSfyRP8GtM+Rfs/qQRnaY+eTwWRsnKutPvdYjLzRaQ9xxAkAAA== </data> </layer> Index: lovers_room_13.tmx =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/interiors/fado/lovers_room_13.tmx,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** lovers_room_13.tmx 4 Dec 2007 18:32:50 -0000 1.11 --- lovers_room_13.tmx 6 Feb 2008 20:38:31 -0000 1.12 *************** *** 49,77 **** <image source="../../tileset/item/furniture/light/flames.png" trans="ff00ff"/> </tileset> ! <tileset name="../../tileset/item/furniture/picture/large_island.png" firstgid="122" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/picture/large_island.png"/> </tileset> ! <tileset name="../../tileset/item/drink/red_wine.png" firstgid="124" tilewidth="32" tileheight="32"> <image source="../../tileset/item/drink/red_wine.png"/> </tileset> ! <tileset name="../../tileset/item/food/meals_1.png" firstgid="128" tilewidth="32" tileheight="32"> <image source="../../tileset/item/food/meals_1.png"/> </tileset> ! <tileset name="../../tileset/item/food/meals_2.png" firstgid="130" tilewidth="32" tileheight="32"> <image source="../../tileset/item/food/meals_2.png"/> </tileset> ! <tileset name="../../tileset/item/drink/white_wine.png" firstgid="132" tilewidth="32" tileheight="32"> <image source="../../tileset/item/drink/white_wine.png"/> </tileset> ! <tileset name="../../tileset/item/candle/lamp.png" firstgid="135" tilewidth="32" tileheight="32"> <image source="../../tileset/item/candle/lamp.png"/> </tileset> ! <tileset name="../../tileset/item/candle/candelabra.png" firstgid="136" tilewidth="32" tileheight="32"> <image source="../../tileset/item/candle/candelabra.png"/> </tileset> ! <tileset name="../../tileset/logic/collision.png" firstgid="137" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/collision.png"/> </tileset> ! <tileset name="mushroom.png" firstgid="138" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/item/mushroom.png"/> </tileset> --- 49,77 ---- <image source="../../tileset/item/furniture/light/flames.png" trans="ff00ff"/> </tileset> ! <tileset name="../../tileset/item/furniture/picture/large_island.png" firstgid="126" tilewidth="32" tileheight="32"> <image source="../../tileset/item/furniture/picture/large_island.png"/> </tileset> ! <tileset name="../../tileset/item/drink/red_wine.png" firstgid="128" tilewidth="32" tileheight="32"> <image source="../../tileset/item/drink/red_wine.png"/> </tileset> ! <tileset name="../../tileset/item/food/meals_1.png" firstgid="132" tilewidth="32" tileheight="32"> <image source="../../tileset/item/food/meals_1.png"/> </tileset> ! <tileset name="../../tileset/item/food/meals_2.png" firstgid="134" tilewidth="32" tileheight="32"> <image source="../../tileset/item/food/meals_2.png"/> </tileset> ! <tileset name="../../tileset/item/drink/white_wine.png" firstgid="136" tilewidth="32" tileheight="32"> <image source="../../tileset/item/drink/white_wine.png"/> </tileset> ! <tileset name="../../tileset/item/candle/lamp.png" firstgid="139" tilewidth="32" tileheight="32"> <image source="../../tileset/item/candle/lamp.png"/> </tileset> ! <tileset name="../../tileset/item/candle/candelabra.png" firstgid="140" tilewidth="32" tileheight="32"> <image source="../../tileset/item/candle/candelabra.png"/> </tileset> ! <tileset name="../../tileset/logic/collision.png" firstgid="141" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/collision.png"/> </tileset> ! <tileset name="mushroom.png" firstgid="142" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/item/mushroom.png"/> </tileset> *************** *** 88,92 **** <layer name="2_object" width="25" height="25"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgwARVQFyNRXwUjIJRQD+QR2Pz64C4HUrTAoDc3wDE9Uh8WoBmIO6gkdkw0AjEtQwQ/9ACgMKmhQESHy0MtAurIiAuBuISGpkPA7ROu6NgFIwCCAAA6M9OlMQJAAA= </data> </layer> --- 88,92 ---- <layer name="2_object" width="25" height="25"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgwAR1QFyPRXwUjIJRQD+QR2Pzm4C4G0rTAoDc3wLEzUh8WoB2IO6hkdkw0ArEjQwQ/9ACgMKmgwESHx0MtAurIiAuBuISGpkPA7ROu6NgFIwCCAAARxMN+cQJAAA= </data> </layer> *************** *** 103,112 **** <layer name="objects" width="25" height="25" opacity="0.9"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgoA/ohmJa2zGYQRcBehSMglEwCkbBKKAE9AxTu+gBhqJ/APkyWDXECQAA </data> </layer> <layer name="collision" width="25" height="25" visible="0" opacity="0.25"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAOtkYGDopAMmFxBjLi47iLWbEjuwmUUuQLcPmzilgJpmjdoxtO2gRv4kZM5IsYOcsoZUO4gFA20HNcFwsIMeYUVvO2hpF7Z6l9r2USMvE2M+PTAA00xgF8QJAAA= </data> </layer> --- 103,112 ---- <layer name="objects" width="25" height="25" opacity="0.9"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgoA/oh2Ja2zGYQR8BehSMglEwCkbBKKAETBimdtEDDEX/AAA9yrEmxAkAAA== </data> </layer> <layer name="collision" width="25" height="25" visible="0" opacity="0.25"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAOtlYGDopQMmFxBjLi47iLWbEjuwmUUuQLcPmzilgJpmjdoxtO2gRv4kZM5IsYOcsoZUO4gFA20HNcFwsIMeYUVvO2hpF7Z6l9r2USMvE2M+PTAA8k828cQJAAA= </data> </layer> Index: lovers_room_5.tmx =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/interiors/fado/lovers_room_5.tmx,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** lovers_room_5.tmx 1 Dec 2007 14:35:27 -0000 1.8 --- lovers_room_5.tmx 6 Feb 2008 20:38:31 -0000 1.9 *************** *** 100,110 **** <image source="../../tileset/item/furniture/light/flames.png" trans="ff00ff"/> </tileset> ! <tileset name="../../tileset/logic/item/vegetable.png" firstgid="502" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/item/vegetable.png"/> </tileset> ! <tileset name="../../tileset/logic/collision.png" firstgid="513" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/collision.png"/> </tileset> ! <tileset name="bread" firstgid="514" tilewidth="32" tileheight="32"> <image source="../../tileset/item/food/bread.png"/> </tileset> --- 100,110 ---- <image source="../../tileset/item/furniture/light/flames.png" trans="ff00ff"/> </tileset> ! <tileset name="../../tileset/logic/item/vegetable.png" firstgid="506" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/item/vegetable.png"/> </tileset> ! <tileset name="../../tileset/logic/collision.png" firstgid="517" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/collision.png"/> </tileset> ! <tileset name="bread" firstgid="518" tilewidth="32" tileheight="32"> <image source="../../tileset/item/food/bread.png"/> </tileset> *************** *** 121,125 **** <layer name="2_object" width="25" height="25"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAO2TSwrCMBCGE8HzmZP0Si50405BUGtx4bMKVigeyBk6tTHMaBK7EPWDnxk6zT95KqVUotWdmZVzrKG+B22Y/9ya7TugfAJxrqsosYXaAbRj/nlWG76Ye5tM9WOUyKleQLyAStAR1AOthLFJ4DrQq9up/AyNvUI8Cz59+D4SJGHIr6S512sz1LuNHifyxv3BvN4zzHNmXEyPUL6lBxJ6r36ZsbVXC90ohKVuxPnaoHcaeT6Z00MidP4uPj3++PPufvqcJ/bIIvuknneeu+c+xL6rNpHe46f6ctwA6yHdEsQJAAA= </data> </layer> --- 121,125 ---- <layer name="2_object" width="25" height="25"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAO2TSwrCMBCGE3eezpykV3KhG3cKglqLC59VsELxQM7QqY1hRpPYhagf/MzQaf7JUymlEq3uzKycYw31PWjD/OfWbN8B5ROIc11FiS3UDqAd88+z2vDF3Ntkqh+jRE71AuIFVIKOoB5oJYxNAteBXt1O5Wdo7BXiWfDpw/eRIAlDfiXNvV6bod5t9DiRN+4P5vWeYZ4z42J6hPItPZDQe/XLjK29WuhGISx1I87XBr3TyPPJnB4SofN38enxx59399PnPLFHFtkn9bzz3D33IfZdtYn0Hj/Vl+MG7Y5ITMQJAAA= </data> </layer> *************** *** 136,145 **** <layer name="objects" width="25" height="25" opacity="0.9"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGAWjYBRQAhgH2gGjgG7gG5GR/Z/MREGs+eTaQ6r5pNpDrvmk2kNrQKk7RtMJbcwfBZgAAGv4QUvECQAA </data> </layer> <layer name="collision" width="25" height="25" visible="0" opacity="0.25"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNkYmBgpAOGAWxilAJi7UbXg08vshpkdaS6C5sbCakh1w585lLLDlz6aeEPbGmHUjvISauDzQ5SwagdpNtBjTKLFLMo8Rux5lEadtR0Myl2Dlc76BEf9EpX1MofuOygNqBFOwSX+bTGAG7OTObECQAA </data> </layer> --- 136,145 ---- <layer name="objects" width="25" height="25" opacity="0.9"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGAWjYBRQAhgH2gGjgG7gF5GRzcxEW/PJtYdU80m1h1zzSbWH1oBSd4ymE9qYPwowAQDNvBrIxAkAAA== </data> </layer> <layer name="collision" width="25" height="25" visible="0" opacity="0.25"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNlYmBgpQOGAWxilAJi7UbXg08vshpkdaS6C5sbCakh1w585lLLDlz6aeEPbGmHUjvISauDzQ5SwagdpNtBjTKLFLMo8Rux5lEadtR0Myl2Dlc76BEf9EpX1MofuOygNqBFOwSX+bTGACn7jE7ECQAA </data> </layer> Index: church.tmx =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/interiors/fado/church.tmx,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** church.tmx 3 Dec 2007 13:59:59 -0000 1.9 --- church.tmx 6 Feb 2008 20:38:31 -0000 1.10 *************** *** 52,62 **** <image source="../../tileset/item/furniture/light/flames.png" trans="ff00ff"/> </tileset> ! <tileset name="../../tileset/logic/portal.png" firstgid="382" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/portal.png"/> </tileset> ! <tileset name="../../tileset/logic/collision.png" firstgid="389" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/collision.png"/> </tileset> ! <tileset name="../../tileset/logic/protection.png" firstgid="390" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/protection.png"/> </tileset> --- 52,62 ---- <image source="../../tileset/item/furniture/light/flames.png" trans="ff00ff"/> </tileset> ! <tileset name="../../tileset/logic/portal.png" firstgid="386" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/portal.png"/> </tileset> ! <tileset name="../../tileset/logic/collision.png" firstgid="393" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/collision.png"/> </tileset> ! <tileset name="../../tileset/logic/protection.png" firstgid="394" tilewidth="32" tileheight="32"> <image source="../../tileset/logic/protection.png"/> </tileset> *************** *** 83,97 **** <layer name="objects" width="24" height="24"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGAWjYBSMglEwCkbBKBiaoIkRFRMLAIuc1j8ACQAA </data> </layer> <layer name="collision" width="24" height="24" opacity="0.47"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGtlZGBoHWYYBGA0MWxkGpd5tAC43ItNDSluQ/cPITeQI4fLfGxhis0f+NTiMx+XGwmlAWLdj0sNOWmDEjXk6qUkvZIT/pSAUfNHzR81f+ibT217yK3zyTEDAHprHqQACQAA </data> </layer> <layer name="protection" width="24" height="24" visible="0" opacity="0.43"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAO3DAQ0AAAwCIF/e3AY5bPSSqqo+On4e/LgACQAA </data> </layer> --- 83,97 ---- <layer name="objects" width="24" height="24"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAGNgGAWjYBSMglEwCkbBKBiaoI0RFRMLAFp3p2sACQAA </data> </layer> <layer name="collision" width="24" height="24" opacity="0.47"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAOtkZGDoHGYYBGA0MWxkGpd5tAC43ItNDSluQ/cPITeQI4fLfGxhis0f+NTiMx+XGwmlAWLdj0sNOWmDEjXk6qUkvZIT/pSAUfNHzR81f+ibT217yK3zyTEDALY5fRQACQAA </data> </layer> <layer name="protection" width="24" height="24" visible="0" opacity="0.43"> <data encoding="base64" compression="gzip"> ! H4sIAAAAAAAAAO3DAQ0AAAwCIF/f1AY5bPSSqqo+OknKrmQACQAA </data> </layer> |