Yet more fixes for redundant patterns in @match (it is case insensitive, but a lot of maps treated it as if it was case sensitive). Mostly done with a script.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9146 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-23 10:52:18 +00:00 · 2008-05-23 10:52:18 +00:00 · d96ee67454
parent e5c9604b0a
commit d96ee67454
55 changed files with 187 additions and 187 deletions
--- a/navar_city/city1church1
+++ b/navar_city/city1church1
@ -612,7 +612,7 @@ y 2
 end
 arch dwarf_priest
 msg
-@match smugglers|Smugglers
+@match smugglers
 Then I can help you....the smugglers are
 headquartered in one of the warehouses.
 Which one I do not know, but it may
@ -1934,7 +1934,7 @@ y 2
 end
 arch dwarf_priest
 msg
-@match smugglers|Smugglers
+@match smugglers
 Then I can help you....the smugglers are
 headquartered in one of the warehouses.
 Which one I do not know, but it may
--- a/navar_city/city1court
+++ b/navar_city/city1court
@ -730,7 +730,7 @@ y 8
 end
 arch magic_ear
 msg
-@match quest|Quest
+@match quest
 Praise God someone is here to save us.
 We are being overrun by damned
 creatures that stalk the night.  So
@ -743,14 +743,14 @@ talking to that good for nothing High
 Wizzard of ours, Wizzo, you will find
 him in his shop, he may know something
 about the dead that plague us.
-@match necromancy|Necromancy
+@match necromancy
 why do you ask about that vile art of
 magic, it is banned because our
 previous High Wizard practiced it
 regularly.  Bringing forth vile
 creatures.  But we put a stop to him,
 threw him in prison we did.
-@match wizzo|Wizzo
+@match wizzo
 Yes that Wizzo is a good for nothing
 Leach, oh he was of some use to the
 city until he opened his shop.  He is
@ -1616,7 +1616,7 @@ y 8
 end
 arch magic_ear
 msg
-@match quest|Quest
+@match quest
 So you are the ones who think they can
 get rid of these smugglers...well we
 have tried and they keep coming back.
@ -1624,13 +1624,13 @@ Well you might want to talk to the
 Dwarven priests in the church, they do
 know something that they won't tell
 us, something about being worthy
-@match smugglers|Smugglers
+@match smugglers
 What a vile bunch they are those
 smugglers, with many allies
-@match allies|Allies
+@match allies
 Aye, some say they are in league
 with Devils
-@match priests|Priests
+@match priests
 Well if ya want ta know about
 them...go ask them yourself
@match *
--- a/navar_city/temples/ruggilli
+++ b/navar_city/temples/ruggilli
@ -152,7 +152,7 @@ end
 arch fire_elemental
 name Templar of Ruggilli
 msg
-@match ruggilli|Ruggilli
+@match ruggilli
 ....My...Looord....and masssster...
@match *
 ....We...are...Watchhhing...You...
@ -220,23 +220,23 @@ end
 arch faerie_dragon
 name Devotee of Ruggilli
 msg
-@match Ruggilli|ruggilli
+@match ruggilli
 Ruggilli, God of Destruction and
 Chaos! His Followers are feared among
 all living!
-@match flame|Flame
+@match flame
 Ruggilli will lend the immolating
 fires to any who choose to follow!
-@match immolating|Immolating|fires|Fires
+@match immolating|fires
 Yes! A Flame which will consume your
 enemies!
-@match follow|Follow|worship|Worship|Door|door|Gate|gate|stair|Stair
+@match follow|worship|door|gate|stair
 The Consuming worm Ruggilli will only
 accept followers who can pass his
 test. Descend down these stairs
 destroy His enemies and pass the tests
 and a pass shall be granted.
-@match quest|Quest
+@match quest
 When you are ready, your quest shall
 be given!
@match *
@ -459,7 +459,7 @@ end
 arch fire_elemental
 name Knight of Ruggilli
 msg
-@match ruggilli|Ruggilli
+@match ruggilli
 ....Massster...We...Live...In...His...
 rath....
@match *
@ -1041,7 +1041,7 @@ end
 arch fire_elemental
 name Knight of Ruggilli
 msg
-@match ruggilli|Ruggilli
+@match ruggilli
 ....Massster...We...Live...In...His...
 rath....
@match *
@ -1139,7 +1139,7 @@ end
 arch fire_elemental
 name Templar of Ruggilli
 msg
-@match ruggilli|Ruggilli
+@match ruggilli
 ....My...Looord....and masssster...
@match *
 ....We...are...Watchhhing...You...
@ -1173,7 +1173,7 @@ end
 arch fire_elemental
 name Knight of Ruggilli
 msg
-@match ruggilli|Ruggilli
+@match ruggilli
 ....Massster...We...Live...In...His...
 rath....
@match *
--- a/navar_city/temples/ruggilli2
+++ b/navar_city/temples/ruggilli2
@ -2985,9 +2985,9 @@ arch fire_witch
 name Shriea
 title High Priestess
 msg
-@match Path|path
+@match path
 Prove your self worthy by taking the longest path!
-@match Ruggilli|ruggilli
+@match ruggilli
 Speak not that name suplicant unless thou are a follower of the true path.
@match *
 Leave me be, I am contemplating The Path of Destruction.
--- a/navar_city/tower/magetower1
+++ b/navar_city/tower/magetower1
@ -776,7 +776,7 @@ y 7
 end
 arch magic_ear
 msg
