summaryrefslogtreecommitdiff
path: root/npc/009-2_Hurnscald
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-05-30 12:18:30 +0000
committerFate <fate-tmw@googlemail.com>2009-05-30 12:18:30 +0000
commitf17c823d6f91ae535ebcadd8b5b369efea09b772 (patch)
treede58cdc249b70e95790f8c4eb48668d990f39e90 /npc/009-2_Hurnscald
parentba376b018e2a05412ae037d4dc976892e61cd088 (diff)
downloadserverdata-f17c823d6f91ae535ebcadd8b5b369efea09b772.tar.gz
serverdata-f17c823d6f91ae535ebcadd8b5b369efea09b772.tar.bz2
serverdata-f17c823d6f91ae535ebcadd8b5b369efea09b772.tar.xz
serverdata-f17c823d6f91ae535ebcadd8b5b369efea09b772.zip
Misc. fixes to magic, mostly suggested/pointed out by Kess
Diffstat (limited to 'npc/009-2_Hurnscald')
-rw-r--r--npc/009-2_Hurnscald/wyara.txt36
1 files changed, 29 insertions, 7 deletions
diff --git a/npc/009-2_Hurnscald/wyara.txt b/npc/009-2_Hurnscald/wyara.txt
index f79cb733..a2abec12 100644
--- a/npc/009-2_Hurnscald/wyara.txt
+++ b/npc/009-2_Hurnscald/wyara.txt
@@ -201,7 +201,7 @@ L_Magic_main:
L_Magic_explain:
mes "[Wyara the Witch]";
- mes "\"Magic is just a name for the force that lives in all plants and animals and emenates from there into all things, living or dead.\"";
+ mes "\"Magic is just a name for the force that lives in all plants and animals and emanates from there into all things, living or dead.\"";
next;
mes "[Wyara the Witch]";
@@ -249,20 +249,42 @@ L_Magic_train:
if (getskilllv(SKILL_MAGIC_NATURE) > 1)
goto L_Magic_train_no;
mes "[Wyara the Witch]";
+
+ if (@Q_status >= @STATUS_PURIFY_EXPLAINED)
+ goto L_Magic_train_wb;
+
mes "\"Train you? No... you should talk to Sagatha.\"";
mes "She hesitates.";
next;
callfunc "SagathaStatus";
- mes "[Wyara the Witch]";
- mes "\"It would be difficult to ask her to accept you unless you understand some of the basics already, though.\"";
if (@evil)
- mes "\"However, I have heard that you have done something unforgiveable; I doubt that she will train you now, and I refuse to do so, too.\"";
+ goto L_Magic_train_evil;
+
+ mes "[Wyara the Witch]";
+ mes "\"It would be difficult to ask her to accept you unless you understand some of the basics already.\"";
+ next;
+
+ goto L_Magic_train_dispatch;
+
+L_Magic_train_evil:
+ mes "Wyara looks at you sadly.";
+ mes "\"I have heard that you have done something unforgiveable. No witch in this land will teach you now.\"";
next;
+ goto L_Magic_main;
+
+L_Magic_train_wb:
+ callfunc "SagathaStatus";
+
if (@evil)
- goto L_Magic_main;
+ goto L_Magic_train_evil;
+
+ mes "\"Ah, yes, your training...\"";
+ next;
+
+L_Magic_train_dispatch:
if (@Q_status == @STATUS_PURIFY_TWICE)
goto L_Magic_purify_done;
if (@Q_status == @STATUS_PURIFY_ONCE)
@@ -310,7 +332,7 @@ L_Magic_purify_explained:
delitem "MaggotSlime", 20;
getitem "PurificationPotion", 1;
mes "[Wyara the Witch]";
- mes "\"Wyara grinds the leaves and mixes them with the slime, boils them, then speaks a brief incantation over them and hands you the result.\"";
+ mes "Wyara grinds the leaves and mixes them with the slime, boils them, then speaks a brief incantation over them and hands you the result.";
next;
L_Magic_purify_doit:
@@ -361,7 +383,7 @@ L_Magic_purify_once:
delitem "MaggotSlime", 20;
getitem "PurificationPotion", 1;
mes "[Wyara the Witch]";
- mes "\"Wyara brews another purification potion.\"";
+ mes "Wyara brews another purification potion.";
next;
L_Magic_purify_doit2:
mes "[Wyara the Witch]";