summaryrefslogtreecommitdiff
path: root/maps/001-2-28.tmx
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2016-11-25 03:35:22 +0000
committerReid <reidyaro@gmail.com>2016-11-25 03:35:22 +0000
commit7bd6ae5f092faced223db276d8ce1eb7569fe724 (patch)
tree1310eb332878d1bb2c78df497153be6a68f9d0f2 /maps/001-2-28.tmx
parent673b1186239fe73d4d6784995b60f2cb1a0c5714 (diff)
parentec932d3b780cfcba217597bcc601b123e7e9987f (diff)
downloadclientdata-7bd6ae5f092faced223db276d8ce1eb7569fe724.tar.gz
clientdata-7bd6ae5f092faced223db276d8ce1eb7569fe724.tar.bz2
clientdata-7bd6ae5f092faced223db276d8ce1eb7569fe724.tar.xz
clientdata-7bd6ae5f092faced223db276d8ce1eb7569fe724.zip
Merge branch 'fix-many-maps' into 'master'
Fix a bunch of warp placement See merge request !17
Diffstat (limited to 'maps/001-2-28.tmx')
-rw-r--r--maps/001-2-28.tmx56
1 files changed, 28 insertions, 28 deletions
diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx
index f8002348..e37c91ab 100644
--- a/maps/001-2-28.tmx
+++ b/maps/001-2-28.tmx
@@ -555,29 +555,6 @@
1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166
</data>
</layer>
- <objectgroup name="Object">
- <object id="1" name="To Artis Main Road" type="warp" x="928" y="1344" width="32" height="32">
- <properties>
- <property name="dest_map" value="001-1"/>
- <property name="dest_x" value="118"/>
- <property name="dest_y" value="89"/>
- </properties>
- </object>
- <object id="8" name="To Artis Right" type="warp" x="1952" y="1024" width="32" height="32">
- <properties>
- <property name="dest_map" value="001-1"/>
- <property name="dest_x" value="135"/>
- <property name="dest_y" value="83"/>
- </properties>
- </object>
- <object id="14" name="To Second Level" type="warp" x="1024" y="800" width="128" height="32">
- <properties>
- <property name="dest_map" value="001-2-29"/>
- <property name="dest_x" value="38"/>
- <property name="dest_y" value="34"/>
- </properties>
- </object>
- </objectgroup>
<layer name="Heights" width="87" height="68">
<data encoding="csv">
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,
@@ -605,12 +582,12 @@
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,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,1154,1154,1154,1154,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,1153,1153,1153,1153,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,1152,1152,1152,1152,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,1151,1151,1151,1151,0,0,0,0,0,0,0,1150,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,1151,1151,1151,1151,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,1151,1151,1151,1151,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,1150,1150,1150,1150,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,1150,1150,1150,1150,0,0,0,0,0,0,0,1150,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,1150,1150,1150,1150,1150,1150,0,0,1150,1150,1150,0,0,1150,0,0,1150,1150,1150,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,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1149,0,0,0,0,0,0,0,0,0,1149,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,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1149,0,0,0,0,0,0,0,0,0,1149,1150,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,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1149,0,0,0,0,0,0,0,0,0,1149,1150,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,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1149,0,0,0,0,0,0,0,0,0,1149,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,1150,1150,1150,1150,1150,1150,1150,1150,1150,0,0,1150,1150,1150,0,0,1150,0,0,1150,1150,1150,0,0,0,0,0,0,0,0,0,0,0,1149,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,
@@ -650,4 +627,27 @@
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 name="Object">
+ <object id="1" name="To Artis Main Road" type="warp" x="928" y="1344" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="001-1"/>
+ <property name="dest_x" value="118"/>
+ <property name="dest_y" value="89"/>
+ </properties>
+ </object>
+ <object id="8" name="To Artis Right" type="warp" x="1952" y="960" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="001-1"/>
+ <property name="dest_x" value="135"/>
+ <property name="dest_y" value="83"/>
+ </properties>
+ </object>
+ <object id="14" name="To Second Level" type="warp" x="1024" y="800" width="128" height="32">
+ <properties>
+ <property name="dest_map" value="001-2-29"/>
+ <property name="dest_x" value="38"/>
+ <property name="dest_y" value="34"/>
+ </properties>
+ </object>
+ </objectgroup>
</map>