diff options
author | Jesusaves <cpntb1@ymail.com> | 2020-05-24 13:01:12 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2020-05-24 13:01:12 -0300 |
commit | ae237876913c5be808ec97fbf27e47b3500672e0 (patch) | |
tree | b7fbc7507b39f0403a743664c6d40a1436e2c577 /maps/001-1.tmx | |
parent | 9ed33459a253f444973d2e633ba0f62d1c5d8dd7 (diff) | |
parent | fcc3ed1968d71f0b2086fea1595fc86f0787ca13 (diff) | |
download | clientdata-tulimmap.tar.gz clientdata-tulimmap.tar.bz2 clientdata-tulimmap.tar.xz clientdata-tulimmap.zip |
Merge branch 'master' into tulimmap without silly conflictstulimmap
Diffstat (limited to 'maps/001-1.tmx')
-rw-r--r-- | maps/001-1.tmx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/001-1.tmx b/maps/001-1.tmx index b7bac5c5..3fb779cb 100644 --- a/maps/001-1.tmx +++ b/maps/001-1.tmx @@ -1905,7 +1905,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <objectgroup id="11" name="Object" visible="0"> + <objectgroup id="11" name="Object"> <object id="1" name="To Library" type="warp" x="1632" y="2560" width="32" height="32"> <properties> <property name="dest_map" value="001-2-4"/> @@ -1989,7 +1989,7 @@ <properties> <property name="dest_map" value="001-2-28"/> <property name="dest_x" value="29"/> - <property name="dest_y" value="42"/> + <property name="dest_y" value="41"/> <property name="npc_id" value="NPC_ARTIS_DOOR"/> <property name="trigger_x" value="2"/> <property name="trigger_y" value="3"/> |