Merge lines.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14951 282e977c-c81d-0410-88c4-b93c2d0d6712
master
ryo_saeba 2011-08-07 21:47:03 +00:00
parent b3a6875c4a
commit d4badedb13
2 changed files with 15 additions and 27 deletions

View File

@ -8,7 +8,7 @@ enter_x 1
enter_y 7
msg
Created: 1994-02-11 peter mardahl (peterm@soda.berkeley.edu)
Modified: 2008-12-22 Rick Tanner
Modified: 2011-08-07 Nicolas Weeger
endmsg
end
arch dungeon_floor
@ -142,23 +142,17 @@ end
arch prisoner
msg
@match hi|hello|Hi
Set me free. It's true I betrayed my
master, but he's a monster. There
is worse than being a traitor
Set me free. It's true I betrayed my master, but he's a monster. There is worse than being a traitor.
@match traitor|betray
Yes, I betrayed my master. Who wouldnt
if they knew his evil scheme?
Yes, I betrayed my master. Who wouldnt if they knew his evil scheme?
@match scheme
He tries to make himself immortal,
but he's lost his soul in his
blindness. He seeks to become a lich.
He hasn't fully succeeded yet, but
I'm sure he will.
He tries to make himself immortal, but he's lost his soul in his blindness. He seeks to become a lich.
He hasn't fully succeeded yet, but I'm sure he will.
@match password
Gladly will I tell you the password.
It is starwatch -- at least, it was
when I was Yqreth's advisor......
Perhaps he has changed it
It is starwatch -- at least, it was when I was Yqreth's advisor...... Perhaps he has changed it.
endmsg
x 1
y 4

View File

@ -8,7 +8,7 @@ enter_x 8
enter_y 7
msg
Created: 1994-02-11 peter mardahl (peterm@soda.berkeley.edu)
Modified: 2008-12-22 Rick Tanner
Modified: 2011-08-07 Nicolas Weeger
endmsg
end
arch small_stones
@ -599,18 +599,12 @@ y 5
end
arch magic_mouth
msg
You look down from a great height,
and realize that the devastation in
this area is the result of Yqreth's
toying with the spell you found below.
You resolve not to let power go to
your head, and not to sell your soul
for power, as Yqreth had. Or at least,
your resolve to sell your soul for a
higher price. Yqreth wasn't much of
a lich--strong liches are reputed to
be much more powerful than the creature
you destroyed.
You look down from a great height, and realize that the devastation in this area is the result of Yqreth's toying with the spell you found below.
You resolve not to let power go to your head, and not to sell your soul for power, as Yqreth had.
Or at least, your resolve to sell your soul for a higher price. Yqreth wasn't much of a lich -- strong liches are reputed to
be much more powerful than the creature you destroyed.
endmsg
x 8
y 6