-@match morkov|Morkov
+@match morkov
 Click.
 endmsg
 x 5
@ -2209,7 +2209,7 @@ y 3
 end
 arch magic_ear
 msg
-@match necromancy|Necromancy
+@match necromancy
 Click.
 endmsg
 x 14
@ -3754,7 +3754,7 @@ y 15
 end
 arch magic_ear
 msg
-@match Kurte|kurte
+@match kurte
 Click.
 endmsg
 x 24
--- a/navar_city/warehouse4
+++ b/navar_city/warehouse4
@ -184,12 +184,12 @@ y 12
 end
 arch magic_ear
 msg
-@match smugglers|Smugglers
+@match smugglers
 Yes, the smugglers, they locked me in
 here to die of starvation since
 overheard where their secret entrance
 to the city is
-@match entrance|Entrance
+@match entrance
 Yes, the entrance, it is in the lower
 levels of the Lighthouse, but you have
 to get to the top level to go down to
--- a/pup_land/castle_eureca/castle_eureca6
+++ b/pup_land/castle_eureca/castle_eureca6
@ -681,11 +681,11 @@ end
 arch bone_head
 name Bonehead
 msg
-@match yes|Yes
+@match yes
 I forbit you to pass!
-@match Prison|prison
+@match prison
 Eureca's family lives in the prison.
-@match No|no
+@match no
 Good!
 Three toaches is required to go to
 prison.
--- a/pup_land/castle_eureca/cave_pass2
+++ b/pup_land/castle_eureca/cave_pass2
@ -1565,7 +1565,7 @@ connected 1
 end
 arch magic_ear
 msg
-@match Bernie|bernie|Barnard|barnard
+@match bernie|barnard
 Click.
 endmsg
 x 6
@ -2478,7 +2478,7 @@ connected 2
 end
 arch magic_ear
 msg
-@match Lauretta|lauretta|Laurel|laurel
+@match lauretta|laurel
 Click.
 endmsg
 x 10
@ -3240,7 +3240,7 @@ y 10
 end
 arch magic_ear
 msg
-@match Eureca|eureca
+@match eureca
 Click.
 endmsg
 x 13
--- a/pup_land/cave_weapon/cave4
+++ b/pup_land/cave_weapon/cave4
@ -528,13 +528,13 @@ end
 arch sage
 name mystery man
 msg
-@match Key|key
+@match key
 I'll give you a hint.
 "You'll never open the door which
 was closed first"
 You can open the door which was
 opened first"
-@match yes|Yes
+@match yes
 So, you have to get a Key.
@match *
 Welcome adventurer!
--- a/pup_land/cave_weapon/cave5
+++ b/pup_land/cave_weapon/cave5
@ -336,7 +336,7 @@ After decades of reasearch I have
 created the invincible "hyper kobold".
 With this weapon in our hands, we can
 win the war against resistance.
-@match yes|Yes
+@match yes
 Do your best, bua ha ha!
 Hehehe!!
 <Prof. Gill seems to be the typical
--- a/pup_land/cave_weapon/cave51
+++ b/pup_land/cave_weapon/cave51
@ -520,7 +520,7 @@ end
 arch guildmaster
 name Prof. Gill.
 msg
-@match yes|Yes
+@match yes
 Do your best, ha ha!
@match *
 Welcome to my laboratory, adventurer!
--- a/pup_land/hq
+++ b/pup_land/hq
@ -942,7 +942,7 @@ end
 arch elf
 name elf soldier
 msg
-@match Calvin|calvin
+@match calvin
 He is there.
@match *
 I'm too busy to answer your queries.
@ -964,7 +964,7 @@ end
 arch elf
 name elf soldier
 msg
-@match Calvin|calvin
+@match calvin
 He is there.
@match *
 I'm too busy to answer your queries.
@ -1507,7 +1507,7 @@ end
 arch elf
 name elf soldier
 msg
-@match Calvin|calvin
+@match calvin
 He is there.
@match *
 I'm too busy to answer your queries.
@ -1529,7 +1529,7 @@ end
 arch elf
 name elf soldier
 msg
-@match Calvin|calvin
+@match calvin
 He is there.
@match *
 I'm too busy to answer your queries.
@ -2073,7 +2073,7 @@ end
 arch elf
 name elf soldier
 msg
-@match Calvin|calvin
+@match calvin
 He is there.
@match *
 I'm too busy to answer your queries.
@ -2095,7 +2095,7 @@ end
 arch elf
 name elf soldier
 msg
-@match Calvin|calvin
+@match calvin
 He is there.
@match *
 I'm too busy to answer your queries.
@ -3157,7 +3157,7 @@ end
 arch elf
 name elf soldier
 msg
-@match Calvin|calvin
+@match calvin
 He is right here.
@match *
 I'm too busy to answer your queries.
@ -3179,7 +3179,7 @@ end
 arch elf
 name elf soldier
 msg
-@match Calvin|calvin
+@match calvin
 He is right here.
@match *
 I'm too busy to answer your queries.
@ -3758,7 +3758,7 @@ I dug the hole to the prison secretly.
 So, push me. I think the lord of
 Eureca is held in captivity down there.
 You must save him!
-@match Calvin|calvin
+@match calvin
 How could you know my name?
 Oh, I see. You are a spy of Regular
 Army, aren't you? Do you want to enter
@ -4280,7 +4280,7 @@ end
 arch elf
 name elf soldier
 msg
