Merge lines.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14379 282e977c-c81d-0410-88c4-b93c2d0d6712
master
ryo_saeba 2011-04-03 14:34:46 +00:00
parent 4f437a6363
commit 424938a112
1 changed files with 17 additions and 26 deletions

View File

@ -9,7 +9,7 @@ enter_x 14
enter_y 7 enter_y 7
msg msg
Created: 1996-01-06 Bjoern Helfesrieder (helfesri@igd.fhg.de) Created: 1996-01-06 Bjoern Helfesrieder (helfesri@igd.fhg.de)
Modified: 2010-03-30 Cavesomething Modified: 2011-04-03 Nicolas Weeger
endmsg endmsg
end end
arch dungeon_floor arch dungeon_floor
@ -644,8 +644,8 @@ y 4
end end
arch note arch note
msg msg
I changed the password for the I changed the password for the dungeon from "wall" to "chair".
dungeon from "wall" to "chair".
I must tell Charles before I leave. I must tell Charles before I leave.
endmsg endmsg
x 6 x 6
@ -1127,40 +1127,31 @@ arch charwoman
name House Keeper name House Keeper
msg msg
@match hello|hi|job|name @match hello|hi|job|name
Oh good evening Zir, I am Charles, Oh good evening Zir, I am Charles, zee old wizzard's houze keeper!
zee old wizzard's houze keeper!
Can I HELP you, Zir? Can I HELP you, Zir?
A bed prehapzz? A bed prehapzz?
@match wiffard|dunzeon|zeletonz @match wiffard|dunzeon|zeletonz
Ztrange aczent you have, zonny! Ztrange aczent you have, zonny!
@match wizzard @match wizzard
Oh, mazzter Yarid waz a great wizzard! Oh, mazzter Yarid waz a great wizzard!
Always working away down in zee dunzeon
he waz. Zoo bad he izz DEAD now! Always working away down in zee dunzeon he waz. Zoo bad he izz DEAD now!
@match mouth|dungeon|gate|word @match mouth|dungeon|gate|word
Ah, zee dunzeon, I woulzz not go Ah, zee dunzeon, I woulzz not go zown zair if I waz you, but I am not you. Mazzter Yarid don't tell me pazzword for gatz az he leavzz. You muzzt searzz for it. Good Luck!
zown zair if I waz you, but I am
not you. Mazzter Yarid don't tell Charles pulls out a PAPER, looks at it, marks an X and puts it away again.
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 @match paper
Oh nothing... I juzt write zown how Oh nothing... I juzt write zown how many adventurerz entered zee DUNZEON zinze mazzter Yarid died.
many adventurerz entered zee DUNZEON
zinze mazzter Yarid died. Zee number Zee number be now 6.
be now 6.
@match help|bed|skeltons @match help|bed|skeltons
If you want a rezt put zoom food If you want a rezt put zoom food for zee dogz on zee table here.
for zee dogz on zee table here.
@match dead @match dead
Yep! Zee mazzter Yarid died zome Yep! Zee mazzter Yarid died zome time ago. He experimentzed a lot down zairs dunzeon below...
time ago. He experimentzed a lot
down zairs dunzeon below...
@match dungeon @match dungeon
I have never been down zair? It be I have never been down zair? It be zanderouz! None of the previous adventurerzz have returned.
zanderouz! None of the previous
adventurerzz have returned.
@match * @match *
I don't anyzing about zat! Zorry! I don't anyzing about zat! Zorry!
endmsg endmsg