From 705fe9bcbb05fd9d618aeb74b33c5c1fa3e59c62 Mon Sep 17 00:00:00 2001 From: ryo_saeba Date: Sun, 17 Jul 2011 10:48:02 +0000 Subject: [PATCH] Fix broken faces. Merge lines. Add dialog hints. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14880 282e977c-c81d-0410-88c4-b93c2d0d6712 --- santo_dominion/tavern.2ndfloor | 158 +++++++++++++-------------------- 1 file changed, 64 insertions(+), 94 deletions(-) diff --git a/santo_dominion/tavern.2ndfloor b/santo_dominion/tavern.2ndfloor index 810c881a2..87fc4b25c 100644 --- a/santo_dominion/tavern.2ndfloor +++ b/santo_dominion/tavern.2ndfloor @@ -6,7 +6,7 @@ width 33 height 31 msg Created: Andreas Vogl (red.blaze@gmx.net) -Modified: 2008-10-26 Rick Tanner +Modified: 2011-07-17 Nicolas Weeger endmsg end arch grass @@ -827,8 +827,7 @@ end arch guard msg @match * -These are the private rooms of Bonzo -the Banker. You cannot pass. +These are the private rooms of Bonzo the Banker. You cannot pass. endmsg face guard_med.111 x 5 @@ -1029,20 +1028,17 @@ arch woodfloor x 6 y 17 end -arch sage +arch thief name Thief msg @match money|bonzo|bank|guard -I'd like to sneak in there and steal -Bonzo's money. But the guard never -moves out. Damn it. +I'd like to sneak in there and steal Bonzo's money. But the guard never moves out. Damn it. @match * -Bonzo the Banker's room is on the -opposite side of the corridor. -I'm sure he wouldn't employ guards if -there wasn't good money in there. +@question money And why is money important? +Bonzo the Banker's room is on the opposite side of the corridor. + +I'm sure he wouldn't employ guards if there wasn't good money in there. endmsg -face thief.171 hp 500 maxhp 500 x 6 @@ -1052,7 +1048,6 @@ resist_magic 50 resist_fire 90 resist_electricity 90 resist_cold 90 -randomitems thief monster 0 end arch woodfloor @@ -1765,9 +1760,7 @@ end arch c_man msg @match * -Have you seen the barns, to the east of -here? I've heard those are dangerous -places, don't go there. +Have you seen the barns, to the east of here? I've heard those are dangerous places, don't go there. endmsg x 10 y 19 @@ -1887,8 +1880,7 @@ arch fatman name Bonzo the Banker msg @match * -Nooo! Don't steal my money. It's all -mine, mine, miiiine! +Nooo! Don't steal my money. It's all mine, mine, miiiine! endmsg x 11 y 7 @@ -3831,19 +3823,17 @@ arch sage name Gorgon the Warrior msg @match plate|mail -You greedy... rascal... get me the cure -first. *cough, cough* +You greedy... rascal... get me the cure first. *cough, cough* @match viper -Shadow... vipers? Ask my friend about it. -He might... know... *cough* +Shadow... vipers? Ask my friend about it. He might... know... *cough* @match * -I got... poisoned by the... *cough* -mudman. Please... help my friend... -to mix a... cure... *cough*. -If you do... I would... give you my... -best plate mail. +@question plate Your best plate mail, really? +I got... poisoned by the... *cough* mudman. Please... help my friend... to mix a... cure... *cough*. + +If you do... I would... give you my... best plate mail. endmsg face corpse.111 +animation NONE hp 500 maxhp 500 x 21 @@ -3903,48 +3893,49 @@ arch woodfloor x 21 y 25 end -arch sage +arch woodfloor +x 21 +y 26 +end +arch woodfloor +x 21 +y 27 +end +arch mage name Warloc Druid msg @match viper -A brood of shadow vipers exists -somewhere down the well of St. Dominion. -We've got only one well here in town, -so you can't miss it. Anyways, be careful -down there! +A brood of shadow vipers exists somewhere down the well of St. Dominion. + +We've got only one well here in town, so you can't miss it. Anyways, be careful down there! @match mudman -The mudman is a vile creature. He lurks in -the marshes south-west of this town. -It is said that in very dark nights, when no moon -is shining, he leaves the swamp to sneak around -our houses. +The mudman is a vile creature. He lurks in the marshes south-west of this town. + +It is said that in very dark nights, when no moon is shining, he leaves the swamp to sneak around our houses. @match yes|cure|okay -I'm still lacking three essential ingredients -to mix a cure for my friend: +@question viper Where can I find a shadow viper? +I'm still lacking three essential ingredients to mix a cure for my friend: - a beholder's tongue - a scorpion's stinger - skin of the shadow viper -When you have the ingredients, put them -into the cauldron here. As a reminder you -can take the list of ingredients from the -bookshelf with you. +When you have the ingredients, put them into the cauldron here. As a reminder you can take the list of ingredients from the bookshelf with you. @match help|gorgon|poison -Gorgon is a mighty warrior. A week ago -he went into the marshes looking for the -mudman who dwells there. -During battle, the mudman infected Gorgon -with deadly poison. Gorgon fled, but his -life is fading. +@question mudman What is the mudman? +@reply yes Ok, I'll help. +Gorgon is a mighty warrior. A week ago he went into the marshes looking for the mudman who dwells there. + +During battle, the mudman infected Gorgon with deadly poison. Gorgon fled, but his life is fading. + Would you help me to create a cure for him? @match * -Do you see my friend Gorgon in the other -room? He got poisoned. We need your help! +@question help How can I help? +Do you see my friend Gorgon in the other room? He got poisoned. We need your help! endmsg face mage.131 hp 500 maxhp 500 x 21 -y 25 +y 27 resist_physical 100 resist_magic 100 resist_fire 100 @@ -3968,14 +3959,6 @@ stand_still 1 end arch woodfloor x 21 -y 26 -end -arch woodfloor -x 21 -y 27 -end -arch woodfloor -x 21 y 28 end arch wwall_2_1_2 @@ -4057,17 +4040,17 @@ arch c_man name Sorcerer msg @match yes|story -North of St. Dominion there is a huge -tower, called the "Tower of Demonology". -It has been a school for summoning wizards -long ago. Someday, an evil shadow crept -in there. Rumors tell that a group of wizards -had abused their power to summon demons. +North of St. Dominion there is a huge tower, called the "Tower of Demonology". + +It has been a school for summoning wizards long ago. Someday, an evil shadow crept in there. + +Rumors tell that a group of wizards had abused their power to summon demons. @match * -You look like you are seeking adventures. -Care to hear a story? +@reply yes Sure, I always enjoy adventure stories. +You look like you are seeking adventures. Care to hear a story? endmsg face sorcerer.151 +animation sorcerer_class Pow 3 hp 200 maxhp 200 @@ -4079,6 +4062,7 @@ ac -5 x 22 y 8 level 6 +direction 4 resist_physical 50 resist_electricity 100 randomitems none @@ -4125,14 +4109,6 @@ arch wwall_2_1_2 x 22 y 16 end -arch magic_mouth -msg -This chest is decorated with silver -ornaments of crossed hammers. -endmsg -x 22 -y 17 -end arch woodfloor x 22 y 17 @@ -4308,8 +4284,7 @@ y 16 end arch magic_mouth msg -This chest is decorated with silver -ornaments of crossed hammers. +This chest is decorated with silver ornaments of crossed hammers. endmsg x 23 y 17 @@ -4325,10 +4300,7 @@ y 17 arch plate_mail title of dominion msg -This plate mail is forged of high quality -steel. It is lighter than usual but just -as strong. It even seems to protect a -little against fire. +This plate mail is forged of high quality steel. It is lighter than usual but just as strong. It even seems to protect a little against fire. endmsg resist_fire 20 value 5000 @@ -5516,8 +5488,11 @@ arch magic_mouth name 14 - done msg The Warlock Druid says: -Hooray! The potion is completed. Now my -friend Gorgon can be cured. +Hooray! The potion is completed. Now my friend Gorgon can be cured! + +Thank you very much! + +I'm sure Gorgon will reward you, go see him. endmsg x 29 y 26 @@ -5527,8 +5502,7 @@ end arch magic_mouth name 13 msg -You put the shadow viper's skin -into the cauldron. +You put the shadow viper's skin into the cauldron. endmsg x 29 y 26 @@ -5538,8 +5512,7 @@ end arch magic_mouth name 12 msg -You put the scorpion's stinger into -the cauldron. +You put the scorpion's stinger into the cauldron. endmsg x 29 y 26 @@ -5549,8 +5522,7 @@ end arch magic_mouth name 11 msg -You put the beholder's tongue into -the cauldron. +You put the beholder's tongue into the cauldron. endmsg x 29 y 26 @@ -5768,9 +5740,7 @@ arch fighter name Gorgon the Warrior msg @match * -Thank you for saving me. You shall have -my famous plate mail as reward. -It's in the chest right there. +Thank you for saving me. You shall have my famous plate mail as reward. It's in the chest right there. endmsg x 30 y 28