-@match Calvin|calvin
+@match calvin
 He is right here.
@match *
 I'm too busy to answer your queries.
@ -4302,7 +4302,7 @@ end
 arch elf
 name elf soldier
 msg
-@match Calvin|calvin
+@match calvin
 He is right here.
@match *
 I'm too busy to answer your queries.
--- a/pup_land/hq_ud
+++ b/pup_land/hq_ud
@ -508,7 +508,7 @@ y 5
 end
 arch fighter
 msg
-@match Eureca|eureca
+@match eureca
 I'm not Eureca. But I'm willing to
 change my name if you rescue me then.
@match *
@ -1028,7 +1028,7 @@ end
 arch elf
 name Spy of the goverment
 msg
-@match Eureca|eureca
+@match eureca
 He is not in here!
@match *
 Help me.
@ -1849,7 +1849,7 @@ y 4
 end
 arch prisoner
 msg
-@match Eureca|eureca
+@match eureca
 What is Eureca?
 Is it some kind of food?
@match *
--- a/pup_land/kurte/eureca_road3
+++ b/pup_land/kurte/eureca_road3
@ -3221,7 +3221,7 @@ y 29
 end
 arch magic_ear
 msg
-@match tree|Tree
+@match tree
 Click.
 endmsg
 x 13
@ -3791,7 +3791,7 @@ y 27
 end
 arch magic_ear
 msg
-@match castle|Castle
+@match castle
 Click.
 endmsg
 x 15
@ -4338,7 +4338,7 @@ y 27
 end
 arch magic_ear
 msg
-@match hotel|Hotel|Inn|inn
+@match hotel|inn
 Click.
 endmsg
 x 17
@ -5162,7 +5162,7 @@ y 29
 end
 arch magic_ear
 msg
-@match treasure|Treasure
+@match treasure
 Click.
 endmsg
 x 20
@ -5662,7 +5662,7 @@ y 20
 end
 arch magic_ear
 msg
-@match house|House
+@match house
 Click.
 endmsg
 x 22
@ -6197,7 +6197,7 @@ y 20
 end
 arch magic_ear
 msg
-@match jungle|Jungle
+@match jungle
 Click.
 endmsg
 x 24
@ -7032,7 +7032,7 @@ y 22
 end
 arch magic_ear
 msg
-@match treasure|Treasure
+@match treasure
 Click.
 endmsg
 x 27
@ -7601,7 +7601,7 @@ y 20
 end
 arch magic_ear
 msg
-@match guild|Guild
+@match guild
 Click.
 endmsg
 x 29
@ -8161,7 +8161,7 @@ y 20
 end
 arch magic_ear
 msg
-@match aque|Aque
+@match aque
 Click.
 endmsg
 x 31
@ -8230,7 +8230,7 @@ y 27
 end
 arch magic_ear
 msg
-@match Eternal|eternal
+@match eternal
 Click.
 endmsg
 x 31
--- a/pup_land/kurte/hut2
+++ b/pup_land/kurte/hut2
@ -1283,10 +1283,10 @@ statue near the castle of Eureca:
  NW -> E -> S -> (appear)
 Eureca probaly got into trouble.
 Please meet Kurte for "saving eureca".
-@match Kurte|kurte
+@match kurte
 I'm a scholar of Kurte...
 You are not worthy to meet him yet.
-@match Eureca|eureca
+@match eureca
 I don't know where he is. Kurte is the
 only one who might know it...
@match person|high position
--- a/pup_land/lone_town/church_ud
+++ b/pup_land/lone_town/church_ud
@ -734,11 +734,11 @@ y 8
 end
 arch thief
 msg
-@match Boss|boss
+@match boss
 To meet our boss, you have to say
 the password:
 "racoon's head".
-@match Fox|fox|Tails|tails
+@match fox|tails
 We steal money and gems.
 But we never commit murder.
 By the way, you look quite strong...
--- a/pup_land/lone_town/cordish
+++ b/pup_land/lone_town/cordish
@ -1305,11 +1305,11 @@ Eureca's son is called Bernie. He visited me sometimes. He loved my cookies and
 I don't know Eureca's wife. Visit his former steward, Pupuly. He should know.
@match Pupuly
 He lives in the tower northwest in this town.
-@match Eureca|eureca
+@match eureca
 My husband served Lord Eureca. I never met him in person, but I know his son.
@match siegfried
 Siegfried is a hero in the legends. My husband *adores* the siegfried-saga. Cordish always wanted to be like the ancient hero, but in fact he was about the exact opposite...
-@match Cordish|cordish
+@match cordish
 ... *sigh*... He is missing. Both him and Eureca disappeared. I hope Cordish is still alive... He is a bit immature, you know. How could he survive without me
 protecting him?
@match *
--- a/pup_land/nurnberg/agito
+++ b/pup_land/nurnberg/agito
@ -1400,17 +1400,17 @@ y 6
 end
 arch viking
 msg
-@match Weapon|weapon
+@match weapon
 I hear there are two weapons.
 One is a living thing.
 The other is an artifact.
-@match Regular|regular|Army|army
+@match regular|army
 We fight against it.
-@match Bauer|bauer
+@match bauer
 He is the leader of Regular army.
-@match Jungle|jungle|No|no
+@match jungle|no
 It is to the south of this town.
-@match Cave|cave|Yes|yes
+@match cave|yes
 In the cave, Bauer and his Army are
 doing research for new Weapons.
