- Remove redundant match strings and unnecessary match expressions.

- Merge some minor changes from trunk to branch.
- Clean up line breaks in message text.
- Minor conversation adjustments.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6824 282e977c-c81d-0410-88c4-b93c2d0d6712

pup_land/lone_town/pupuly

@@ -5698,26 +5698,32 @@ end
 arch guildmaster
 name old man
 msg
-@match tree|Tree
+@match tree
 I l.. love laurels very much.
-@match laurels|Laurels
+@match laurel
 Laurel, laurel,...
-Oh! N.. Now I remember. Eureca's wife is called "Lauretta"!
+Oh! N.. Now I remember, Eureca's wife is called "Lauretta"!
-@match pupuly|Pupuly
+@match pupuly
 Y.. Y.. Yes, I.. I'm.. I am Pupuly.
-@match wife|Wife
+@match wife
-I know her. But I c.. can.. cannot remember her name right now.
+I know her, but I c.. can.. cannot remember her name right now.
-@match eureca|Eureca
+@match eureca
-He is the l.. lord of this country. I.. I served him for about 20 years. And now I live in retirement.
+He is the l.. lord of this country.
-@match ring|Ring
+I.. I served him for about 20 years. And now I live in retirement.
-Y.. you may take the r.. ring as reward for k.. kicking Nazgul's butt. It's on the 5-th floor.
+@match ring
-@match [Tt]hieves|[Nn]azgul
+Y.. you may take the r.. ring as reward for k.. kicking Nazgul's butt.
-They w.. wanted to steal my ring. Th.. Thought they could cheat on ol' Pupuly!
+It's on the 5-th floor.
-@match key|Key
+@match thieves|nazgul
-The "Guard Room Key"? I f.. forgot it's purpose. It had s.. something to do with E.. Eureca I think.
+They w.. wanted to steal my ring.
+Th.. thought they could cheat on ol' Pupuly!
+@match key
+The "Guard Room Key"?
+I f.. forgot it's purpose.
+I th.. think it had s.. something to do with E.. Eureca.
 @match *
-Th.. Thank you for saving me. We were a.. attacked by the Thieves. My servant tried to open the escape
+Th.. Thank you for saving me.
-pits, b.. but ... I'm afraid that he got k.. killed.
+We were a.. attacked by the Thieves.
+My servant tried to open the escape pits, b.. but ... I'm afraid that he got k.. killed.
 endmsg
 hp 500
 ac -10
@@ -6043,11 +6049,9 @@ end
 arch magic_mouth
 name 10
 msg
-The old man say:
+The old man says:
-That l.. lever doesn't work, this gate
+That l.. lever doesn't work; this gate is l.. locked.
-is l.. locked. P.. Please go upstairs
+P.. Please go upstairs and t.. try to open the escape pit for me.
-and t.. try to open the escape pit for
-me.
 endmsg
 x 26
 y 10
@@ -9550,7 +9554,8 @@ end
 arch note
 name servant's notes
 msg
-Tomorrow I'll have to plant trees again. That crazy old man... I should try to make him loose count.
+Tomorrow I'll have to plant trees again. That crazy old man...
+I should try to make him lose count.
 endmsg
 x 41
 y 14