diff options
| -rwxr-xr-x | hercules/tmx_converter.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hercules/tmx_converter.py b/hercules/tmx_converter.py index e84b6d5..5de3e1b 100755 --- a/hercules/tmx_converter.py +++ b/hercules/tmx_converter.py @@ -324,8 +324,6 @@ class ContentHandler(xml.sax.ContentHandler): h -= 1 elif obj_type == 'dyncollision': self.object = DynCollision() - x += w/2 - y += h/2 w -= 1 h -= 1 elif obj_type == 'switch': @@ -482,7 +480,7 @@ class ContentHandler(xml.sax.ContentHandler): '%s,%d,%d,0\t' % (self.base, obj.x, (obj.y)), 'script\t', '#%s\tNPC_SWITCH_%s,{\n\tcallfunc "%s"%s;\n' % (obj_name, ifte(obj.enabled, "OFFLINE", "ONLINE"), obj.callfunc, ifte(obj.args != '', ", %s" % obj.args, "")), - '\tsetnpcdisplay %s, NPC_SWITCH_%s;\n\tend;\nOnInit:\n\t.distance=%d;\n}\n' % (obj_name, ifte(obj.enabled, "ONLINE", "OFFLINE"), obj.distance), + '\tsetnpcdisplay "#%s", NPC_SWITCH_%s;\n\tend;\nOnInit:\n\t.distance=%d;\n}\n' % (obj_name, ifte(obj.enabled, "ONLINE", "OFFLINE"), obj.distance), ]) ) self.save_cnt = True @@ -504,7 +502,7 @@ class ContentHandler(xml.sax.ContentHandler): elif isinstance(obj, Trap): obj_name = "%s_%s_%s" % (self.base, obj.x, obj.y) npcid = ifte(obj.disarmtime, "NPC_TRAP", "NPC_TRAP_ONLINE") - timer = ifte(obj.disarmtime, "OnTimer%d:\n\tstopnpctimer; setnpctimer 0; setnpcdisplay %s, NPC_TRAP; end;\n" % (obj.disarmtime*1000, obj_name), "") + timer = ifte(obj.disarmtime, "OnTimer%d:\n\tstopnpctimer; setnpctimer 0; setnpcdisplay \"#%s\", NPC_TRAP; end;\n" % (obj.disarmtime*1000, obj_name), "") self.confs.write( SEPARATOR.join([ '\n', |