@match *
--- a/pup_land/nurnberg/aqueduct
+++ b/pup_land/nurnberg/aqueduct
@ -4798,9 +4798,9 @@ end
 arch pirate
 name Thief
 msg
-@match Bauer|bauer
+@match bauer
 He is very rich..
-@match Path|path
+@match path
 Yeah!, it leads to the treasure room
 of the castle!
@match *
--- a/pup_land/nurnberg/castle
+++ b/pup_land/nurnberg/castle
@ -1176,7 +1176,7 @@ end
 arch priest
 name secretary 3
 msg
-@match Head|head
+@match head
 It's here in this city.
@match lickmond
 He is the general of Regular Army.
--- a/pup_land/nurnberg/castle_ud
+++ b/pup_land/nurnberg/castle_ud
@ -284,7 +284,7 @@ y 14
 end
 arch prisoner
 msg
-@match Eureca|eureca
+@match eureca
 No, he is not here...
@match *
 Who are you? How did you manage
--- a/pup_land/nurnberg/dick/house
+++ b/pup_land/nurnberg/dick/house
@ -481,7 +481,7 @@ connected 1
 end
 arch magic_ear
 msg
-@match dot|DOT
+@match dot
 Click.
 endmsg
 x 4
@ -490,7 +490,7 @@ connected 4
 end
 arch magic_ear
 msg
-@match tod|TOD|dot|Dot
+@match tod|dot
 Click.
 endmsg
 x 4
@ -499,7 +499,7 @@ connected 2
 end
 arch magic_ear
 msg
-@match tod|TOD
+@match tod
 Click.
 endmsg
 x 4
@ -517,27 +517,27 @@ end
 arch human
 name Dick, the carpenter
 msg
-@match Castle|castle
+@match castle
 Bauer is very stingy.
 So, I did jerry-building in the
 underground of castle :).
 Go there and look into one of the
 pillars.
-@match Bauer|bauer
+@match bauer
 I hate him!
 He is very stingy!
 I built his Castle, but he didn't pay
 enough money!!!
-@match dot|DOT
+@match dot
 Ok!
-@match tod|TOD
+@match tod
 Really,you want to get a death?
@match extra
 Oh, You want to try a extra dungeon,
 don't you?
 Then please say the keyword that is
 obtained by Proof Scrolls.
-@match yes|Yes
+@match yes
 Ok. Please drop 5 platina on the alter,
 and go to next room.
@match *
--- a/pup_land/nurnberg/nf_bar
+++ b/pup_land/nurnberg/nf_bar
@ -3231,7 +3231,7 @@ y 12
 end
 arch conjurer
 msg
-@match Bauer|bauer
+@match bauer
 Bauer is a greedy and selfish person.
 After Dick built the castle for him,
 Bauer didn't pay enough money.
@ -3246,7 +3246,7 @@ of Bauer.
 Dick is kinda sadistic sometimes.
 His dungeons are very tricky and
 dangerous. Be careful!
-@match yes|Yes
+@match yes
 You should try Dick's dungeons.
@match *
 Hello!
--- a/pup_land/pplant/pplant2
+++ b/pup_land/pplant/pplant2
@ -1643,11 +1643,11 @@ y 12
 end
 arch prisoner
 msg
-@match Ologhi|ologhi
+@match ologhi
 Maybe he stayes at here.
@match ring
 I don't know details.
-@match tower|Tower
+@match tower
 In Lone Town.
@match Nazgul
 I hear he goes to pupuly's tower
--- a/pup_land/rainbow/Lv4/key
+++ b/pup_land/rainbow/Lv4/key
@ -680,7 +680,7 @@ y 7
 end
 arch magic_ear
 msg
-@match Yes|yes|Key|key
+@match yes|key
 Click.
 endmsg
 x 7
@ -1398,10 +1398,10 @@ end
 arch thief
 name M. Frozen
 msg
-@match word|Word
+@match word
 I don't know.

-@match yes|Yes|key|Key
+@match yes|key
 O.K.

@match *
--- a/pup_land/ruin_barbarian/hole1
+++ b/pup_land/ruin_barbarian/hole1
@ -3952,7 +3952,7 @@ blocksview 1
 end
 arch magic_ear
 msg
-@match wall|Wall
+@match wall
 There is a knock on the wall.
 endmsg
 x 15
--- a/scorn/anthony/passoffice
+++ b/scorn/anthony/passoffice
@ -8,7 +8,7 @@ enter_x 10
 enter_y 8
 msg
 Created:  1998-12-28 Anthony Thyssen (anthony@cit.gu.edu.au)
-Modified: 2008-04-09 Nicolas Weeger
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch woodfloor
@ -1020,7 +1020,7 @@ y 6
 end
 arch courier
 msg
-@match pass|Pass|passes
+@match pass|passes
 What do you think this is? Grand Central
 Station! Of course we have passes. If
 the teleporters are working, that is!
--- a/scorn/anthony/portgate
+++ b/scorn/anthony/portgate
@ -607,7 +607,7 @@ Yes you can only pass if you be...
 * A citizen of Scorn with a password.
 * Have a merchants ``Port Pass''.
 * Have been knighted ``Hero of Scorn''.
