diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2008-11-23 14:53:07 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2008-11-23 14:53:07 +0000 |
| commit | f1b4dcd3be035fb698780e6785270b403f1010ef (patch) | |
| tree | 9298a603ed15ad0727d8196e39fd92a94a0fe111 | |
| parent | 32c46b3fd9ab55af772044df705d5380510dc83f (diff) | |
| parent | 3de074ca0b2d830db91e084a7db25eae6c2157a2 (diff) | |
| download | clientdata-f1b4dcd3be035fb698780e6785270b403f1010ef.tar.gz clientdata-f1b4dcd3be035fb698780e6785270b403f1010ef.tar.bz2 clientdata-f1b4dcd3be035fb698780e6785270b403f1010ef.tar.xz clientdata-f1b4dcd3be035fb698780e6785270b403f1010ef.zip | |
Merge branch 'master' of git@gitorious.org:tmwdata/mainline
| -rw-r--r-- | maps/003-1.tmx | 7 | ||||
| -rw-r--r-- | maps/005-1.tmx | 2 | ||||
| -rw-r--r-- | maps/005-3.tmx | 2 | ||||
| -rw-r--r-- | maps/011-1.tmx | 4 | ||||
| -rw-r--r-- | maps/012-1.tmx | 7 |
5 files changed, 18 insertions, 4 deletions
diff --git a/maps/003-1.tmx b/maps/003-1.tmx index 1c965faa..8537aac5 100644 --- a/maps/003-1.tmx +++ b/maps/003-1.tmx @@ -65,6 +65,13 @@ <property name="DEST_Y" value="3600"/> </properties> </object> + <object name="ToBeach" type="WARP" x="4496" y="624" width="96" height="32"> + <properties> + <property name="DEST_MAP" value="004-1"/> + <property name="DEST_X" value="1184"/> + <property name="DEST_Y" value="3552"/> + </properties> + </object> <object name="Black Scorpion" type="SPAWN" x="3456" y="1248" width="640" height="640"> <properties> <property name="MAX_BEINGS" value="10"/> diff --git a/maps/005-1.tmx b/maps/005-1.tmx index 0dac2d43..fe7d9eed 100644 --- a/maps/005-1.tmx +++ b/maps/005-1.tmx @@ -82,7 +82,7 @@ <properties> <property name="DEST_MAP" value="005-3"/> <property name="DEST_X" value="1072"/> - <property name="DEST_Y" value="2672"/> + <property name="DEST_Y" value="2640"/> </properties> </object> <object name="ToDesertMountains" type="WARP" x="5344" y="3456" width="32" height="32"> diff --git a/maps/005-3.tmx b/maps/005-3.tmx index a8908f71..080639b9 100644 --- a/maps/005-3.tmx +++ b/maps/005-3.tmx @@ -57,7 +57,7 @@ <properties> <property name="DEST_MAP" value="005-1"/> <property name="DEST_X" value="2288"/> - <property name="DEST_Y" value="2448"/> + <property name="DEST_Y" value="2416"/> </properties> </object> </objectgroup> diff --git a/maps/011-1.tmx b/maps/011-1.tmx index 6ec57eb1..4bbc6198 100644 --- a/maps/011-1.tmx +++ b/maps/011-1.tmx @@ -70,8 +70,8 @@ <object name="ToWoodland" type="warp" x="960" y="1920" width="32" height="96"> <properties> <property name="dest_map" value="014-1"/> - <property name="dest_x" value="5776"/> - <property name="dest_y" value="2896"/> + <property name="dest_x" value="3392"/> + <property name="dest_y" value="2912"/> </properties> </object> <object name="ToWoodland" type="warp" x="1536" y="3328" width="64" height="32"> diff --git a/maps/012-1.tmx b/maps/012-1.tmx index daeba2c9..8805455a 100644 --- a/maps/012-1.tmx +++ b/maps/012-1.tmx @@ -71,6 +71,13 @@ <property name="dest_y" value="1456"/> </properties> </object> + <object name="ToCaves" type="warp" x="4704" y="2144" width="32" height="32"> + <properties> + <property name="dest_map" value="012-3"/> + <property name="dest_x" value="15168"/> + <property name="dest_y" value="3296"/> + </properties> + </object> <object name="ToCaves" type="warp" x="1312" y="1536" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> |