diff options
| author | gumi <mekolat@users.noreply.github.com> | 2016-12-07 12:52:47 -0500 |
|---|---|---|
| committer | gumi <mekolat@users.noreply.github.com> | 2016-12-07 12:52:47 -0500 |
| commit | 8af31ed48eebc51fd32d62685ef495d27f543aba (patch) | |
| tree | 30dc5b579c08682243a32f0f5305e9f557963c8b /maps | |
| parent | 439230e1b8e379af092758df814a4ca458e673a5 (diff) | |
| parent | ecd4db89710e392fa90b1aaeec9c81d336690e7e (diff) | |
| download | clientdata-8af31ed48eebc51fd32d62685ef495d27f543aba.tar.gz clientdata-8af31ed48eebc51fd32d62685ef495d27f543aba.tar.bz2 clientdata-8af31ed48eebc51fd32d62685ef495d27f543aba.tar.xz clientdata-8af31ed48eebc51fd32d62685ef495d27f543aba.zip | |
Merge remote-tracking branch 'gumiko/fountain'
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/001-1.tmx | 2 | ||||
| -rw-r--r-- | maps/001-2-31.tmx | 6 | ||||
| -rw-r--r-- | maps/001-2-4.tmx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/maps/001-1.tmx b/maps/001-1.tmx index 9ac72df6..4842a763 100644 --- a/maps/001-1.tmx +++ b/maps/001-1.tmx @@ -1802,7 +1802,7 @@ <properties> <property name="dest_map" value="001-2-28"/> <property name="dest_x" value="29"/> - <property name="dest_y" value="39"/> + <property name="dest_y" value="42"/> <property name="npc_id" value="NPC_ARTIS_DOOR"/> <property name="trigger_x" value="2"/> <property name="trigger_y" value="3"/> diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx index b01f8d52..83acf99b 100644 --- a/maps/001-2-31.tmx +++ b/maps/001-2-31.tmx @@ -416,7 +416,7 @@ 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910, 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,913,913,913,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910, 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,913,913,913,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910, -910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910, +910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,910,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910, 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910, 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910, 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910, @@ -480,8 +480,8 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,896,896,896,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,895,895,895,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,894,894,894,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,893,893,893,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx index a14a1878..4413f485 100644 --- a/maps/001-2-4.tmx +++ b/maps/001-2-4.tmx @@ -473,7 +473,7 @@ <properties> <property name="dest_map" value="001-2-6"/> <property name="dest_x" value="57"/> - <property name="dest_y" value="34"/> + <property name="dest_y" value="36"/> </properties> </object> <object id="3" name="To Library Warehouse" type="ani_warp" x="1664" y="864" width="32" height="32"> |