-@match hero|Hero|scorn|Scorn
+@match hero|scorn
 Only the king can grant `Hero' status.
@match port|pass
 See the Office inside Scorn to your left.
@ -717,7 +717,7 @@ Yes you can only pass if you are
 * Have a merchants ``Port Pass''
 * Are a known ``Hero of Scorn''
 * or know todays password.
-@match hero|Hero
+@match hero
 Only the king can grant `Hero' status.
@match port|pass
 See the Office of Gate Passes.
@ -751,7 +751,7 @@ x 7
 end
 arch magic_ear
 msg
-@match chain|CHAIN|Chain
+@match chain
 Oh you know the password! You must be
 a citizen of scorn. Pass Citizen.
 endmsg
@ -881,7 +881,7 @@ y 10
 end
 arch magic_ear
 msg
-@match chain|CHAIN|Chain
+@match chain
 Oh you know the password! You must be
 a citizen of scorn. Pass Citizen.
 endmsg
@ -1111,7 +1111,7 @@ x 10
 end
 arch magic_ear
 msg
-@match chain|CHAIN|Chain
+@match chain
 Oh you know the password! You must be
 a citizen of scorn. Pass Citizen.
 endmsg
@ -1233,7 +1233,7 @@ y 10
 end
 arch magic_ear
 msg
-@match chain|CHAIN|Chain
+@match chain
 Oh you know the password! You must be
 a citizen of scorn. Pass Citizen.
 endmsg
@ -1275,7 +1275,7 @@ Yes you can only pass if you be...
 * A citizen of scorn with a password.
 * Have a merchants ``Port Pass''.
 * Have been knighted ``Hero of Scorn''.
-@match hero|Hero|scorn|Scorn
+@match hero|scorn
 Only the king can grant `Hero' status.
@match port|pass
 See the Office inside scorn to your left.
@ -1393,7 +1393,7 @@ Yes you can only pass if you are
 * Have a merchants ``Port Pass''
 * Are a known ``Hero of Scorn''
 * or know todays password.
-@match hero|Hero
+@match hero
 Only the king can grant `Hero' status.
@match port|pass
 See the Office of Gate Passes.
--- a/scorn/anthony/prison
+++ b/scorn/anthony/prison
@ -1934,7 +1934,7 @@ end
 arch guard
 name prison guard
 msg
-@match poem|cleric|eric|Eric
+@match poem|cleric|eric
  A priestly young person called Eric,
   Whilst practicing to be a cleric,
    Misspelt his god's name,
@ -2461,7 +2461,7 @@ the prisoner escaped.
 He dug a tunnel under his bed!
 Goblins are great tunnelers you know.
 Probably left for Goblin Isle.
-@match isle|Isle
+@match isle
 Yes that is where he said he lived.
 Also said that it was full of treasure.
@match where|treasure
--- a/scorn/apartment/apartments
+++ b/scorn/apartment/apartments
@ -1281,7 +1281,7 @@ y 1
 end
 arch magic_ear
 msg
-@match Siegfried|siegfried
+@match siegfried
 Ok. Have fun!
 endmsg
 x 15
--- a/scorn/houses/cornerbrook
+++ b/scorn/houses/cornerbrook
@ -2705,7 +2705,7 @@ end
 arch sailor
 name Swabbie
 msg
-@match Mark|mark
+@match mark
 Ya I know him,
 he told me not to tell anyone he was
 at Goth..Oh you said 'Mark'...
@ -2798,10 +2798,10 @@ y 20
 end
 arch woman
 msg
-@match staff|Staff|stick|Stick
+@match staff|stick
 You'll know its his because he carved
 his name on it.
-@match father|Father|ear|earhorn
+@match father|ear|earhorn
 My father is a bit hard of hearing.
 He lost his earhorn too...
@match *
@ -3049,13 +3049,13 @@ y 3
 end
 arch pirate_lass
 msg
-@match ahoy|Ahoy
+@match ahoy
 Hey sailor, want some treasure?
@match old|pirate|Swabbie
 I shouldn't have married him,
 I should have stuck with Tomasso the Pirate.
 I hear he found a treasure map.
-@match Tomasso|tomasso|map|Map
+@match tomasso|map
 There was a real pirate,
 he set sail for Port Joseph.
 Said he found a treasure map.
@ -3644,12 +3644,12 @@ end
 arch sage
 name Gramps Malone
 msg
-@match staff|Staff|walking|Walking
+@match staff|walking
 Yup lost my walking stick - have ya seen it?
-@match stick|Stick
+@match stick
 Ya say yer sick?  That's a darn shame!
 I get a touch of the wind myself sometimes...
-@match ear|Ear
+@match ear
 You looking for deer?
 Used to be a woodsman myself.
 Try the woods to the east - lots of game there...
--- a/scorn/houses/house2
+++ b/scorn/houses/house2
@ -1317,7 +1317,7 @@ end
 arch woman
 name Mrs. Patch
 msg
-@match name|Name
+@match name
 I'm Jane Patch.
@match *
 Go away. I'm busy preparing dinner.
@ -2435,7 +2435,7 @@ end
 arch man
 name Mr. Patch
 msg
-@match name|Name
+@match name
 I'm Art Patch.
@match *
 Right now, my wife wants me to
--- a/scorn/houses/riverside_manor
+++ b/scorn/houses/riverside_manor
@ -1115,15 +1115,15 @@ end
 arch fatman
 name J.C.
 msg
-@match Mark|mark
+@match mark
 Ya good guy lets me beat him at cards all the time.
 Guy loves to gamble.
 Otherwise he's a bum.
