Menu
▾
▴
[Arianne-commits] stendhal/tiled/interiors/nalwor house3.tmx, 1.19, 1.20
|
From: tigertoes <tig...@us...> - 2012-11-01 07:09:02
|
Update of /cvsroot/arianne/stendhal/tiled/interiors/nalwor
In directory vz-cvs-4.sog:/tmp/cvs-serv31774/tiled/interiors/nalwor
Modified Files:
house3.tmx
Log Message:
found a map which had been changed but not comitted - bed maintenance
Index: house3.tmx
===================================================================
RCS file: /cvsroot/arianne/stendhal/tiled/interiors/nalwor/house3.tmx,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** house3.tmx 17 Sep 2012 19:58:52 -0000 1.19
--- house3.tmx 1 Nov 2012 07:09:00 -0000 1.20
***************
*** 16,88 ****
<image source="../../tileset/building/wall/int_wall_purple.png" trans="ff00ff" width="64" height="320"/>
</tileset>
! <tileset firstgid="68" name="../../tileset/furniture/bed/large_red.png" tilewidth="32" tileheight="32">
! <image source="../../tileset/furniture/bed/large_red.png" trans="ff00ff" width="64" height="96"/>
! </tileset>
! <tileset firstgid="74" 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="110" name="../../tileset/furniture/table/table_with_hob.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/table/table_with_hob.png" trans="ff00ff" width="160" height="32"/>
</tileset>
! <tileset firstgid="115" name="../../tileset/furniture/other/drawer.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/other/drawer.png" width="64" height="96"/>
</tileset>
! <tileset firstgid="121" name="../../tileset/furniture/bed/side_on.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/bed/side_on.png" width="64" height="32"/>
</tileset>
! <tileset firstgid="123" name="../../tileset/item/pot/pot_grey.png" tilewidth="32" tileheight="32">
<image source="../../tileset/item/pot/pot_grey.png" width="32" height="32"/>
</tileset>
! <tileset firstgid="124" name="../../tileset/furniture/other/drawer_with_mirror.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/other/drawer_with_mirror.png" width="32" height="64"/>
</tileset>
! <tileset firstgid="126" name="../../tileset/item/pot/barrel.png" tilewidth="32" tileheight="32">
<image source="../../tileset/item/pot/barrel.png" width="32" height="64"/>
</tileset>
! <tileset firstgid="128" name="../../tileset/furniture/chair/stool.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/chair/stool.png" width="32" height="32"/>
</tileset>
! <tileset firstgid="129" name="../../tileset/plant/bush/bushes.png" tilewidth="32" tileheight="32">
<image source="../../tileset/plant/bush/bushes.png" trans="ffffff" width="160" height="64"/>
</tileset>
! <tileset firstgid="139" 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="143" name="../../tileset/furniture/table/long_side_on_pale.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/table/long_side_on_pale.png" width="96" height="32"/>
</tileset>
! <tileset firstgid="146" name="../../tileset/furniture/picture/small.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/picture/small.png" width="96" height="32"/>
</tileset>
! <tileset firstgid="149" name="../../tileset/furniture/table/orb_table.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/table/orb_table.png" width="32" height="32"/>
</tileset>
! <tileset firstgid="150" name="../../tileset/item/food/meals_1.png" tilewidth="32" tileheight="32">
<image source="../../tileset/item/food/meals_1.png" width="64" height="32"/>
</tileset>
! <tileset firstgid="152" name="../../tileset/item/documents/book.png" tilewidth="32" tileheight="32">
<image source="../../tileset/item/documents/book.png" width="64" height="64"/>
</tileset>
! <tileset firstgid="156" 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="159" 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="162" name="../../tileset/logic/creature/elf.png" tilewidth="32" tileheight="32">
<image source="../../tileset/logic/creature/elf.png" width="320" height="32"/>
</tileset>
! <tileset firstgid="172" name="../../tileset/logic/portal.png" tilewidth="32" tileheight="32">
<image source="../../tileset/logic/portal.png" width="224" height="32"/>
</tileset>
! <tileset firstgid="179" name="../../tileset/logic/item/vegetable.png" tilewidth="32" tileheight="32">
<image source="../../tileset/logic/item/vegetable.png" width="416" height="32"/>
</tileset>
! <tileset firstgid="192" name="../../tileset/logic/item/resources.png" tilewidth="32" tileheight="32">
<image source="../../tileset/logic/item/resources.png" width="192" height="32"/>
</tileset>
! <tileset firstgid="198" name="../../tileset/logic/collision.png" tilewidth="32" tileheight="32">
<image source="../../tileset/logic/collision.png" width="32" height="32"/>
</tileset>
<layer name="0_floor" width="20" height="20">
<data encoding="base64" compression="gzip">
--- 16,88 ----
<image source="../../tileset/building/wall/int_wall_purple.png" trans="ff00ff" width="64" height="320"/>
</tileset>
! <tileset firstgid="68" 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="104" name="../../tileset/furniture/table/table_with_hob.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/table/table_with_hob.png" trans="ff00ff" width="160" height="32"/>
</tileset>
! <tileset firstgid="109" name="../../tileset/furniture/other/drawer.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/other/drawer.png" width="64" height="96"/>
</tileset>
! <tileset firstgid="115" name="../../tileset/furniture/bed/side_on.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/bed/side_on.png" width="64" height="32"/>
</tileset>
! <tileset firstgid="117" name="../../tileset/item/pot/pot_grey.png" tilewidth="32" tileheight="32">
<image source="../../tileset/item/pot/pot_grey.png" width="32" height="32"/>
</tileset>
! <tileset firstgid="118" name="../../tileset/furniture/other/drawer_with_mirror.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/other/drawer_with_mirror.png" width="32" height="64"/>
</tileset>
! <tileset firstgid="120" name="../../tileset/item/pot/barrel.png" tilewidth="32" tileheight="32">
<image source="../../tileset/item/pot/barrel.png" width="32" height="64"/>
</tileset>
! <tileset firstgid="122" name="../../tileset/furniture/chair/stool.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/chair/stool.png" width="32" height="32"/>
</tileset>
! <tileset firstgid="123" name="../../tileset/plant/bush/bushes.png" tilewidth="32" tileheight="32">
<image source="../../tileset/plant/bush/bushes.png" trans="ffffff" width="160" height="64"/>
</tileset>
! <tileset firstgid="133" 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="137" name="../../tileset/furniture/table/long_side_on_pale.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/table/long_side_on_pale.png" width="96" height="32"/>
</tileset>
! <tileset firstgid="140" name="../../tileset/furniture/picture/small.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/picture/small.png" width="96" height="32"/>
</tileset>
! <tileset firstgid="143" name="../../tileset/furniture/table/orb_table.png" tilewidth="32" tileheight="32">
<image source="../../tileset/furniture/table/orb_table.png" width="32" height="32"/>
</tileset>
! <tileset firstgid="144" name="../../tileset/item/food/meals_1.png" tilewidth="32" tileheight="32">
<image source="../../tileset/item/food/meals_1.png" width="64" height="32"/>
</tileset>
! <tileset firstgid="146" name="../../tileset/item/documents/book.png" tilewidth="32" tileheight="32">
<image source="../../tileset/item/documents/book.png" width="64" height="64"/>
</tileset>
! <tileset firstgid="150" 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="153" 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="156" name="../../tileset/logic/creature/elf.png" tilewidth="32" tileheight="32">
<image source="../../tileset/logic/creature/elf.png" width="320" height="32"/>
</tileset>
! <tileset firstgid="166" name="../../tileset/logic/portal.png" tilewidth="32" tileheight="32">
<image source="../../tileset/logic/portal.png" width="224" height="32"/>
</tileset>
! <tileset firstgid="173" name="../../tileset/logic/item/vegetable.png" tilewidth="32" tileheight="32">
<image source="../../tileset/logic/item/vegetable.png" width="416" height="32"/>
</tileset>
! <tileset firstgid="186" name="../../tileset/logic/item/resources.png" tilewidth="32" tileheight="32">
<image source="../../tileset/logic/item/resources.png" width="192" height="32"/>
</tileset>
! <tileset firstgid="192" name="../../tileset/logic/collision.png" tilewidth="32" tileheight="32">
<image source="../../tileset/logic/collision.png" width="32" height="32"/>
</tileset>
+ <tileset firstgid="193" name="double_red" tilewidth="32" tileheight="32">
+ <image source="../../tileset/furniture/bed/double_red.png" width="64" height="128"/>
+ </tileset>
<layer name="0_floor" width="20" height="20">
<data encoding="base64" compression="gzip">
***************
*** 92,106 ****
<layer name="1_terrain" width="20" height="20">
<data encoding="base64" compression="gzip">
! H4sIAAAAAAAAC9XQywqCQBSA4fMIZZRWu4JSqF03dWvabWe+hvX+q/7FLAaphXoEG/iY4TD8MDMXkSHGZq+ef/l2f4YRYhxbiuCY3l6arRIvvLFT6NnrX3o+AoXeAktssFXorbCW/v+fds9V7E2k/+/tqpfgrNhLkSn2Lrgq9UIcarjhjoc1O5neFIOacjxRVOYePm2hvO9ABgAA
</data>
</layer>
<layer name="2_object" width="20" height="20">
<data encoding="base64" compression="gzip">
! H4sIAAAAAAAAC72PywqAIBAA/eneVFJ06l3UpT62PSh4WM10c2AIJceVsXc2cLf4TyUC449nTCRgqqxboYmT8H4J1+xnYO7YvAL0CseWDmy+HtG1N4IzuCiu4GTZw947IGLclnfYQt3DKD3OVmRT6Hs1cU/CPbohacSXgwczz939PQwhD3JzhehABgAA
</data>
</layer>
<layer name="3_roof" width="20" height="20">
<data encoding="base64" compression="gzip">
! H4sIAAAAAAAAC2NgIA3MJ1E9IbCAyuYtpLJ5o2AU0ALUDLQDRsEooAIAALeIMRhABgAA
</data>
</layer>
--- 92,106 ----
<layer name="1_terrain" width="20" height="20">
<data encoding="base64" compression="gzip">
! H4sIAAAAAAAAC9XQzQqCQBRA4fsIZZRWu4JSqF1/6tbcWa9RvaVpPVdnMYtBaqFewQY+ZrgMB2bmIjLE2OzV8y/f7s8wQoxjSxEc09tLs3XDHQ/sFHr2+peej0Cht8ASG2wVeiuspf//p91zFXsT6f97u+rleCr2CpSKvRfeSr0QhxoSnJFas5PpTTGoKcMF18rcwwcUbWTUQAYAAA==
</data>
</layer>
<layer name="2_object" width="20" height="20">
<data encoding="base64" compression="gzip">
! H4sIAAAAAAAAC2NgIAx6gLiXCHXIIB+IC0jUgw8UAnEREr8WivGBCVS0HwaqcIgXA3EJmWZOpYN5pWSahQtgc18rFkyuee1A3AnEXUi4G4g7iDQPm3/bsGBsYBqRdhALqG0eNlBOgd4KqrkCt3mVVDYPBnDlx8EGaqA0yL39DPjdXU9751ANAAC2QAYWQAYAAA==
</data>
</layer>
<layer name="3_roof" width="20" height="20">
<data encoding="base64" compression="gzip">
! H4sIAAAAAAAAC2NgIA3MJFE9ITCLyubNprJ5o2AU0AKUDbQDRsEooAIAADKWIl1ABgAA
</data>
</layer>
***************
*** 112,121 ****
<layer name="objects" width="20" height="20">
<data encoding="base64" compression="gzip">
! H4sIAAAAAAAAC2NgGP5g80A7gIpgORCvGGhHjAKagkVQPApoAw7gkVtJL0cggaU0MHMDDczEBgBy7OJWQAYAAA==
</data>
</layer>
<layer name="collision" width="20" height="20" opacity="0.37">
<data encoding="base64" compression="gzip">
! H4sIAAAAAAAACzvGwMBwbAhhGEDnI4tjU4PLHHIBIfdRwyxqm0cJoLaZxJhHin20dhslgNrmUdvMwe5faucPfGZSyzxs8tjYpLiN1HKSGuYQwgA49yR4QAYAAA==
</data>
</layer>
--- 112,121 ----
<layer name="objects" width="20" height="20">
<data encoding="base64" compression="gzip">
! H4sIAAAAAAAAC2NgGP5g7UA7gIpgIRAvGmhHjAKagjlQPApoA3bhkVtMN1cgwHwamLmKBmZiAwD0eD9vQAYAAA==
</data>
</layer>
<layer name="collision" width="20" height="20" opacity="0.37">
<data encoding="base64" compression="gzip">
! H4sIAAAAAAAACzvAwMBwYAhhGEDnI4tjU4PLHHIBNreRay4us6htHiWA2mYSYx4p9tHabZQAaptHbTOpaRa9zKPUXFqbh00eG5sYs8jB1DKHEAYA5GSimUAGAAA=
</data>
</layer>
|