Start working on Sagatha's scripts

1 files changed, 56 insertions, 57 deletions

diff --git a/npc/013-1/sagatha.txt b/npc/013-1/sagatha.txt
index c1a0b5f7..24b50725 100644
--- a/npc/013-1/sagatha.txt
+++ b/npc/013-1/sagatha.txt
@@ -34,14 +34,14 @@ L_write:
 }
 
 function	script	SagathaStatus	{
-    if (getequipid(equip_head) != 1216 && getequipid(equip_head) != 752)
+    if (!isequippedcnt(MoubooHead, FluffyHat))
         goto L_Next;
     @value = 15;
     callfunc "QuestSagathaAnnoy";
     goto L_Next;
 
 L_Next:
-    @mexp = MAGIC_EXPERIENCE & 65535;
+    @mexp = MAGIC_EXP;
     @has_magic = getskilllv(SKILL_MAGIC);
     @evil = 0;
     @good = 0;
@@ -82,11 +82,13 @@ L_Next:
     @Q_status = (QUEST_MAGIC & @Q_MASK) >> @Q_SHIFT;
 
     if (MAGIC_FLAGS & MFLAG_KNOWS_SAGATHA)
-        mes "[Sagatha the Witch]";
-    if (!(MAGIC_FLAGS & MFLAG_KNOWS_SAGATHA))
-        mes "[Witch]";
+        .n$=l("Sagatha the Witch");
+    else
+        .@n$=l("Witch");
+    // Header
+    mesn .@n$;
     // if fluffyhat
-    if (getequipid(equip_head) == 752)
+    if (isequipped(FluffyHat))
         goto L_hat_attack;
     if (@evil)
         goto L_evil;
@@ -95,9 +97,9 @@ L_Next:
     if (MAGIC_FLAGS & MFLAG_KNOWS_SAGATHA)
         goto L_wb;
 
-    mes "Before you stands a beautiful woman, dressed in dark purple robes and wearing a witch's hat.";
+    mesc l("Before you stands a beautiful woman, dressed in dark purple robes and wearing a witch's hat.");
 
-    mes "She looks at you suspiciously.";
+    mesc l("She looks at you suspiciously.");
     next;
     menu
         "Who are you?", L_Next,
@@ -106,7 +108,7 @@ L_Next:
         "Goodbye.", L_close;
 
 L_Next:
-    mes "[Witch]";
+    mesn .@n$;
     mes "\"I am what you humans call a witch. I am a human who has chosen all living creatures as what you call family.\"";
     next;
     menu
@@ -118,10 +120,7 @@ L_hat_attack:
     mes "The witch seems to be trembling with disgust as she stares at your headgear.";
     mes "\"Do you think that is funny?\" she snarls.";
     next;
-    if (MAGIC_FLAGS & MFLAG_KNOWS_SAGATHA)
-        mes "[Sagatha the Witch]";
-    if (!(MAGIC_FLAGS & MFLAG_KNOWS_SAGATHA))
-        mes "[Witch]";
+    mesn .@n$;
     mes "\"You have no idea what that poor creature felt!\"";
     mes "She snaps her fingers.";
     mes "\"Let me show you...\"";
@@ -131,27 +130,27 @@ L_hat_attack:
     close;
 
 L_Intro_name:
-    mes "[Sagatha the Witch]";
-    mes "\"They call me Sagatha.\"";
+    mesn .@n$;
+    mesq l("They call me Sagatha.");
     MAGIC_FLAGS = MAGIC_FLAGS | MFLAG_KNOWS_SAGATHA;
     next;
     goto L_Main;
 
 L_Intro_givename:
-    mes "[Witch]";
-    mes "\"Ah.\"";
+    mesn .@n$;
+    mesq l("Ah.");
     next;
     menu
         "What's yours?", L_Intro_name,
         "Uhm... bye.", L_close;
 
 L_evil:
-    mes "The witch's eyes flare up in anger as she notices you, and she turns away from you.";
-    mes "Whatever the reason, she doesn't seem to like you.";
+    mesc l("The witch's eyes flare up in anger as she notices you, and she turns away from you.");
+    mesc l("Whatever the reason, she doesn't seem to like you.");
     close;
 
 L_unhappy:
-    mes "The witch glares at you in anger.";
+    mesc l("The witch glares at you in anger.");
     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!\"";
     close;
@@ -184,11 +183,11 @@ L_Teach_Initial:
         goto L_initial_nogood;
     if (getskilllv(SKILL_MAGIC_NATURE) < 2)
         goto L_initial_nonature;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "She nods.";
     mes "\"For now, yes. But you will have to prove that you really care about more than yourself.\"";
     next;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "She snaps her fingers, and without warning you begin to acutely sense the magical energies around you, for a brief instant!";
     @Q_status = @STATUS_STUDENT;
     callsub S_Update_Var;
@@ -196,7 +195,7 @@ L_Teach_Initial:
     @SUP_lvl = 2;
     callsub S_up_astral;
     next;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"In the future, I will teach you nature and astral magic. For the other schools there are better teachers around.\"";
     if (getskilllv(SKILL_MAGIC) < 2)
         mes "\"Your skill in magic won't be great enough to use some of the spells yet, so keep practicing and visiting the mana seed until it is.\"";
@@ -204,19 +203,19 @@ L_Teach_Initial:
     goto L_Main;
 
 L_initial_nogood:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"I don't take strangers as students.\"";
     next;
     goto L_Main;
 
 L_initial_nonature:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"I might, but you don't even understand the basics of nature magic.\"";
     next;
     goto L_Main;
 
 L_explain_magic:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"No.\"";
     next;
     goto L_Main;
@@ -235,7 +234,7 @@ L_Teach:
     if (@Q_status == @STATUS_STUDENT_N11)
         goto L_Teach_N11;
 
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"Not yet. You have to ask the mana seed to give you more power.\"";
     next;
     goto L_Main;
@@ -246,78 +245,78 @@ L_practice:
     callsub S_Update_Var;
     getexp 1000,0;
     next;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"Now go and practice.\"";
     next;
     goto L_Main;
 
 L_Teach_N14:
-    if (@mexp < 125)
+    if (@mexp < 125 || getskilllv(SKILL_MAGIC) < 1)
         goto L_Teach_noexp;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"Some forest creatures sometimes overgrow their fur or hide. That makes them uncomfortable.\"";
     next;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"You can help them with shearing magic. Press your hands together and say '" + get(.invocation$, "shear") + "'. Then touch them with your hands, and brush off any excess.\"";
     next;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"The spell is strong, so you only need to do this once. Be careful not to cut them. Some things they shed are useful. Often they will leave them to you as a thank-you.\"";
     goto L_practice;
 
 L_Teach_N10:
-    if (@mexp < 150)
+    if (@mexp < 150 || getskilllv(SKILL_MAGIC) < 2)
         goto L_Teach_noexp;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"Next, a nature spell. Take a cocoon shell. Hold it in your hand. Feel its lightness.\"";
     next;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"Now whisper '" + get(.invocation$, "flying-backpack") + "', and if your backpack was pressing on you you should no longer feel it now.\"";
     goto L_practice;
 
 L_Teach_A10:
-    if (@mexp < 180)
+    if (@mexp < 180 || getskilllv(SKILL_MAGIC) < 2)
         goto L_Teach_noexp;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"To protect against others' magic, take a small mushroom from a shady place. Mushrooms draw things out of the earth. Rub your mushroom into pieces between your hands.\"";
     next;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mesq l("Then say %s and let the mushroom's power take over.", b("betsanc"));
     learnskill EVOL_PHYSICAL_SHIELD, 1;
     goto L_practice;
 
 L_Teach_A11:
-    if (@mexp < 200)
+    if (@mexp < 200 || getskilllv(SKILL_MAGIC) < 2)
         goto L_Teach_noexp;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"If you must fight, call allies. You can call spiky mushrooms out of the ground with a mushroom spike and a root. Hold up the spike and call out to them: '" + get(.invocation$, "smsmushrooms") + "'. Then press the root to the ground.\"";
     next;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"Spiky mushrooms often grow too many spikes, so you can shear the spikes off of some.\"";
     next;
     goto L_practice;
 
 L_Teach_A12:
-    if (@mexp < 220)
+    if (@mexp < 220 || getskilllv(SKILL_MAGIC) < 2)
         goto L_Teach_noexp;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"You can call fluffies, too. But for them you must call out '" + get(.invocation$, "smfluffies") + "' instead, with white fluffy fur instead of a spike. And don't forget the root.\"";
     goto L_practice;
 
 L_Teach_N11:
-    if (@mexp < 250)
+    if (@mexp < 250 || getskilllv(SKILL_MAGIC) < 2)
         goto L_Teach_noexp;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"You can harden your skin with a hard spike. Hold it in your hands and speak '" + get(.invocation$, "protect") + "', then draw its hardness into your skin.\"";
     next;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"Or call it into someone else's skin, by saying that someone's name right after the '" + get(.invocation$, "protect") + "'.\"";
     next;
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"You can also remove this spell from yourself if you say '" + get(.invocation$, "antiprotect") + "'.\"";
     goto L_practice;
 
 L_Teach_noexp:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"You must practice more first.\"";
     next;
     goto L_Main;
@@ -346,13 +345,13 @@ L_Question:
     if (@c == @QQ_ASTRALSOUL)
         goto L_Q_astralsoul;
 
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"That doesn't concern you.\"";
     next;
     goto L_Main;
 
 L_Q_astralsoul:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"Yes, there is a way to improve your magic.\"";
     next;
     mes "\"Did you ever hear about focusing?\"";
@@ -366,25 +365,25 @@ L_Q_astralsoul:
     goto L_Main;
 
 L_Q_old_wizard:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"A kind and wise wizard.\"";
     next;
     goto L_Main;
 
 L_Q_imp:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     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;
 
 L_Q_elanore:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"Elanore is the Tulimshar town healer.\"";
     next;
     goto L_Main;
 
 L_Q_manaseed:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     if (!@has_magic && (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED))
         goto L_Q_manaseed_unabsorbed;
     if (@has_magic)
@@ -404,19 +403,19 @@ L_Q_manaseed_m:
     goto L_Main;
 
 L_Q_manapotion:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"I won't make one without a cauldron, that would be wasteful. And I'm not going to start carrying a cauldron around.\"";
     next;
     goto L_Main;
 
 L_Q_wyara:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "\"Wyara decided to live with humans, in Hurnscald. She tries to make the world a better place in her own way. Please be kind to her, she is a very good person.\"";
     next;
     goto L_Main;
 
 L_Q_auldsbel:
-    mes "[Sagatha the Witch]";
+    mesn .@n$;
     mes "She frowns.";
     mes "\"He's a transmutation wizard, member of the northern council. Reasonably competent wizard, too.\"";
     next;