diff options
| -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]" |