From 75a3a4d0e455aa237ea03acf0a0617dd296ca170 Mon Sep 17 00:00:00 2001 From: Andreas Kirschbaum Date: Sun, 25 Jul 2021 17:21:15 +0200 Subject: [PATCH] Fix syntax errors in @match lines --- scorn/houses/cornerbrook | 2 +- scorn/misc/mercenaries | 4 ++-- scorn/misc/prison.1 | 4 ++-- start/newbieshouse | 4 ++-- unlinked/chadfire/towns/castle/post_office | 5 +++-- whalingoutpost/houses/fisherhousesouthwest | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scorn/houses/cornerbrook b/scorn/houses/cornerbrook index c4dd08fe7..c6331881b 100644 --- a/scorn/houses/cornerbrook +++ b/scorn/houses/cornerbrook @@ -3620,7 +3620,7 @@ Yup lost my walking stick - have ya seen it? Ya say yer sick? That's a darn shame! I get a touch of the wind myself sometimes... @match ear You looking for deer? Used to be a woodsman myself. Try the woods to the east - lots of game there... -match woods|east +@match woods|east Don't mumble - out with it now... @match * Hunn? Speak up there! diff --git a/scorn/misc/mercenaries b/scorn/misc/mercenaries index a127468b0..86eaa4ccf 100644 --- a/scorn/misc/mercenaries +++ b/scorn/misc/mercenaries @@ -8,7 +8,7 @@ enter_x 8 enter_y 16 msg Created: 1997-04-16 -Modified: 2013-03-17 Kevin Zheng +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch grass_only @@ -962,7 +962,7 @@ y 6 end arch ninja_1 msg -@match +@match * Hehe... nobody can defeat me! endmsg x 8 diff --git a/scorn/misc/prison.1 b/scorn/misc/prison.1 index 3d29acbf3..abe8b4277 100644 --- a/scorn/misc/prison.1 +++ b/scorn/misc/prison.1 @@ -8,7 +8,7 @@ enter_x 9 enter_y 23 msg Created: 1998-12-26 Anthony Thyssen (anthony@cit.gu.edu.au) -Modified: 2014-09-15 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch cobblestones2 @@ -813,7 +813,7 @@ msg I am innocent I tell ye! Innocent! @match innocent I don't know how that lady's purse ended up in my pocket! I was framed! -@match framed|frame| +@match framed|frame Wise guy ha! Well Phooey to you too. I want my lawyer. @match * I didn't do it diff --git a/start/newbieshouse b/start/newbieshouse index 4ef08495f..09a714c0c 100644 --- a/start/newbieshouse +++ b/start/newbieshouse @@ -10,7 +10,7 @@ enter_x 9 enter_y 4 msg Created: 2003-07-31 Tchize -Modified: 2021-05-30 Nicolas Weeger +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch dungeon_magic @@ -2496,7 +2496,7 @@ msg You can find beds to reality at inns scattered all over the world. @match talk You can talk to other players by using the commands 'chat', 'shout', 'say', and 'tell'. To hear chat messages, use the command 'listen 10' (set by default). If you only want to hear shouts, use 'listen 9'. -@help +@match help If you get stuck, try talking to other players. And, as a parting word to the wise, don't forget the most useful command: 'help'. @match * So you're ready for the world of Crossfire? To go outside, use the knowledge you've just learned in the tutorials. There is no way back once you pass through the gate ahead. Do you have any questions? diff --git a/unlinked/chadfire/towns/castle/post_office b/unlinked/chadfire/towns/castle/post_office index eb0f1e8cd..c133cf831 100644 --- a/unlinked/chadfire/towns/castle/post_office +++ b/unlinked/chadfire/towns/castle/post_office @@ -5,7 +5,7 @@ height 11 msg Created: 2010-09-14 Chad partially copied from 'commander gros' map -Modified: 2010-09-14 Chad +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch woodfloor @@ -249,7 +249,8 @@ end arch c_woman name Woman msg -@match * I'm on a break. +@match * +I'm on a break. endmsg x 3 y 3 diff --git a/whalingoutpost/houses/fisherhousesouthwest b/whalingoutpost/houses/fisherhousesouthwest index 6c50d2913..aba6a5876 100644 --- a/whalingoutpost/houses/fisherhousesouthwest +++ b/whalingoutpost/houses/fisherhousesouthwest @@ -8,7 +8,7 @@ enter_x 1 enter_y 8 msg Created: 2008-11-23 -Modified: 2012-05-31 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch invis_exit @@ -990,7 +990,7 @@ end arch man name fisherman msg -@match +@match * Get out of my house! Sic em boy! endmsg