-@match Amy|amy
+@match amy
 She runs the place for that rat Witherspoon.
@match Witherspoon|rat
 Witherspoon owns all these slum..er 'condos'.
-@match Gramps|gramps|Malone|Staff|staff
+@match gramps|Malone|staff
 Ya ol Gramps Malone is right duffer.
 Plays a good game of orc knuckles.
 I think he left his walking stick here
--- a/scorn/houses/smithery
+++ b/scorn/houses/smithery
@ -434,7 +434,7 @@ msg
@match hi
 Honor Mostrai with your smithery or...
 I'll beat some respect in to you.
-@match how|How|HOW
+@match how
 Put the right items on the forge and use your skill.
@match *
 I'm sick of your questions!!!
--- a/scorn/houses/wizz.entry
+++ b/scorn/houses/wizz.entry
@ -1140,7 +1140,7 @@ me pazzword for gatz az he leavzz.
 You muzzt searzz for it. Good Luck!
 Charles pulls out a PAPER, looks at
 it, marks an X and puts it away again.
-@match paper|PAPER
+@match paper
 Oh nothing... I juzt write zown how
 many adventurerz entered zee DUNZEON
 zinze mazzter Yarid died. Zee number
--- a/scorn/kar/somehouse3
+++ b/scorn/kar/somehouse3
@ -535,7 +535,7 @@ y 8
 end
 arch magic_ear
 msg
-@match key|Key
+@match key
 You hear a well-oiled door open.
 endmsg
 x 5
--- a/scorn/misc/gatehouse
+++ b/scorn/misc/gatehouse
@ -7,7 +7,7 @@ height 14
 enter_y 7
 msg
 Created:  1993-10-15
-Modified: 1998-12-28 Anthony Thyssen (anthony@cit.gu.edu.au)
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@ -161,10 +161,10 @@ end
 arch guard
 name gatehouse guard
 msg
-@match monster|Monster
+@match monster
 They keep trying to sneak in, but we
 always kill them.
-@match Open|Gate|open|gate
+@match open|gate
 The gate opens only for certain people.
@match who|people
 Only those who are
@ -253,7 +253,7 @@ connected 14
 end
 arch magic_ear
 msg
-@match chain|Chain|CHAIN
+@match chain
 Well, you know the password,
 so you must be ok.   Pass Friend.
 endmsg
@ -446,10 +446,10 @@ end
 arch guard
 name gatehouse guard
 msg
-@match monster|Monster
+@match monster
 They keep trying to sneak in, but we
 always kill them.
-@match Open|Gate|open|gate
+@match open|gate
 The gate opens only for certain people.
@match who|people
 Only those who are
@ -1878,10 +1878,10 @@ end
 arch guard
 name gatehouse guard
 msg
-@match monster|Monster
+@match monster
 They keep trying to sneak in, but we
 always kill them.
-@match Open|Gate|open|gate
+@match open|gate
 The gate opens only for certain people.
@match who|people
 Only those who are
@ -2161,7 +2161,7 @@ connected 24
 end
 arch magic_ear
 msg
-@match chain|Chain|CHAIN
+@match chain
 Well, you know the password,
 so you must be ok.   Pass Friend.
 endmsg
@ -2448,10 +2448,10 @@ end
 arch guard
 name gatehouse guard
 msg
-@match monster|Monster
+@match monster
 They keep trying to sneak in, but we
 always kill them.
-@match Open|Gate|open|gate
+@match open|gate
 The gate opens only for certain people.
@match who|people
 Only those who are
--- a/scorn/misc/templelyth
+++ b/scorn/misc/templelyth
@ -785,7 +785,7 @@ y 4
 end
 arch sage
 msg
-@match Lythander|lythander
+@match lythander
 Lythander is the elven god of luck.
@match *
 Welcome to the temple of Lythander.
--- a/scorn/misc/wizhide
+++ b/scorn/misc/wizhide
@ -696,7 +696,7 @@ y 1
 end
 arch magic_ear
 msg
-@match yes|Yes|sure|Sure
+@match yes|sure
 endmsg
 x 3
 y 1
@ -709,15 +709,15 @@ end
 arch c_sage
 name old mage
 msg
-@match yes|Yes|sure|Sure
+@match yes|sure
 Thank you so much. I think he is somewhere in The Frolicing Mermaid in Navar. Bring this bottle to him, tell him that Terrance send you, and ask him to fill it for me. As a reward I'll let you try out one of the amulets. When you get back, place the filled bottle on that table in the corner.
-@match amulet|Amulet
+@match amulet
 I am currently working with a fellow mage in Navar who has a similar gem, to make an amulet which can indicate the distance and direction to each gem, and hence to Scorn and Navar. Right now I need a special golden potion delievered from him, containing the essence of the magical enegeries of his gem. Can you help get some from him?
-@match gem|Gem|purple|Purple|desk|Desk
+@match gem|purple|desk
 The gem in my desk was a work started by my father. It was made to have a strong and distinct magical enegry which can be detected from a long way away. I am currently working on amulets to work with the gem.
-@match rhyz|Rhyz|family|entorinaas|Entorinaas
+@match rhyz|family|entorinaas
 I am a decendent of the great Entorinaas Durdennis Rhyz. A long time ago, he set out to create the perfect "warriard", one highly adept with both combat and magic, however he failed. Recently I have come to believe that modern adventurers are becoming much like the "warriards"  that my ancestor believed in, so I have been trying to continue his vision by encouraging adventurers.
