diff options
| author | gumi <mekolat@users.noreply.github.com> | 2017-01-08 15:01:33 -0500 |
|---|---|---|
| committer | gumi <mekolat@users.noreply.github.com> | 2017-01-08 15:01:33 -0500 |
| commit | 05c7bb8645e76eb7aafe9c1984ba6cd836a9bc3e (patch) | |
| tree | 76a44e23af06a876230f0a5d965bffcd356f76dc /maps/001-2-32.tmx | |
| parent | 68d2b60c10c060676664bf4eec79f9b1ae1768a1 (diff) | |
| parent | 2a3eccf0550b606203599cc33c8a574860ceab11 (diff) | |
| download | clientdata-05c7bb8645e76eb7aafe9c1984ba6cd836a9bc3e.tar.gz clientdata-05c7bb8645e76eb7aafe9c1984ba6cd836a9bc3e.tar.bz2 clientdata-05c7bb8645e76eb7aafe9c1984ba6cd836a9bc3e.tar.xz clientdata-05c7bb8645e76eb7aafe9c1984ba6cd836a9bc3e.zip | |
Merge remote-tracking branch 'wushin/unify-warps'
Diffstat (limited to 'maps/001-2-32.tmx')
| -rw-r--r-- | maps/001-2-32.tmx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/maps/001-2-32.tmx b/maps/001-2-32.tmx index 4e3f7f32..7d301524 100644 --- a/maps/001-2-32.tmx +++ b/maps/001-2-32.tmx @@ -489,11 +489,12 @@ <property name="dest_y" value="33"/> </properties> </object> - <object id="24" name="To Fight Room" type="script_warp" x="1056" y="928" width="32" height="32"> + <object id="24" name="To Fight Room" type="warp" x="1056" y="928" width="32" height="32"> <properties> <property name="dest_map" value="001-2-35"/> <property name="dest_x" value="24"/> <property name="dest_y" value="29"/> + <property name="npc_id" value="SCRIPT"/> </properties> </object> <object id="27" name="graphics/particles/warp.xml" type="particle_effect" x="1056" y="928" width="32" height="32"/> |