diff options
| -rw-r--r-- | npc/002-1/elanore.txt | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/npc/002-1/elanore.txt b/npc/002-1/elanore.txt index 4217c77c..1b547819 100644 --- a/npc/002-1/elanore.txt +++ b/npc/002-1/elanore.txt @@ -49,8 +49,7 @@ function script elanore_decrease_exp { // This operation works around an earlier possible corruption of this state if (@Q_status > @Q_STATUS_MAX) - @Q_status = @ST_INITIAL; - callsub S_Update_Var; + setq1(MagicQuest_Healing, @ST_INITIAL); if (sc_check(SC_POISON) || sc_check(SC_DPOISON)) goto L_CurePoison; if (BaseLevel > 20) goto L_NoHeal; mesn l("Elanore the Healer"); @@ -210,8 +209,7 @@ L_T_Initial: if ((@inventorylist_count == 100) && (countitem("Lifestone") == 0)) goto L_T_Initial_Noroom; getitem "Lifestone", 1; learnskill SKILL_LUM; - @Q_status = @ST_LEARNED_LIGHT_HEAL; - callsub S_Update_Var; + setq1(MagicQuest_Healing, @ST_LEARNED_LIGHT_HEAL); mesn l("Elanore the Healer"); mes "Elanore hands you the crystal."; @@ -248,8 +246,7 @@ L_T_AdvTo2_skip: next; mesn l("Elanore the Healer"); mes "You feel a strange, tingling kind of warmth spread through your body."; - @Q_status = @ST_MASTERED_LIGHT_HEAL; - callsub S_Update_Var; + setq1(MagicQuest_Healing, @ST_MASTERED_LIGHT_HEAL); @SUP_xp = 5000; @SUP_lvl = 2; callfunc "SkillUp"; @@ -283,8 +280,7 @@ L_T_ChkAdvToLOH: mes "[1000 experience points]"; getexp 1000, 0; learnskill SKILL_INMA; - @Q_status = @ST_LEARNED_LAYONHANDS; - callsub S_Update_Var; + setq1(MagicQuest_Healing, @ST_LEARNED_LAYONHANDS); goto L_close; L_T_LOH_adv_abort0: @@ -305,8 +301,7 @@ L_T_Explain3: mesc l("Elanore smiles."); mes "\"You seem to be ready to advance as a healer. There is one favour I must ask of you first, though.\""; set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(NIBBLE_3_MASK)); // Initialise Kadiya quest - @Q_status = @ST_WAITING_FOR_KADIYA; - callsub S_Update_Var; + setq1(MagicQuest_Healing, @ST_WAITING_FOR_KADIYA); next; mesn l("Elanore the Healer"); @@ -403,8 +398,7 @@ L_T_AdvTo3Ready: mes "[" + @xp + " experience points]"; mes "[Level 3 in Life Magic]"; - @Q_status = @ST_READY_TO_CURE_POISON; - callsub S_Update_Var; + setq1(MagicQuest_Healing, @ST_READY_TO_CURE_POISON); getexp @xp, 0; if (getskilllv(SKILL_MAGIC_LIFE) < 3) updateskill SKILL_MAGIC_LIFE, 3; @@ -440,8 +434,7 @@ L_T_CurePosion: mes "\"Once again, the invocation is `" + get(.invocation$, "cure-poison") + "'.\""; mes "\"Come back again soon; there is another spell I would like to teach you.\""; next; - @Q_status = @ST_LEARNED_CURE_POISON; - callsub S_Update_Var; + setq1(MagicQuest_Healing, @ST_LEARNED_CURE_POISON); goto L_Main; L_T_dunno: @@ -546,8 +539,4 @@ L_close: @ST_LEARNED_CURE_POISON = 0; @xp = 0; close; - -S_Update_Var: - setq(MagicQuest_Healing, @Q_status); - return; } |