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/objecttypes.xml | |
| 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/objecttypes.xml')
| -rw-r--r-- | maps/objecttypes.xml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/maps/objecttypes.xml b/maps/objecttypes.xml index 31d1b5a9..72915863 100644 --- a/maps/objecttypes.xml +++ b/maps/objecttypes.xml @@ -4,12 +4,7 @@ <property name="dest_map" type="string"/> <property name="dest_x" type="string"/> <property name="dest_y" type="string"/> - </objecttype> - <objecttype name="ani_warp" color="#00ff7f"> - <property name="dest_map" type="string"/> - <property name="dest_x" type="string"/> - <property name="dest_y" type="string"/> - <property name="npc_id" type="string"/> + <property name="npc_id" type="string" default="WARP"/> <property name="trigger_x" type="string"/> <property name="trigger_y" type="string"/> </objecttype> |