diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-19 21:10:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-19 21:10:23 +0300 |
| commit | b44e413ccdec9f46c990582928f8fdd85bb96e3e (patch) | |
| tree | 41cceb4f8c1212ec31368127193092e88e36ee2c | |
| parent | ffae72db7aa5eeeac3bead8c0f505b73f4e2b6a4 (diff) | |
| download | evol-tools-b44e413ccdec9f46c990582928f8fdd85bb96e3e.tar.gz evol-tools-b44e413ccdec9f46c990582928f8fdd85bb96e3e.tar.bz2 evol-tools-b44e413ccdec9f46c990582928f8fdd85bb96e3e.tar.xz evol-tools-b44e413ccdec9f46c990582928f8fdd85bb96e3e.zip | |
hercules: parse monster names with non ascii names.
| -rw-r--r-- | hercules/code/server/tmw/npcs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hercules/code/server/tmw/npcs.py b/hercules/code/server/tmw/npcs.py index 2d8abdb..32fb85b 100644 --- a/hercules/code/server/tmw/npcs.py +++ b/hercules/code/server/tmw/npcs.py @@ -46,7 +46,7 @@ warpRe3 = re.compile("^(?P<map>[^/](.+)),([ ]*)(?P<x>[\d]+),([ ]*)(?P<y>[\d]+)[| "(?P<tag>warp)[|](?P<xs>[\d-]+),(?P<ys>[\d-]+),(?P<targetmap>[^/](.+)),([ ]*)(?P<targetx>[\d]+),([ ]*)(?P<targety>[\d]+)$") monsterRe = re.compile("^(?P<map>[^/](.+)),([ ]*)(?P<x>[\d]+),([ ]*)(?P<y>[\d]+),([ ]*)(?P<xs>[\d-]+),(?P<ys>[\d-]+)[|]" - "(?P<tag>monster)[|](?P<name>[\w#' ]+)[|]" + "(?P<tag>monster)[|](?P<name>[^|]+)[|]" "(?P<class>[\d]+),(?P<num>[\d]+),(?P<delay1>[\d]+)ms,(?P<delay2>[\d]+)ms(|,(?P<label>[\w+-:#]+))$") monsterRe2 = re.compile("^(?P<map>[^/](.+))[.]gat,([ ]*)(?P<x>[\d]+),([ ]*)(?P<y>[\d]+),([ ]*)(?P<xs>[\d-]+),(?P<ys>[\d-]+)\t" |