-@match hide|Hide
+@match hide
 I am hiding from the king of Scorn, he fears what my happen if his enemies get some of my works.
@match *
 I am Terrance Rhyz. How may I help you?
--- a/scorn/oldcity/oldcity12
+++ b/scorn/oldcity/oldcity12
@ -1523,7 +1523,7 @@ msg
 Yes, the great earthquake destroyed
 the city of Scorn, we were rebuilding
 the city when i was trapped.
-@match Scorn|city|City|trapped
+@match Scorn|city|trapped
 But I learned of something down here,
 as I heard monsters scratching at the
 walls...as the worms ate my flesh. I
--- a/scorn/oldcity/oldcity3
+++ b/scorn/oldcity/oldcity3
@ -623,7 +623,7 @@ end
 arch dragon
 name Thalik Norois
 msg
-@match name|Name
+@match name
 Thalik Norois
@match *
 Die fools.
@ -3849,17 +3849,17 @@ y 26
 end
 arch dark_elf
 msg
-@match name|Name
+@match name
 That is not important.
@match job
 I dabble in the black arts.
-@match Art|art|black|Black
+@match art|black
 I've killed many who have tried to test my
 power. Do you think you can kill me?
-@match yes|Yes
+@match yes
 I doubt it.
 *The dark elf grins evilly.*
-@match no|No
+@match no
 Smart, you are.
@match pass
 I guard this passage and I will kill any who try
--- a/scorn/oldcity/oldcity5
+++ b/scorn/oldcity/oldcity5
@ -891,14 +891,14 @@ msg
 Oh yes!, and if you best me, I may let you see
 what lies beyond for THeeee....Do you accept
 my challenge??
-@match challenge|Challenge
+@match challenge
 Yes or no will do.
-@match yes|Yes
+@match yes
 Very well, White as a ghost, Faster than thee,
 Taller than a mountain, Louder than me,
 Bright as the brightest star, Silent as the best
 thief, what is it that thou doest see?
-@match no|No
+@match no
 Very well, bother me no more....Or tomorrow
 you will be Painfully sore
@match *
@ -912,7 +912,7 @@ unaggressive 1
 end
 arch magic_ear
 msg
-@match Cloud|cloud
+@match cloud
 Very good Adventurer! You have are indeed
 as cunning as me! but of course I will not
 FLEE!
--- a/scorn/oldcity/oldcity54
+++ b/scorn/oldcity/oldcity54
@ -861,14 +861,14 @@ msg
 Oh yes!, and if you best me, I may let you see
 what lies beyond for THeeee....Do you accept
 my challenge??
-@match challenge|Challenge
+@match challenge
 Yes or no will do.
-@match yes|Yes
+@match yes
 Very well, White as a ghost, Faster then thee,
 Taller then a mountain, Louder then me,
 Bright as the brightest star, Silent as the best
 thief, what is it that thou doest see?
-@match no|No
+@match no
 Very well, bother me no more....Or tomorrow
 you will be Painfully sore
@match *
@ -886,7 +886,7 @@ y 6
 end
 arch magic_ear
 msg
-@match Cloud|cloud
+@match cloud
 Very good Adventurer! You have are indeed
 as cunning as me! but of course I will not
 FLEE!
--- a/scorn/oldcity/oldcity6
+++ b/scorn/oldcity/oldcity6
@ -5316,7 +5316,7 @@ y 26
 end
 arch magic_ear
 msg
-@match subject|Subject|summon|Summon
+@match subject|summon
 Why yes, I am going to take over your
 precious little city. I have built a way in for
 my hords!
--- a/scorn/shops/oleds_cafe
+++ b/scorn/shops/oleds_cafe
@ -329,15 +329,15 @@ end
 arch fatman
 name Oled
 msg
-@match Mark|mark
+@match mark
 Who?  Never heard of him...
-@match Amy|amy
+@match amy
 Hey, whatever she told you is a lie ok.
 That lady Mark was talking to was a sick friend of mine.
-@match lady|Lady
+@match lady
 I think her name was something like
 Jann or Ann...works over at the 'Mule sometimes.
-@match Eswald|eswald
+@match eswald
 That skunk Eswald and his stupid goose
 Undercutting my prices.  One day...
@match *
--- a/scorn/shops/scorn.sale1
+++ b/scorn/shops/scorn.sale1
@ -1280,7 +1280,7 @@ y 3
 end
 arch magic_ear
 msg
-@match P|plants
+@match plants
 Yeah! I like plants. So what? I also like smashing
 the heads of bothersome pipsqueaks like you.
 Quit bothering me.
--- a/scorn/shops/scorn.sale2
+++ b/scorn/shops/scorn.sale2
@ -3090,12 +3090,12 @@ y 10
 end
 arch magic_ear
 msg
-@match P|price
+@match price
 Stuff not much. Buy lot!
-@match K|key
+@match key
 Manager office for employee only.
 You not go there.
-@match O|oorgh
+@match oorgh
 That my name. Not wear out.
@match *
 Oorgh welcome you to shop!
--- a/scorn/taverns/barking_mule
+++ b/scorn/taverns/barking_mule
@ -372,11 +372,11 @@ He's usually pretty mellow, but lately he seems a bit tense.
 You try it an I'll deck you I says to him...
@match bird|goose
 Ya I heard Mark stole a goose.
-@match who|who
+@match who
 Your pretty nosey there fella.
