From 23518b19a828eb36e56c0cb0cd4a8f8778934ad6 Mon Sep 17 00:00:00 2001 From: Fate Date: Sun, 11 Jan 2009 14:24:01 -0700 Subject: Fixed a number of remaining bugs --- npc/013-1_Woodland_hills/sagatha.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'npc/013-1_Woodland_hills/sagatha.txt') diff --git a/npc/013-1_Woodland_hills/sagatha.txt b/npc/013-1_Woodland_hills/sagatha.txt index 222c1aa1..6165709c 100644 --- a/npc/013-1_Woodland_hills/sagatha.txt +++ b/npc/013-1_Woodland_hills/sagatha.txt @@ -49,7 +49,7 @@ function script SagathaStatus { if (@mouboo == 1) set @evil, 1; - if (MAGIC_FLAGS & FLAG_DID_CUTTREE) + if (MAGIC_FLAGS & MFLAG_DID_CUTTREE) set @evil, 1; set @druid, (((QUEST_MAGIC & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT) & 12) >> 2; @@ -186,7 +186,7 @@ L_teach_initial: callsub S_update_var; getexp 5000, 0; if (getskilllv(SKILL_MAGIC_ETHER) < 2) - skill SKILL_MAGIC_ETHER, 2; + setskill SKILL_MAGIC_ETHER, 2; next; mes "[Sagatha the Witch]"; @@ -258,21 +258,18 @@ L_teach_A10: next; mes "[Sagatha the Witch]"; mes "\"Then say '" + getspellinvocation("barrier") + "' and let the musroom's power take over.\""; - next; goto L_practice; L_teach_A11: if (@mexp < 350) goto L_teach_noexp; mes "[Sagatha the Witch]"; mes "\"If you must fight, call allies. You can call scorpions with a scorpion stinger. Hold up the stinger and call out to them: '" + getspellinvocation("summon-scorps") + "'.\""; - next; goto L_practice; L_teach_A12: if (@mexp < 450) goto L_teach_noexp; mes "[Sagatha the Witch]"; mes "\"You can call red scorpions, too. But for them you must call out '" + getspellinvocation("summon-red-scorps") + "' instead.\""; - next; goto L_practice; L_teach_N11: @@ -282,7 +279,6 @@ L_teach_N11: next; mes "[Sagatha the Witch]"; mes "\"Or call it into someone else's skin, by saying that someone's name right after the '" + getspellinvocation("protect") + "'.\""; - next; goto L_practice; L_teach_noexp: -- cgit v1.2.3-70-g09d2