summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/025-2.tmx13
1 files changed, 7 insertions, 6 deletions
diff --git a/maps/025-2.tmx b/maps/025-2.tmx
index 22b97d98..220ab700 100644
--- a/maps/025-2.tmx
+++ b/maps/025-2.tmx
@@ -369,7 +369,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
</data>
</layer>
- <layer id="2" name="fringe" width="200" height="140">
+ <layer id="2" name="Fringe" width="200" height="140">
<data encoding="csv">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,256,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,256,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,475,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,271,0,0,272,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,271,0,0,272,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,475,0,
@@ -466,7 +466,7 @@
1007,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,1004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,508,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,682,0,0,0,0,0,0,0,714,715,0,0,0,714,715,0,0,0,0,0,714,715,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,1004,0,0,0,0,0,0,1005,1006,1007,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,1004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,492,459,459,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,802,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,682,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,
0,0,0,1002,1003,1004,0,0,0,0,1002,1003,1004,0,0,0,0,0,0,0,465,0,465,465,0,0,0,0,0,0,0,1005,1006,1007,1002,1003,1004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,492,476,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,818,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,682,0,0,0,655,650,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,1002,1003,1004,481,0,481,481,1002,1003,1004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,492,459,459,459,459,459,476,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,796,834,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,682,0,0,0,655,666,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,1004,481,0,481,481,1002,1003,1004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,492,459,459,459,459,459,476,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,796,834,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,682,0,0,0,655,666,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,459,459,459,459,459,459,459,459,459,459,460,0,714,715,0,0,0,492,476,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,813,796,794,0,0,908,850,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,682,0,0,0,655,682,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,1005,1006,1007,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,508,459,459,459,459,459,459,476,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,810,812,810,0,0,924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,655,682,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1002,1003,1004,0,0,0,0,0,0,1005,1006,1007,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,1004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,826,828,826,0,0,940,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,655,682,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1270,7 +1270,7 @@
</object>
</objectgroup>
<objectgroup id="16" name="Spawns 3">
- <object id="89" name="Vanity Pixie" type="spawn" x="5760" y="1376" width="2560" height="736" rotation="180">
+ <object id="89" name="Vanity Pixie" type="spawn" x="5792" y="1376" width="2592" height="736" rotation="180">
<properties>
<property name="death" value="60000"/>
<property name="max_beings" value="4"/>
@@ -1290,9 +1290,10 @@
<objectgroup color="#ffff00" id="8" name="warps">
<object id="20" name="To Fortress Town" type="warp" x="3072" y="768" width="256" height="32">
<properties>
- <property name="map" value="005"/>
- <property name="x" value="99"/>
- <property name="y" value="122"/>
+ <property name="dest_map" value="005"/>
+ <property name="dest_x" value="99"/>
+ <property name="dest_y" value="122"/>
+ <property name="npc_id" value="SCRIPT"/>
</properties>
</object>
<object id="21" name="To Cave" type="warp" x="1120" y="768" width="32" height="32">