diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-19 21:12:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-19 21:12:03 +0300 |
| commit | 5c59f3c7e8bfd4b240d1a540e2d0cca406cdde42 (patch) | |
| tree | eaf439077a7e14f509862e93d805b0b2d78c9a05 /hercules | |
| parent | b44e413ccdec9f46c990582928f8fdd85bb96e3e (diff) | |
| download | evol-tools-5c59f3c7e8bfd4b240d1a540e2d0cca406cdde42.tar.gz evol-tools-5c59f3c7e8bfd4b240d1a540e2d0cca406cdde42.tar.bz2 evol-tools-5c59f3c7e8bfd4b240d1a540e2d0cca406cdde42.tar.xz evol-tools-5c59f3c7e8bfd4b240d1a540e2d0cca406cdde42.zip | |
hercules: parse shop names with non ascii chars.
Also allow use -1 as shop id.
Diffstat (limited to 'hercules')
| -rw-r--r-- | hercules/code/server/tmw/npcs.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hercules/code/server/tmw/npcs.py b/hercules/code/server/tmw/npcs.py index 32fb85b..24fe46c 100644 --- a/hercules/code/server/tmw/npcs.py +++ b/hercules/code/server/tmw/npcs.py @@ -25,8 +25,8 @@ scriptRe2 = re.compile("^(((?P<map>[^/](.+))[.]gat,([ ]*)(?P<x>[\d]+),([ ]*)(?P< "(((?P<class>[\d-]+)((,((?P<xs>[\d-]+),(?P<ys>[\d-]+)))|)(|,)(|[ \t]))|){(|[ ])$") shopRe = re.compile("^(?P<map>[^/](.+)),([ ]*)(?P<x>[\d]+),([ ]*)(?P<y>[\d]+),([ ]*)(?P<dir>[\d]+)(|,(?P<gender>[\d]+))" + - "[|](?P<tag>shop)[|](?P<name>[\w#' ]+)[|]" - "(?P<class>[\d]+),(?P<items>(.+))$") + "[|](?P<tag>shop)[|](?P<name>[^|]+)[|]" + "(?P<class>[\d-]+),(?P<items>(.+))$") shopRe2 = re.compile("^(?P<map>[^/](.+))[.]gat,([ ]*)(?P<x>[\d]+),([ ]*)(?P<y>[\d]+),([ ]*)(?P<dir>[\d]+)" + "[\t](?P<tag>shop)[\t](?P<name>[\w#'\\[\\] ]+)[\t]" |