Some of the Tonori Area Quests

1 files changed, 11 insertions, 41 deletions

diff --git a/world/map/npc/001-1/eomie.txt b/world/map/npc/001-1/eomie.txt
index 99085bcf..65cee42e 100644
--- a/world/map/npc/001-1/eomie.txt
+++ b/world/map/npc/001-1/eomie.txt
@@ -1,40 +1,18 @@
-// A professor at Tulimshar's magic academy, involved in quest:
-// Anwar needs a magic fertilizer for his field
-// Quest uses Nibble 3 of QUEST_NorthTulimshar
-// Author: Jenalya
-// state 1: Anwar sent to Tinris for help to get a magic fertilizer
-// state 2: Tinris asked for chocolate cake as present for his girlfriend
-// state 3: Tinris asked for ingredients for the fertilizer
-// state 4: Tinris gave you the fertilizer
-// state 5: Anwar tried it out and it doesn't work well, sent you back to Tinris
-// state 6: Tinris asked for more ingredients for a new try
-// state 7: Tinris says it's really hard, gives you the fertilizer and tells you to ask Eomie to cast a spell on it
-// state 8: Eomie sends you to get some stuff so she can interrupt her spell on the spot of grass
-// state 9: Eomie casted a spell on the fertilizer
-// state 10: Anwar used it and it worked. he asks you to help him preparing a thank-you-gift for each Tinris and Eomis
-// state 11: Anwar asked to bring present to Tinris
-// state 12: gave present to Tinris
-// state 13: Anwar asked to bring present to Eomie
-// state 14: gave present to Eomie
-// state 15: reported back to Anwar and done
-
 001-1,71,23,0|script|Eomie|164
 {
-    set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
-
     set @grass_amount, 5;
     set @water_amount, 2;
     set @ice_amount, 2;
 
     set @silk_exp, 600;
 
-    if (@state >= 14) goto L_Done;
-    if (@state >= 9) goto L_CastedSpell;
-    if (@state == 8) goto L_GetStuff;
+    if (QL_ANWAR >= 14) goto L_Done;
+    if (QL_ANWAR >= 9) goto L_CastedSpell;
+    if (QL_ANWAR == 8) goto L_GetStuff;
 
     mes "[Eomie]";
     mes "\"I maintain this little oasis in the desert.\"";
-    if (@state != 7)
+    if (QL_ANWAR != 7)
         goto L_Close;
     menu
         "I need to learn a spell to use Tinris' magic fertilizer. Can you help me out?",L_Next;
@@ -50,12 +28,11 @@ L_Next:
 
 L_Continue:
     mes "She hesitates.";
-    set @state, 8;
-    callsub S_Update_Mask;
+    set QL_ANWAR, 8;
     goto L_GetStuff;
 
 L_GetStuff:
-    // @state == 8
+    // QL_ANWAR == 8
     mes "[Eomie]";
     mes "\"I could try to briefly interrupt my magic and then cast the spell on the fertilizer, but I would need to prepare the grass beforehand.";
     mes "Bring me " + @grass_amount + " " + getitemlink("GrassSeed") + ", " + @water_amount + " " + getitemlink("BottleOfWater") + ", and " + @ice_amount + " " + getitemlink("IceCube") + ".\"";
@@ -71,8 +48,7 @@ L_More:
     delitem "GrassSeed", @grass_amount;
     delitem "BottleOfWater", @water_amount;
     delitem "IceCube", @ice_amount;
-    set @state, 9;
-    callsub S_Update_Mask;
+    set QL_ANWAR, 9;
     mes "[Eomie]";
     mes "\"Very good!\"";
     mes "She takes the ingredients you brought her and uses them to cast a cool mist into the air.";
@@ -98,10 +74,10 @@ L_Mine: // player asked how to get Ice Cubes
     mes "\"I heard that Ice Goblins were seen in the caves surrounding Nivalis. Maybe you can find " + getitemlink("IceCube") + " there.\"";
     goto L_Close;
 
-L_CastedSpell: // @state >= 9 but below 14
+L_CastedSpell: // QL_ANWAR >= 9 but below 14
     mes "[Eomie]";
     mes "\"Thankfully, the grass wasn't damaged. I hope Anwar finds the magic fertilizer to be useful.\"";
-    if (@state != 13)
+    if (QL_ANWAR != 13)
         goto L_Close;
     menu
         "It was. He even created this Silk Headband as a present for you!",L_Present,
@@ -112,14 +88,13 @@ L_Present:
         goto L_NoItem;
     delitem "SilkHeadband", 1;
     getexp @silk_exp, 0;
-    set @state, 14;
-    callsub S_Update_Mask;
+    set QL_ANWAR, 14;
     mes "[Eomie]";
     mes "\"Oh, that's so nice of him! Please tell him that I really like it!\"";
     mes "She smiles.";
     goto L_Close;
 
-L_Done: // @state >= 14
+L_Done: // QL_ANWAR >= 14
     mes "[Eomie]";
     mes "\"Hello! I'm happy to see someone like you so dedicated to the environment.\" %%8";
     goto L_Close;
@@ -130,13 +105,8 @@ L_NoItem:
     goto L_Close;
 
 L_Close:
-    set @state, 0;
     set @grass_amount, 0;
     set @water_amount, 0;
     set @ice_amount, 0;
     close;
-
-S_Update_Mask:
-    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_3_MASK)) | (@state << NIBBLE_3_SHIFT);
-    return;
 }