@match service|order
 Hey buddy just take a seat, I work two jobs you know.
-@match job|Job
+@match job
 Ya I work part time at Oled's Cafe too.
@match *
 Hey kitchen is off limits!
--- a/scorn/taverns/goths2
+++ b/scorn/taverns/goths2
@ -3797,15 +3797,15 @@ end
 arch thief_1
 name a sly thief
 msg
-@match apprentice|Apprentice
+@match apprentice
 ok ok...it figures...be quiet and lets
 open this chest.
-@match chest|Chest
+@match chest
 Yeah, under the bed.....geez did you
 study your rogue book?
-@match name|Name
+@match name
 Just call me Toad...shhhh
-@match job|Job
+@match job
 ohhhhh...newbies! I hate them!
@match *
 shhhhhhhhhhhhhhhh...hey man..he'll hear
--- a/scorn/temples/gorokh
+++ b/scorn/temples/gorokh
@ -1072,7 +1072,7 @@ end
 arch sage
 name old priest
 msg
-@match Gorokh|gorokh
+@match gorokh
 We worship Gorokh, our master, and we
 seek redemption in Hell.
@match *
--- a/scorn/temples/mostrai
+++ b/scorn/temples/mostrai
@ -473,7 +473,7 @@ end
 arch greater_dwarven_guard
 name priest guard
 msg
-@match Goblin|goblin
+@match goblin
 I hate these beasts!
@match mines
 Aye, the mines. The entrance is
@ -707,7 +707,7 @@ y 11
 end
 arch dwarf_priest
 msg
-@match Mostrai|mostrai
+@match mostrai
 Mostrai is our god.
@match *
 Welcome to the temple of Mostrai!
--- a/scorn/temples/ruggilli1
+++ b/scorn/temples/ruggilli1
@ -186,23 +186,23 @@ end
 arch faerie_dragon
 name Devotee of Ruggilli
 msg
-@match Ruggilli|ruggilli
+@match ruggilli
 Ruggilli, God of Destruction and
 Chaos! His Followers are feared among
 all living!
-@match flame|Flame
+@match flame
 Ruggilli will lend the immolating
 fires to any who choose to follow!
-@match immolating|Immolating|fires|Fires
+@match immolating|fires
 Yes! A Flame which will consume your
 enemies!
-@match follow|Follow|worship|Worship|Door|door|Gate|gate|stair|Stair
+@match follow|worship|door|gate|stair
 The Consuming worm Ruggilli will only
 accept followers who can pass his
 test. Descend down these stairs and
 destroy all the of His enemies and a
 pass shall be granted.
-@match quest|Quest
+@match quest
 When you are ready, your quest shall
 be given!
@match *
@ -441,7 +441,7 @@ end
 arch fire_elemental
 name Knight of Ruggilli
 msg
-@match ruggilli|Ruggilli
+@match ruggilli
 ....Massster...We...Live...In...His...
 rath....
@match *
@ -679,7 +679,7 @@ end
 arch fire_elemental
 name Templar of Ruggilli
 msg
-@match ruggilli|Ruggilli
+@match ruggilli
 ....My...Looord....and masssster...
@match *
 ....We...are...Watchhhing...You...
@ -1030,7 +1030,7 @@ end
 arch fire_elemental
 name Knight of Ruggilli
 msg
-@match ruggilli|Ruggilli
+@match ruggilli
 ....Massster...We...Live...In...His...
 rath....
@match *
@ -1141,7 +1141,7 @@ end
 arch fire_elemental
 name Templar of Ruggilli
 msg
-@match ruggilli|Ruggilli
+@match ruggilli
 ....My...Looord....and masssster...
@match *
 ....We...are...Watchhhing...You...
@ -1175,7 +1175,7 @@ end
 arch fire_elemental
 name Knight of Ruggilli
 msg
-@match ruggilli|Ruggilli
+@match ruggilli
 ....Massster...We...Live...In...His...
 rath....
@match *
--- a/scorn/temples/sorig
+++ b/scorn/temples/sorig
@ -816,9 +816,9 @@ end
 arch conjurer
 name high priest of Sorig
 msg
-@match Sorig|sorig
+@match sorig
 Sorig the almighty, Lord of the Skies!
-@match Skies|skies|Sky|sky
+@match skies|sky
 The kingdom of Sorig has no limits.
@match *
 Fear the wrath of Sorig!
--- a/scorn/temples/valriel2
+++ b/scorn/temples/valriel2
@ -574,16 +574,16 @@ end
 arch sage
 name choir leader
 msg
-@match Valriel|valriel
+@match valriel
 Valriel is our Lord.  He will save us
 from all evil and bring us to Heaven.
-@match Lord|lord
+@match lord
 There is only one true Lord, and His
 name is Valriel.
-@match Heaven|heaven
+@match heaven
 One day, Valriel will bring all His
 followers to Heaven.
-@match Hymn|hymn
+@match hymn
 It is a song celebrating Valriel in all
 His glory.
@match *
--- a/scorn/towers/brewery.2
+++ b/scorn/towers/brewery.2
@ -444,7 +444,7 @@ end
 arch fatman
 name Morioch
 msg
-@match help|Help|rebelled|rebel
+@match help|rebelled|rebel
 Yeah, my employees. They rebelled and took over the factory. And they hold the key !
@match key
 Yeah, the key to my secret beer recipe ! What will Scorn become without beer ?