summaryrefslogtreecommitdiff
path: root/npc/013-1_Woodland_hills
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-01-10 13:21:56 -0700
committerFate <fate-tmw@googlemail.com>2009-01-10 13:21:56 -0700
commit54238fbc5acca341449cd0b73b12e3b257a6d2cb (patch)
tree829ab46761676236ae60e7d161754f2de7220e9a /npc/013-1_Woodland_hills
parentd075f25617f1306ad2aef2b1e87567f6c683aa7f (diff)
downloadserverdata-54238fbc5acca341449cd0b73b12e3b257a6d2cb.tar.gz
serverdata-54238fbc5acca341449cd0b73b12e3b257a6d2cb.tar.bz2
serverdata-54238fbc5acca341449cd0b73b12e3b257a6d2cb.tar.xz
serverdata-54238fbc5acca341449cd0b73b12e3b257a6d2cb.zip
Numerous fixes. Magic level 0 should be fully operational now.
Diffstat (limited to 'npc/013-1_Woodland_hills')
-rw-r--r--npc/013-1_Woodland_hills/sagatha.txt25
1 files changed, 12 insertions, 13 deletions
diff --git a/npc/013-1_Woodland_hills/sagatha.txt b/npc/013-1_Woodland_hills/sagatha.txt
index ed2a20b6..222c1aa1 100644
--- a/npc/013-1_Woodland_hills/sagatha.txt
+++ b/npc/013-1_Woodland_hills/sagatha.txt
@@ -1,7 +1,7 @@
// Sagatha the witch, expert for nature and ether magic
//----------------------------------------
-function script QuestSagathaHappy {
+function script QuestSagathaHappy {
set @unhappiness, (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT;
if (@unhappiness < @value)
goto L_zero;
@@ -18,7 +18,7 @@ L_write:
}
//----------------------------------------
-function script QuestSagathaAnnoy {
+function script QuestSagathaAnnoy {
set @unhappiness, (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT;
if ((@unhappiness + @value) > 15)
goto L_max;
@@ -34,7 +34,7 @@ L_write:
return;
}
-function script SagathaStatus {
+function script SagathaStatus {
set @mexp, MAGIC_EXPERIENCE & 65535;
set @has_magic, getskilllv(SKILL_MAGIC);
set @evil, 0;
@@ -139,18 +139,18 @@ L_evil:
L_unhappy:
mes "The witch glares at you in anger.";
- mes "\"I wonder if you can still sleep after killing those innocent forest creatures! I am sure that they will come back to haunt you in your dreams!\"";
+ mes "\"I wonder if you can still sleep after killing those innocent forest creatures!";
+ mes "I am sure that they will come back to haunt you in your dreams!\"";
next;
close;
L_wb:
- mes "[Sagatha the Witch]";
if (@good > 1)
- msg "Sagatha nods as she notices you.";
+ mes "Sagatha nods as she notices you.";
if (@good == 1)
- msg "Sagatha raises an eyebrow as you address her.";
+ mes "Sagatha raises an eyebrow as you address her.";
if (@good == 0)
- msg "Sagatha glances at you, suspicion evident in her eyes.";
+ mes "Sagatha glances at you, suspicion evident in her eyes.";
next;
L_main:
@@ -187,6 +187,7 @@ L_teach_initial:
getexp 5000, 0;
if (getskilllv(SKILL_MAGIC_ETHER) < 2)
skill SKILL_MAGIC_ETHER, 2;
+ next;
mes "[Sagatha the Witch]";
mes "\"In the future, I will teach you nature and ether magic. For the other schools there are better teachers around.\"";
@@ -313,13 +314,13 @@ L_Q_old_wizard:
mes "[Sagatha the Witch]";
mes "\"A kind and wise wizard.\"";
next;
- goto L_main_menu;
+ goto L_main;
L_Q_imp:
mes "[Sagatha the Witch]";
mes "\"He is an evil and cruel one. He lies and cheats and will try to take advantage of you. Stay away from him.\"";
next;
- goto L_main_menu;
+ goto L_main;
L_Q_elanore:
mes "[Sagatha the Witch]";
@@ -338,14 +339,12 @@ L_Q_manaseed:
goto L_main;
L_Q_manaseed_unabsorbed:
- mes "[Sagatha the Witch]";
mes "\"If the mana seed didn't pass its magic to you, you clearly aren't attuned to magic.\"";
next;
goto L_main;
L_Q_manaseed_m:
- mes "[Sagatha the Witch]";
- mes "\"You were lucky that the mana seed gave you its magic.\"";
+ mes "\"You were lucky that the mana seed gave you its magic. I hope that you will use this power for something good now.\"";
next;
goto L_main;