From 4eb4a809106aea83b904bac55a397fae38e9ca07 Mon Sep 17 00:00:00 2001 From: Andreas Kirschbaum Date: Sun, 25 Jul 2021 12:48:59 +0200 Subject: [PATCH] Move @reply and @question lines to the end in dialogs using @match --- brest/brest.inn | 12 ++++++------ brest/taverns/brest.seaside.tavern | 10 +++++----- dungeons/liomal_ground | 2 +- inn_and_outpost/hermes_inn | 10 +++++----- inn_and_outpost/nirlas_house | 10 +++++----- inn_and_outpost/outpost_aranor1 | 8 ++++---- navar_city/iscar | 6 +++--- navar_city/misc/city1mermaid | 6 +++--- navar_city/university | 24 ++++++++++++------------ port_joseph/town/underground_tavern | 6 +++--- pup_land/rainbow/Lv3/Rufto | 6 +++--- pup_land/rainbow/Lv3/prison | 6 +++--- santo_dominion/tavern | 10 +++++----- santo_dominion/tavern.2ndfloor | 10 +++++----- scorn/houses/scorn_trappers | 6 +++--- scorn/houses/tyl | 6 +++--- scorn/misc/beginners2_entry | 10 +++++----- scorn/misc/beginners_entry | 10 +++++----- scorn/towers/brewery.2 | 8 ++++---- test/say | 10 +++++----- 20 files changed, 88 insertions(+), 88 deletions(-) diff --git a/brest/brest.inn b/brest/brest.inn index 5934228e7..b6dbe6c28 100644 --- a/brest/brest.inn +++ b/brest/brest.inn @@ -8,7 +8,7 @@ enter_x 14 enter_y 23 msg Created: 1994-09-24 Gene Alexander -Modified: 2013-08-06 Kevin Zheng +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch brush @@ -4168,11 +4168,11 @@ end arch sage msg @match irritable|zorn -@question secretive How are they secretive? Ah, yes. I do not know much about the Zorn family. They are quite a secretive bunch. +@question secretive How are they secretive? @match secretive -@question dangerous So they are dangerous too? Yes, secretive and dangerous. I do not want to be the subject of the Zorn family wrath. +@question dangerous So they are dangerous too? @match dangerous I mean dangerous as in those that bother or upset the Zorns end up dead. Haemon, the owner of the Brest Seaside Tavern, used to work for the Zorns. Go ask him your questions. @match * @@ -4378,16 +4378,16 @@ arch fighter name TCI Representative msg @match tci -@question location Where are these locations? Training Centers Incorporated is the best dang training you'll ever get. We have locations all over the world in exotic settings. Come fight with us! (heh, they tell us we have to say all that) +@question location Where are these locations? @match location Well, I don't know about all of them. But our local TCI is off the road south of here just the other side of the mountain pass. The road may be easier to reach from the Lake Country side. Just look for one of our signs! @match hello|hi -@question tci What is TCI? Well, hello there! Sit down and chat with me a bit. I am always looking for new people to tell about TCI. -@match * @question tci What is TCI? +@match * Hi there young'un. Wanna join TCI? +@question tci What is TCI? endmsg x 25 y 14 diff --git a/brest/taverns/brest.seaside.tavern b/brest/taverns/brest.seaside.tavern index eea151606..11b2eb9fd 100644 --- a/brest/taverns/brest.seaside.tavern +++ b/brest/taverns/brest.seaside.tavern @@ -7,7 +7,7 @@ enter_x 16 enter_y 13 msg Created: 2006-08-19 Gene Alexander -Modified: 2012-01-27 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg outdoor 1 end @@ -2047,22 +2047,22 @@ arch man name Haemon msg @match tavern -@question zorn You worked for Zorn? I bought this tavern with part of my pension from Zorn. +@question zorn You worked for Zorn? @match given_name|given name Do NOT tell Zorn I told you this. His given name is Zacharus Zorn. @match defeat_zorn|kill zorn|defeat zorn I know of no sure way to kill Zorn. But there is a rumor in Brest that Zorn was a sickly child and has a weak immune system. @match tough -@question defeat_zorn Do you know any way to defeat Zorn? It is true that Zorn is tough. Many people have tried to kill Zorn but very few have been able to defeat Zorn. +@question defeat_zorn Do you know any way to defeat Zorn? @match zorn +Yes, I used to be Zorn's manservant. He released me with a good pension many years ago. He is a tough but fair man. I am one of the few people to whom he entrusted his given name. @question tough So Zorn is tough? @question given_name What is Zorn's given name? -Yes, I used to be Zorn's manservant. He released me with a good pension many years ago. He is a tough but fair man. I am one of the few people to whom he entrusted his given name. @match * -@question tavern So you are the owner of this tavern? Hello! Welcome to my tavern. +@question tavern So you are the owner of this tavern? endmsg Con 50 hp 18000 diff --git a/dungeons/liomal_ground b/dungeons/liomal_ground index a3a6fd0bd..f258c30df 100644 --- a/dungeons/liomal_ground +++ b/dungeons/liomal_ground @@ -582,10 +582,10 @@ Well, my pets have become quite crazy, so I had to emprison them. And now I can't get anymore into my home... @match * -@question what What is terrible? Hello... Ha, this is terrible... +@question what What is terrible? endmsg x 4 y 16 diff --git a/inn_and_outpost/hermes_inn b/inn_and_outpost/hermes_inn index f14386bb8..72ee140e8 100644 --- a/inn_and_outpost/hermes_inn +++ b/inn_and_outpost/hermes_inn @@ -8,7 +8,7 @@ enter_x 7 enter_y 13 msg Created: 2002-10-27 Todd Mitchell -Modified: 2013-04-06 Kevin Zheng +Modified: 2021-07-25 Andreas Kirschbaum endmsg outdoor 1 end @@ -312,15 +312,15 @@ arch fatman name Hermes msg @match hi|hello -@question room Do you have a room for the night? Greetings, welcome to my inn. You must be cold and tired. +@question room Do you have a room for the night? @match room|bed -@question 50 Fifty goldcoins!? Need a room eh? Upstairs, cost ya 50 gold for one day. +@question 50 Fifty goldcoins!? @match 50|fifty -@reply ripoff You are ripping me off! Not much else around friend. +@reply ripoff You are ripping me off! @match ripoff|cheat|robbery You could always go sleep with the bears... @match billy|giant @@ -330,8 +330,8 @@ Who? Never heard of him. @match white Look. I'm getting tired of all your questions...understand me? @match * -@question room Do you have a room for the night? What can I gettcha? +@question room Do you have a room for the night? endmsg x 3 y 2 diff --git a/inn_and_outpost/nirlas_house b/inn_and_outpost/nirlas_house index 0129c4fd2..fdc651784 100644 --- a/inn_and_outpost/nirlas_house +++ b/inn_and_outpost/nirlas_house @@ -8,7 +8,7 @@ enter_x 24 enter_y 6 msg Created: 2004-05-28 Avion -Modified: 2012-02-03 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg outdoor 1 end @@ -1181,11 +1181,11 @@ msg @match hi|hello Hello, I am Nirla, please make yourself welcome. @match dark|forest -@question greenway What is this "Greenway"? Although it may seem to be many places where you can find it, there is only one Dark Forest. It is all connected - these connections are called The Greenway. +@question greenway What is this "Greenway"? @match greenway -@question portal Where can I find a portal? The Greenway of the forest spans the world (and some say even time itself). The portals are hard to find and the paths are chaotic and dangerous. Only the experienced may find their way. +@question portal Where can I find a portal? @match enter|portal Directly west of the Golden Yew you may find an entrance to The Greenway. @match * @@ -5433,13 +5433,13 @@ end arch elf_1 msg @match Nirla -@question queen What queen are you talking about? Yes this is her home. She is wise but also, she is the Queen's daughter. +@question queen What queen are you talking about? @match queen The Queen of the elves. @match * -@question Nirla Who is Nirla? Nirla keeps a restful house. +@question Nirla Who is Nirla? endmsg x 21 y 4 diff --git a/inn_and_outpost/outpost_aranor1 b/inn_and_outpost/outpost_aranor1 index 1eff9ce46..1d0f31327 100644 --- a/inn_and_outpost/outpost_aranor1 +++ b/inn_and_outpost/outpost_aranor1 @@ -8,7 +8,7 @@ enter_x 10 enter_y 18 msg Created: 2004-03-07 Avion -Modified: 2012-02-03 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg outdoor 1 end @@ -2376,17 +2376,17 @@ end arch merchant msg @match merchant|trade +I mostly trade with the elves. Some say it's dangerous but you just have to be cautious. @question elves Where are the elves? @question dangerous What do you mean with "dangerous"? -I mostly trade with the elves. Some say it's dangerous but you just have to be cautious. @match elves Yes there is a elven village to the west of here. @match dangerous -@question elves Where are the elves? Well the elves aren't really dangerous but the Dark Forest is... +@question elves Where are the elves? @match * -@question merchant Who do you trade with out here in the wilderness? Hello, good to meet you. I'm Zim, a merchant by trade. +@question merchant Who do you trade with out here in the wilderness? endmsg x 18 y 11 diff --git a/navar_city/iscar b/navar_city/iscar index 1f99c81f9..6a1f26c12 100644 --- a/navar_city/iscar +++ b/navar_city/iscar @@ -8,7 +8,7 @@ enter_x 4 enter_y 10 msg Created: 2008-02-09 Nicolas Weeger -Modified: 2020-07-31 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch grass @@ -448,11 +448,11 @@ msg @match why I lost my pen somewhere, and I don't have any spare one. @match what|job -@question why Why can't you write? I'm a writer, I write books for children. But I can't write now... +@question why Why can't you write? @match * -@question job What are you doing? Hello. +@question job What are you doing? endmsg x 5 y 7 diff --git a/navar_city/misc/city1mermaid b/navar_city/misc/city1mermaid index ef5762914..f4e3e68cc 100644 --- a/navar_city/misc/city1mermaid +++ b/navar_city/misc/city1mermaid @@ -8,7 +8,7 @@ enter_x 13 enter_y 13 msg Created: 1993-10-27 -Modified: 2012-05-12 Nicolas Weeger +Modified: 2021-07-25 Andreas Kirschbaum endmsg outdoor 1 end @@ -1046,13 +1046,13 @@ arch fighter name TCI Representative msg @match tci -@question location Where are the centers located? TCI, or Training Centers Incorporated, is the best dang training you'll ever get. We have locations all over the world in exotic settings. Come fight with us! (Heh, they tell us we have to say all that!) +@question location Where are the centers located? @match location Well, I don't know about all of them. But our local TCI is off the road north of here. Just head north for Darcap and look for one of our signs! @match hello|hi -@question tci what is TCI? Well, hello there! Sit down and chat with me a bit. I am always looking for new people to tell about TCI. +@question tci what is TCI? @match * Hi there young'un. Wanna join TCI? endmsg diff --git a/navar_city/university b/navar_city/university index 975b213b4..5e3dad90b 100644 --- a/navar_city/university +++ b/navar_city/university @@ -8,7 +8,7 @@ enter_x 24 enter_y 37 msg Created: 2008-05-17 Nicolas Weeger -Modified: 2012-05-20 Nicolas Weeger +Modified: 2021-07-25 Andreas Kirschbaum endmsg maplore The university features: @@ -1939,45 +1939,45 @@ Scorn and Navar were originally colonies from this Empire. Unfortunately, something happened to it some millenia ago, all contact was lost, and no one really knows what happened to it. @match world -@question khelens The Empire of Khelens? Well, explaining everything would take really much time, time I don't have, sorry. Let's just say that many cities are just colonies of the Empire of Khelens. -@match navar @question khelens The Empire of Khelens? -@question scorn What about Scorn? +@match navar Navar was once a colony of Khelens. After the loss of contact, both Navar and Scorn became rival for glory. +@question khelens The Empire of Khelens? +@question scorn What about Scorn? @match herghist Herghist was a famour explorer, who travelled the world without seeking any glory. @match darcap -@question herghist Herghist? Ha, the lost colony of Darcap... Initially, Darcap was a colony of the Kingdom of the Masts, left to survive when the kingdom disappeared. It was forgotten for millenia, before the famous explorer Herghist arrived there about two thousand years ago. +@question herghist Herghist? @match scorn -@question khelens The Empire of Khelens? -@question ek What does 'EK' mean? Scorn was the first colony of the Empire of Khelens to be established on this continent. The founder was Skud the Great, in 435 EK. In the next millenias, Scorn was destroyed a lot. -@match ek @question khelens The Empire of Khelens? +@question ek What does 'EK' mean? +@match ek Years are counted 'EK' based on the calendar of the Empire of Khelens. The first year seems to correspond to the founding of the Empire. +@question khelens The Empire of Khelens? @match * +Hello. @question world What do you know of the history of the world? @question navar So, is the history of Navar interesting? @question darcap Any idea about the history of Darcap? @question scorn Do you know anything about the history of Scorn? @question EK Do you happen to know what 'EK' means when we talk about years? -Hello. endmsg x 9 y 4 @@ -3114,13 +3114,13 @@ Ha, you'll want to talk to Professor Drolf. You can usually find her somewhere in the east wing. @match * +Hello, and welcome to Navar university! + +How can I help you? @question magic Do you have a department of magical studies? @question geography Do you have a department of world geography? @question history Do you have a department of world history? @question monster Do you have a department of monster lore? -Hello, and welcome to Navar university! - -How can I help you? endmsg x 13 y 37 diff --git a/port_joseph/town/underground_tavern b/port_joseph/town/underground_tavern index fe399ba74..d0e43144a 100644 --- a/port_joseph/town/underground_tavern +++ b/port_joseph/town/underground_tavern @@ -11,7 +11,7 @@ msg This tavern seems quite old, but is apparently much used. Created: 2007-05-26 Nicolas Weeger -Modified: 2012-02-21 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg maplore @quest Lursendis @@ -595,12 +595,12 @@ msg @match brother Yes, his brother is nicknamed the Mad Mage, famous in all Scorn. @match exploded -@question brother Ha, he has a brother? Yes, apparently from a magical experiment gone weird. Though he did survived, it is said he works for some king. Maybe his brother knows more, you should ask him directly. +@question brother Ha, he has a brother? @match farnass -@question exploded His house exploded, really? Haa, Farnass, now that's a name I haven't heard in a while. He was one of the best cook chiefs of the whole world. Brother of the Mad Mage of Scorn, he shared with him passion for wizardry; yet his center of interest was much more focused on making tasty things and brewing nice beers. Fifteen years ago his house just exploded. +@question exploded His house exploded, really? @match * Hello, youngster. endmsg diff --git a/pup_land/rainbow/Lv3/Rufto b/pup_land/rainbow/Lv3/Rufto index ae8c64b79..9318abfe0 100644 --- a/pup_land/rainbow/Lv3/Rufto +++ b/pup_land/rainbow/Lv3/Rufto @@ -8,7 +8,7 @@ enter_x 1 enter_y 1 msg Created: 1996-06-27 -Modified: 2012-04-11 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch pstone_4 @@ -514,11 +514,11 @@ Oh. I forgot to tell you. The holy word is: SEVEN @match test Yes. My test was over. You passed my test. Go to the next level, adventurer. @match guard -@reply test Tell me more about this testing. Yes. I test an adventurer whether he is worthy enough to enter the heroes mousoleum. +@reply test Tell me more about this testing. @match * -@question guard So, how do you guard this ruin? Welcome. I am a guard of this ruin. +@question guard So, how do you guard this ruin? endmsg hp 180 x 6 diff --git a/pup_land/rainbow/Lv3/prison b/pup_land/rainbow/Lv3/prison index 9d41e9eb8..4a51d0c29 100644 --- a/pup_land/rainbow/Lv3/prison +++ b/pup_land/rainbow/Lv3/prison @@ -7,7 +7,7 @@ height 16 enter_x 4 msg Created: 1996-06-27 -Modified: 2012-03-08 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch permanent_lava @@ -1227,11 +1227,11 @@ Gea-Ga-Ring Goraon Gran-Garan @match rufto -@question dragons What dragons? He is a guard of this ruin. To enter his room you must get four keys. His four dragons have the keys. +@question dragons What dragons? @match * -@question rufto Who is Rufto the wizard? ...Help me. I was captured by Rufto the wizard. +@question rufto Who is Rufto the wizard? endmsg hp 100 x 11 diff --git a/santo_dominion/tavern b/santo_dominion/tavern index 86c689111..9fe7d86ff 100644 --- a/santo_dominion/tavern +++ b/santo_dominion/tavern @@ -8,7 +8,7 @@ enter_x 14 enter_y 18 msg Created: 1994-04-05 Andreas Vogl (red.blaze@gmx.net) -Modified: 2013-03-20 Kevin Zheng +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch grass @@ -754,13 +754,13 @@ arch fighter name TCI Representative msg @match tci -@question location location And what are those locations? Training Centers Incorporated is the best dang training you'll ever get. We have locations all over the world in exotic settings. Come fight with us! (heh, they tell us we have to say all that) +@question location location And what are those locations? @match location Well, I don't know about all of them. But our local TCI is off the road south of here. Just look for one of our signs! @match hello|hi -@question tci What is TCI? Well, hello there! Sit down and chat with me a bit. I am always looking for new people to tell about TCI. +@question tci What is TCI? @match * Hi there young'un. Wanna join TCI? endmsg @@ -1203,8 +1203,8 @@ Sure, it's just a matter of having enough money. I made some sailing, and the p @match mudman Huh... Mudman? What's that? @match * -@question apartment You can buy a apartment around here? Santo Dominion is a nice little town. I bought one of the apartments and now I'm staying here for the weekends. +@question apartment You can buy a apartment around here? endmsg hp 100 maxhp 100 @@ -2006,8 +2006,8 @@ Shhh! You must not speak HIS name! It's not healthy to be that curious. @match warrior|wound|upstairs Maybe you should look after him? @match * -@question warrior A warrior, really? There's a wounded warrior in one of the rooms upstairs. That guy is in real bad shape. I wonder what happened to him? +@question warrior A warrior, really? endmsg x 14 y 8 diff --git a/santo_dominion/tavern.2ndfloor b/santo_dominion/tavern.2ndfloor index 380168906..d7753d409 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: 2012-06-03 Nicolas Weeger +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch grass @@ -3801,8 +3801,8 @@ You greedy... rascal... get me the cure first. *cough, cough* @match viper Shadow... vipers? Ask my friend about it. He might... know... *cough* @match * -@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. +@question plate Your best plate mail, really? endmsg face corpse.111 animation NONE @@ -3862,19 +3862,19 @@ A brood of shadow vipers exists somewhere down the well of Santo Dominion. We'v @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. @match yes|cure|okay -@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. +@question viper Where can I find a shadow viper? @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. Would you help me to create a cure for him? @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 * -@question help How can I help? Do you see my friend Gorgon in the other room? He got poisoned. We need your help! +@question help How can I help? endmsg face mage.131 hp 500 diff --git a/scorn/houses/scorn_trappers b/scorn/houses/scorn_trappers index 471795e0b..e3506b03f 100644 --- a/scorn/houses/scorn_trappers +++ b/scorn/houses/scorn_trappers @@ -9,7 +9,7 @@ enter_x 8 enter_y 8 msg Created: 2007-05-27 Nicolas Weeger -Modified: 2021-05-27 Kevin Zheng +Modified: 2021-07-25 Andreas Kirschbaum endmsg maplore @quest Lursendis @@ -437,12 +437,12 @@ Yes, of course. Step this way. @match sentrino Why yes, a farm hand of his came by not too long ago for livers and hearts. @match yes|offerings|products +We specialize in orc and goblin cuts, but only their noble parts: hearts, livers, and brains. @question shop Can I visit the shop? @question sentrino Do you happen to know someone named Sentrino? -We specialize in orc and goblin cuts, but only their noble parts: hearts, livers, and brains. @match hi|hello -@reply yes Yes please, what do you sell here? Hello, welcome to Scorn's Trappers! Do you wish to know more about our offerings? +@reply yes Yes please, what do you sell here? @match * ... *sigh* People just aren't polite nowadays... endmsg diff --git a/scorn/houses/tyl b/scorn/houses/tyl index 80cdde183..e20be4a45 100644 --- a/scorn/houses/tyl +++ b/scorn/houses/tyl @@ -7,7 +7,7 @@ enter_x 3 enter_y 9 msg Created: 2009-12-05 Nicolas Weeger -Modified: 2014-03-28 Kevin Zheng +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch cobblestones2 @@ -399,13 +399,13 @@ Ha well, you seem like a decent follow, so I will let you look if you can reply @match see Well, I'm not sure, they are precious ones... @match store -@question see Could I see them? I store them in this house, in the attic. +@question see Could I see them? @match job @question store Where do you store all those books? I collect stories, books, whatever I can find. @match hello -@question job What is your job? Hello there! +@question job What is your job? @match * *grumble* endmsg diff --git a/scorn/misc/beginners2_entry b/scorn/misc/beginners2_entry index 7695bd4a9..c6764e380 100644 --- a/scorn/misc/beginners2_entry +++ b/scorn/misc/beginners2_entry @@ -8,7 +8,7 @@ enter_x 9 enter_y 8 msg Created: 2016-07-29 Rick Tanner -Modified: 2016-07-31 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg outdoor 1 end @@ -347,18 +347,18 @@ arch sage name Sage of Training msg @match hi|hello -@reply test Well yes, of course! Greetings Adventurer! Here to test your skills and abilities? +@reply test Well yes, of course! @match skills|skill|test|abilities|portal|arch +Proceed through the archway ahead and bring back the red key and choose a reward.. @question reward A reward, really? @question key Can you tell me anything about the red key? -Proceed through the archway ahead and bring back the red key and choose a reward.. @match reward -@question key Can you tell me anything about the red key? Why yes, a reward. To your left is a Potion of Healing - recover and heal yourself after battle, and a Potion of Minor Potion of LIfe - recover lost stats after an untimely, but momentary death. To your right is a Potion of Shielding - protect you for physical attacks for a limited time, and a Potion of Heroism - a tempary boost to your strength, health and quickness; great for combat during your many adventures. +@question key Can you tell me anything about the red key? @match key|red -@question reward So this key gives me a reward? A sly and clever Gnoll Champion stole the key and I suspect he has it hidden somewhere in the dungeon. Explore, use your might, use your wit. Fight and survive and come back here to collect your prizes. +@question reward So this key gives me a reward? @match * Good day, traveler! endmsg diff --git a/scorn/misc/beginners_entry b/scorn/misc/beginners_entry index 1bff4e56a..b927af123 100644 --- a/scorn/misc/beginners_entry +++ b/scorn/misc/beginners_entry @@ -8,7 +8,7 @@ enter_x 9 enter_y 8 msg Created: 2011-09-07 Rick Tanner -Modified: 2016-07-29 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg outdoor 1 end @@ -343,18 +343,18 @@ arch sage name Sage of Training msg @match hi|hello -@reply test Well yes, of course! Greetings Adventurer! Here to test your skills and abilities? +@reply test Well yes, of course! @match skills|skill|test|abilities|portal|arch +Proceed through the archway ahead and bring back the blue key and choose a reward.. @question reward A reward, really? @question key Can you tell me anything about the blue key? -Proceed through the archway ahead and bring back the blue key and choose a reward.. @match reward -@question key Can you tell me anything about the blue key? Why yes, a reward. To your left is a Potion of Healing - recover and heal yourself after battle. To your right is a Potion of Minor Life - recover lost stats after an untimely, but momentary death. +@question key Can you tell me anything about the blue key? @match key|blue -@question reward So this key gives me a reward? A devious Ogre holds the key. But don't expect to find him to easily. Explore, use your might, use your wit. Fight and survive and come back here to collect your prize. +@question reward So this key gives me a reward? @match * Good day, traveler! endmsg diff --git a/scorn/towers/brewery.2 b/scorn/towers/brewery.2 index fde4f1606..c87f01a4f 100644 --- a/scorn/towers/brewery.2 +++ b/scorn/towers/brewery.2 @@ -8,7 +8,7 @@ enter_x 7 enter_y 8 msg Creator: 2007-09-12 lauwenmark -Modified: 2012-01-18 Rick Tanner +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch woodfloor @@ -444,18 +444,18 @@ arch fatman name Morioch msg @match rebel -@question key The key? My employees, of course. They rebelled and took over the factory. And they hold the key! +@question key The key? @match reward You'll know the secret of my beer, and still you expect a reward? Well, I guess you can have a potion, and whatever you find downstairs... @match key -@question reward And what will be my reward? Yeah, the key to my secret beer recipe! What will Scorn become without beer? If you want to help me, open the door at the left, climb down the stairs, and put an end to the stake. Then, bring back the key and open the secure room at the right. +@question reward And what will be my reward? @match * -@question rebel Who rebelled? It is terrible, please help me! They rebelled! +@question rebel Who rebelled? endmsg x 7 y 2 diff --git a/test/say b/test/say index 833774302..6caf28e30 100644 --- a/test/say +++ b/test/say @@ -4,7 +4,7 @@ width 10 height 10 msg Created: 2008-05-11 Nicolas Weeger -Modified: 2008-06-28 Nicolas Weeger +Modified: 2021-07-25 Andreas Kirschbaum endmsg end arch pstone_4 @@ -323,19 +323,19 @@ Left or right does match, yes. @match test Yes, to make sure everything works. @match dialog -@question rewritten Why is it being rewritten? It is being rewritten... +@question rewritten Why is it being rewritten? @match rewritten Well, it was really not that powerful... @match yes It seems this works... @match * -@question test Test the dialog system? -@question dialog The dialog system? -@reply yes Yes, please. hello, I'm an NPC to test the dialog system. You want me to explain something? +@question test Test the dialog system? +@question dialog The dialog system? +@reply yes Yes, please. endmsg x 7 y 8