diff options
| author | Wushin <pasekei@gmail.com> | 2016-12-20 15:39:53 +0000 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2016-12-20 15:39:53 +0000 |
| commit | fae74121c3993e74ea8626a0efc654f465a188f2 (patch) | |
| tree | bdff55c36878ae57e2d611b705c313529668c099 | |
| parent | 0d25a838098082aaff8bd05224ad70d906fef0ac (diff) | |
| parent | 51d156c7b93bf13db257c7e983ce9c1453233052 (diff) | |
| download | evol-tools-fae74121c3993e74ea8626a0efc654f465a188f2.tar.gz evol-tools-fae74121c3993e74ea8626a0efc654f465a188f2.tar.bz2 evol-tools-fae74121c3993e74ea8626a0efc654f465a188f2.tar.xz evol-tools-fae74121c3993e74ea8626a0efc654f465a188f2.zip | |
Merge branch 'script-warp-fix' into 'master'
Unify script_warp into warps
See merge request !19
| -rwxr-xr-x | hercules/tmx_converter.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hercules/tmx_converter.py b/hercules/tmx_converter.py index 6cc8329..5c60221 100755 --- a/hercules/tmx_converter.py +++ b/hercules/tmx_converter.py @@ -313,7 +313,7 @@ class ContentHandler(xml.sax.ContentHandler): ]) ) self.warp_cnt = True - else: + elif (not obj.npc_id == u'SCRIPT'): obj_name = "#%s_%s_%s" % (self.base, obj.x, obj.y) self.warps.write( SEPARATOR.join([ |