diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-04-11 20:37:16 +0000 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-04-11 20:37:16 +0000 |
| commit | 9f729be0833307c17e832db911389e8e8165e0bc (patch) | |
| tree | 2e834a60ea9b8769cb76f40734f1083f60d50c10 | |
| parent | b71c0ed7ea48d6426b087c926b8615ebfaea9a52 (diff) | |
| parent | b82c490fd561292a4592d974a32a6df59e9f9d17 (diff) | |
| download | evol-tools-9f729be0833307c17e832db911389e8e8165e0bc.tar.gz evol-tools-9f729be0833307c17e832db911389e8e8165e0bc.tar.bz2 evol-tools-9f729be0833307c17e832db911389e8e8165e0bc.tar.xz evol-tools-9f729be0833307c17e832db911389e8e8165e0bc.zip | |
Merge branch 'jesusalva/savepoint' into 'master'
Update savepointparticle function with serverdata!170 in mind.
In reality, this makes every save object react when you respawn on them.
A possible improvement would be to keep current behavior (without OnTouch event)
if INN is set to NO_INN, but I'm not sure if that is better to server or not.
See merge request evol/evol-tools!24
| -rwxr-xr-x | hercules/tmx_converter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hercules/tmx_converter.py b/hercules/tmx_converter.py index f9db092..3ac33c7 100755 --- a/hercules/tmx_converter.py +++ b/hercules/tmx_converter.py @@ -357,8 +357,8 @@ class ContentHandler(xml.sax.ContentHandler): obj_name = "%s_%s_%s" % (self.base, obj.x, obj.y) self.saves.write( SEPARATOR.join([ - '%s,%d,%d,0\tscript\t#save_%s\tNPC_SAVE_POINT,{\n' % (self.base, obj.x, obj.y, obj_name), - ' savepointparticle .map$, .x, .y, %s;\n close;\n\nOnInit:\n .distance = 2;\n .sex = G_OTHER;\n end;\n}\n' % (obj.inn), + '%s,%d,%d,0\tscript\t#save_%s\tNPC_SAVE_POINT,0,0,{\n' % (self.base, obj.x, obj.y, obj_name), + ' savepointparticle .map$, .x, .y, %s;\n close;\n\nOnInit:\n .distance = 2;\n .sex = G_OTHER;\n end;\n\nOnTouch:\n bedTouch();\n end;\n}\n' % (obj.inn), ]) ) self.save_cnt = True |