summaryrefslogtreecommitdiff
path: root/npc/009-2_Hurnscald
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-01-11 14:24:01 -0700
committerFate <fate-tmw@googlemail.com>2009-01-11 14:24:01 -0700
commit23518b19a828eb36e56c0cb0cd4a8f8778934ad6 (patch)
tree4377b121fb966b602e610548dbdbb15cd9f3358c /npc/009-2_Hurnscald
parent54238fbc5acca341449cd0b73b12e3b257a6d2cb (diff)
downloadserverdata-23518b19a828eb36e56c0cb0cd4a8f8778934ad6.tar.gz
serverdata-23518b19a828eb36e56c0cb0cd4a8f8778934ad6.tar.bz2
serverdata-23518b19a828eb36e56c0cb0cd4a8f8778934ad6.tar.xz
serverdata-23518b19a828eb36e56c0cb0cd4a8f8778934ad6.zip
Fixed a number of remaining bugs
Diffstat (limited to 'npc/009-2_Hurnscald')
-rw-r--r--npc/009-2_Hurnscald/misc.txt1
-rw-r--r--npc/009-2_Hurnscald/wyara.txt33
2 files changed, 21 insertions, 13 deletions
diff --git a/npc/009-2_Hurnscald/misc.txt b/npc/009-2_Hurnscald/misc.txt
index f3bbe545..9a929203 100644
--- a/npc/009-2_Hurnscald/misc.txt
+++ b/npc/009-2_Hurnscald/misc.txt
@@ -53,6 +53,7 @@ L_magic:
mes "[Bookshelf]";
mes "You can't make out anything else of value, so you place the manuscript back in the bookshelf.";
next;
+ close;
L_magic_boring:
mes "[Bookshelf]";
diff --git a/npc/009-2_Hurnscald/wyara.txt b/npc/009-2_Hurnscald/wyara.txt
index d97f6c86..d3f5b2d1 100644
--- a/npc/009-2_Hurnscald/wyara.txt
+++ b/npc/009-2_Hurnscald/wyara.txt
@@ -6,7 +6,7 @@ function script PurificationPotion {
if (isat("011-1.gat", 88,67))
goto L_correct;
- announce "This doesn't seem to be the right place.", 7;
+ message strcharinfo(0), "This doesn't seem to be the right place.";
getitem @PURIFICATIONPOTION, 1;
close;
L_correct:
@@ -19,7 +19,7 @@ L_correct:
if (@Q_status < @STATUS_PURIFY_ONCE)
set @Q_status, @STATUS_PURIFY_ONCE;
- announce "You pour the potion into the pond.", 7;
+ message strcharinfo(0), "You pour the potion into the pond.";
set QUEST_MAGIC2,
(QUEST_MAGIC2 & ~(@Q_MASK)
@@ -39,6 +39,7 @@ L_correct:
set @STATUS_PURIFY_EXPLAINED, 1;
set @STATUS_PURIFY_ONCE, 2;
set @STATUS_PURIFY_TWICE, 3;
+ set @STATUS_PURIFY_OVER, 4;
set @MAUVE, 680;
set @MAGGOTSLIME, 505;
@@ -48,6 +49,10 @@ L_correct:
set @has_magic, getskilllv(SKILL_MAGIC);
+ if (@Q_status == @STATUS_PURIFY_ONCE)
+ goto L_Magic_purify_once;
+ if (@Q_status == @STATUS_PURIFY_TWICE)
+ goto L_Magic_purify_done;
mes "[Wyara the witch]";
if (!Sex)
@@ -314,9 +319,10 @@ L_Magic_purify_explained:
next;
menu
- "I shall get them later.", Magic_main,
- "Booring.", Magic_main,
- "Here they are.", -,
+ "I shall get them later.", L_Magic_main,
+ "Booring.", L_Magic_main,
+ "Here they are.", -;
+
getinventorylist;
if ((@inventorylist_count == 100) && (countitem(@MAUVE) > 20) && (countitem(@MAGGOTSLIME) > 20))
goto L_Magic_purify_nospace;
@@ -365,9 +371,9 @@ L_Magic_purify_once:
next;
menu
- "I'll get them later.", Magic_main,
- "No way.", Magic_main,
- "Here you are.", -,
+ "I'll do that later.", L_Main,
+ "No way.", L_Main,
+ "Here you are.", -;
getinventorylist;
if ((@inventorylist_count == 100) && (countitem(@MAUVE) > 20) && (countitem(@MAGGOTSLIME) > 20))
goto L_Magic_purify_nospace;
@@ -389,14 +395,14 @@ L_Magic_purify_doit2:
next;
close;
-L_Magic_purify_twice:
+L_Magic_purify_done:
mes "[Wyara the Witch]";
mes "Wyara smiles at you.";
mes "\"A friend told me... you have saved the pond for now. Perhaps it will need some more attention later, but I'll ask others for this.\"";
next;
mes "[Wyara the Witch]";
- mes "\"Please kneel down and touch the ground.\"";
+ mes "\"Please sit down and touch the ground.\"";
next;
menu
@@ -404,7 +410,7 @@ L_Magic_purify_twice:
"No way!", L_Magic_purify_abort;
mes "[Wyara the Witch]";
- mes "You kneel down and touch the ground, and so does Wyara.";
+ mes "You sit down and touch the ground, and so does Wyara.";
next;
mes "[Wyara the Witch]";
@@ -426,10 +432,11 @@ L_Magic_purify_twice:
getexp 5000, 0;
if (getskilllv(SKILL_MAGIC_NATURE) < 2)
- skill SKILL_MAGIC_NATURE, 2;
+ setskill SKILL_MAGIC_NATURE, 2;
+ set @Q_status, @STATUS_PURIFY_OVER;
+ callsub S_update_var;
close;
-
L_Magic_purify_abort:
mes "[Wyara the Witch]";
mes "\"I can't help you if you don't subject yourself to the ritual.\"";