Trim some weird stuff at elli

2 files changed, 32 insertions, 32 deletions

diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index c43c8593..a88951d6 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -38816,6 +38816,6 @@ skill_db: (
 		SPCost: 10
 	}
 },
-// MagicBlade Sulphur Kalmurk Parum ArrowHail Barrier(OK?) EnchantLifestone FlyingBackpack(?) Joyplim Hide(?) Ingrav Knuclkes MakeArrow MakeIronPowder MakeShirt MakeTanktop MakeSTanktop Protect Rain Shear SFluffy SMouboo SPinkie SSnake SSPiky SWicked ToxicDart Necro
+// MagicBlade Sulphur Kalmurk Parum ArrowHail Barrier(OK?) EnchantLifestone FlyingBackpack(?) Joyplim Hide(?) Rain Ingrav Knuclkes MakeArrow MakeIronPowder MakeShirt MakeTanktop MakeSTanktop Protect Shear SFluffy SMouboo SPinkie SSnake SSPiky SWicked ToxicDart Necro
 )
 
diff --git a/npc/002-1/elanore.txt b/npc/002-1/elanore.txt
index 07ff832b..4217c77c 100644
--- a/npc/002-1/elanore.txt
+++ b/npc/002-1/elanore.txt
@@ -7,9 +7,9 @@ function	script	ElanoreFix	{
 
     @Q_status = (QUEST_MAGIC2 & @Q_MASK) >> @Q_SHIFT;
     if (@Q_status > @Q_STATUS_MAX)
-    @Q_status = @STATUS_INITIAL;
+    @Q_status = @ST_INITIAL;
     if (@Q_status > 1 && (getskilllv(SKILL_MAGIC_LIFE) < 2))
-    @Q_status = @STATUS_INITIAL;
+    @Q_status = @ST_INITIAL;
 
     QUEST_MAGIC2 = (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
     return;
@@ -37,19 +37,19 @@ function	script	elanore_decrease_exp	{
     @SUP_id = SKILL_MAGIC_LIFE;
     @SUP_name$ = "Life Magic";
 
-    @STATUS_INITIAL = 0;
-    @STATUS_LEARNED_LIGHT_HEAL = 1;
-    @STATUS_MASTERED_LIGHT_HEAL = 2;
-    @STATUS_LEARNED_LAY_ON_HANDS = 3;
-    @STATUS_WAITING_FOR_KADIYA = 4;
-    @STATUS_READY_TO_LEARN_CURE_POISON = 5;
-    @STATUS_LEARNED_CURE_POISON = 6;
+    @ST_INITIAL = 0;
+    @ST_LEARNED_LIGHT_HEAL = 1;
+    @ST_MASTERED_LIGHT_HEAL = 2;
+    @ST_LEARNED_LAYONHANDS = 3;
+    @ST_WAITING_FOR_KADIYA = 4;
+    @ST_READY_TO_CURE_POISON = 5;
+    @ST_LEARNED_CURE_POISON = 6;
 
     callfunc "ElanoreFix";
 
     // This operation works around an earlier possible corruption of this state
     if (@Q_status > @Q_STATUS_MAX)
-    @Q_status = @STATUS_INITIAL;
+    @Q_status = @ST_INITIAL;
     callsub S_Update_Var;
     if (sc_check(SC_POISON) || sc_check(SC_DPOISON)) goto L_CurePoison;
     if (BaseLevel > 20) goto L_NoHeal;
@@ -88,13 +88,13 @@ L_Chat:
     goto L_Main;
 
 L_Main:
-    if (@has_magic && (@Q_status == @STATUS_INITIAL))
+    if (@has_magic && (@Q_status == @ST_INITIAL))
         menu
             "Can you heal me?", L_NoHealMessage,
             "Can you teach me magic?", L_Teach,
             "What do you know about...", L_Question,
             "Goodbye!", L_Bye;
-    if (@has_magic && (@Q_status > @STATUS_INITIAL))
+    if (@has_magic && (@Q_status > @ST_INITIAL))
         menu
             "Can you heal me?", L_NoHealMessage,
             "Can you teach me more?", L_Teach,
@@ -173,13 +173,13 @@ L_MakeSelf_no:
     goto L_close;
 
 L_Teach:
-    if (@Q_status == @STATUS_INITIAL) goto L_T_Initial;
-    if (@Q_status == @STATUS_LEARNED_LIGHT_HEAL) goto L_T_ChkAdvTo2;
-    if (@Q_status == @STATUS_MASTERED_LIGHT_HEAL) goto L_T_ChkAdvToLOH;
-    if (@Q_status == @STATUS_LEARNED_LAY_ON_HANDS) goto L_T_Explain3;
-    if (@Q_status == @STATUS_WAITING_FOR_KADIYA) goto L_T_ChkAdvTo3;
-    if (@Q_status == @STATUS_READY_TO_LEARN_CURE_POISON) goto L_T_CurePosion;
-    if (@Q_status == @STATUS_LEARNED_CURE_POISON) goto L_T_dunno;
+    if (@Q_status == @ST_INITIAL) goto L_T_Initial;
+    if (@Q_status == @ST_LEARNED_LIGHT_HEAL) goto L_T_ChkAdvTo2;
+    if (@Q_status == @ST_MASTERED_LIGHT_HEAL) goto L_T_ChkAdvToLOH;
+    if (@Q_status == @ST_LEARNED_LAYONHANDS) goto L_T_Explain3;
+    if (@Q_status == @ST_WAITING_FOR_KADIYA) goto L_T_ChkAdvTo3;
+    if (@Q_status == @ST_READY_TO_CURE_POISON) goto L_T_CurePosion;
+    if (@Q_status == @ST_LEARNED_CURE_POISON) goto L_T_dunno;
 
     mesn l("Elanore the Healer");
     mes "\"You have made good progress, but you lack the magical power to advance further. Also, I would like to observe you some more to be certain that you will make a good healer.\"";
@@ -210,7 +210,7 @@ L_T_Initial:
     if ((@inventorylist_count == 100) && (countitem("Lifestone") == 0)) goto L_T_Initial_Noroom;
     getitem "Lifestone", 1;
     learnskill SKILL_LUM;
-    @Q_status = @STATUS_LEARNED_LIGHT_HEAL;
+    @Q_status = @ST_LEARNED_LIGHT_HEAL;
     callsub S_Update_Var;
 
     mesn l("Elanore the Healer");
@@ -248,7 +248,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 = @STATUS_MASTERED_LIGHT_HEAL;
+    @Q_status = @ST_MASTERED_LIGHT_HEAL;
     callsub S_Update_Var;
     @SUP_xp = 5000;
     @SUP_lvl = 2;
@@ -283,7 +283,7 @@ L_T_ChkAdvToLOH:
     mes "[1000 experience points]";
     getexp 1000, 0;
     learnskill SKILL_INMA;
-    @Q_status = @STATUS_LEARNED_LAY_ON_HANDS;
+    @Q_status = @ST_LEARNED_LAYONHANDS;
     callsub S_Update_Var;
     goto L_close;
 
@@ -305,7 +305,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 = @STATUS_WAITING_FOR_KADIYA;
+    @Q_status = @ST_WAITING_FOR_KADIYA;
     callsub S_Update_Var;
     next;
 
@@ -403,7 +403,7 @@ L_T_AdvTo3Ready:
     mes "[" + @xp + " experience points]";
     mes "[Level 3 in Life Magic]";
 
-    @Q_status = @STATUS_READY_TO_LEARN_CURE_POISON;
+    @Q_status = @ST_READY_TO_CURE_POISON;
     callsub S_Update_Var;
     getexp @xp, 0;
     if (getskilllv(SKILL_MAGIC_LIFE) < 3)
@@ -440,7 +440,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 = @STATUS_LEARNED_CURE_POISON;
+    @Q_status = @ST_LEARNED_CURE_POISON;
     callsub S_Update_Var;
     goto L_Main;
 
@@ -538,12 +538,12 @@ L_close:
     @SUP_id = 0;
     @SUP_name$ = "";
     @ignore = 0;
-    @STATUS_LEARNED_LIGHT_HEAL = 0;
-    @STATUS_MASTERED_LIGHT_HEAL = 0;
-    @STATUS_LEARNED_LAY_ON_HANDS = 0;
-    @STATUS_WAITING_FOR_KADIYA = 0;
-    @STATUS_READY_TO_LEARN_CURE_POISON = 0;
-    @STATUS_LEARNED_CURE_POISON = 0;
+    @ST_LEARNED_LIGHT_HEAL = 0;
+    @ST_MASTERED_LIGHT_HEAL = 0;
+    @ST_LEARNED_LAYONHANDS = 0;
+    @ST_WAITING_FOR_KADIYA = 0;
+    @ST_READY_TO_CURE_POISON = 0;
+    @ST_LEARNED_CURE_POISON = 0;
     @xp = 0;
     close;