Clean up main scripts

1 files changed, 27 insertions, 11 deletions

diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt
index bdabb63e..81401847 100644
--- a/world/map/npc/017-4/waric.txt
+++ b/world/map/npc/017-4/waric.txt
@@ -71,9 +71,10 @@ L_Flower1:
     if (!(getskilllv(SKILL_MAGIC)))
         goto L_Close;
     menu
-        "Can you teach me some magic?", -,
+        "Can you teach me some magic?", L_Next,
         "Of course!", L_Close;
 
+L_Next:
     if (@sagatha_follower)
         goto L_Sagatha;
     if (!@killed_mouboo && !@cut_tree)
@@ -108,8 +109,10 @@ L_DarkMagic:
     mes "[Waric]";
     mes "\"So, you have gotten your reward and finished the task Orum had for you. Very good.\"";
     menu
-        "Can you teach me some magic?", -,
+        "Can you teach me some magic?", L_Next1,
         "I'm great or what!", L_Close;
+
+L_Next1:
     if (@sagatha_follower)
         goto L_Sagatha;
     if (!@killed_mouboo && !@cut_tree)
@@ -163,15 +166,16 @@ L_LastChance:
     mes "\"If you are still not sure, I will give you some time to reconsider, but if you start the ritual and run away, you are dead to me!\"";
     next;
     menu
-        "I am ready to take the oath. [last chance!]", -,
+        "I am ready to take the oath. [last chance!]", L_Next2,
         "I have to reconsider.", L_ComeBackLater;
+
+L_Next2:
     mes "[Waric]";
     mes "\"If you stop during the oath again, I will not teach you anything. If you are not sure whether you want to become my apprentice or not, take more time to reconsider. However, this is your last chance to do so.\"";
     next;
     menu
         "I have to reconsider.", L_ComeBackLater,
         "I am ready to take the oath. [last chance!]", L_Oath;
-    goto L_Close;
 
 L_Oath:
     mes "[Waric]";
@@ -200,8 +204,10 @@ L_Oath:
     mes "\Say it! Say it now!\"";
     next;
     menu
-        "[Say the oath]", -,
+        "[Say the oath]", L_Next3,
         "I can't say this, it's too much for me!", L_NoOath;
+
+L_Next3:
     mes "As you speak the words written in flames, you feel all of your positive feelings drain away. You no longer love, you're no longer happy. You feel indifferent to the world. But there is also a newfound feeling of power in you. You feel capable of doing anything.";
     set @SUP_id, SKILL_MAGIC_DARK;
     set @SUP_name$, "Dark Magic";
@@ -240,7 +246,9 @@ L_ToxicDart:
     mes "\"Are you read for another spell?\"";
     menu
         "No, I still have to practice the first one.", L_Close,
-        "Yes. Show me some more!", -;
+        "Yes. Show me some more!", L_Next4;
+
+L_Next4:
     mes "[Waric]";
     mes "\"Very well.  This spell is more complex than the last one. It is called toxic dart. Only your peers are susceptible to the dart's poison. If you hit an animal the dart will injure it, but the poison will not work.\"";
     next;
@@ -257,8 +265,10 @@ L_Snakes:
     mes "[Waric]";
     mes "\"Have you practiced enough?\"";
     menu
-        "Yes, I'm an outstanding Dark Mage!", -,
+        "Yes, I'm an outstanding Dark Mage!", L_Next5,
         "No. I'm too lazy.", L_ComeBackLater;
+
+L_Next5:
     mes "[Waric]";
     mes "\"Very well. I shall teach you another spell.\"";
     mes "\"This one is so complex that I have to show it to you before explaining it further. Bring me a snake egg and a root.\"";
@@ -272,8 +282,10 @@ L_SnakesIngredients:
     mes "[Waric]";
     mes "\"Did you bring one Dark Crystal and a Snake Egg?\"";
     menu
-        "Yes, I have what you want.", -,
+        "Yes, I have what you want.", L_Next6,
         "No, I need more time.", L_NoItem;
+
+L_Next6:
     if ((countitem("DarkCrystal") < 0)
         || (countitem("SnakeEgg") < 0))
         goto L_NoItem;
@@ -295,8 +307,10 @@ L_SnakesSpell:
     mes "[Waric]";
     mes "\"Did you see how this spell is cast?\"";
     menu
-        "Yes. What did you mumble?", -,
+        "Yes. What did you mumble?", L_Next7,
         "No. Could you show me again?", L_SnakesAgain;
+
+L_Next7:
     mes "[Waric]";
     mes "\"I said " + getspellinvocation("summon-snakes") + ".\"";
     mes "\"Have fun with those spells and use them to cause hate, anger and death.\"";
@@ -309,7 +323,6 @@ L_SnakesAgain:
     menu
         "No.", L_SnakesSpell,
         "Yes.", L_SnakesIngredients;
-    goto L_Close;
 
 L_ComeBackLater:
     mes "[Waric]";
@@ -322,8 +335,10 @@ L_MoreMagic:
     mes "\"You must practice more! I will teach you more spells once you have mastered the ones I have already demonstrated.\"";
     next;
     menu
-        "Can you tell me the invocations for the spells you taught me again?", -,
+        "Can you tell me the invocations for the spells you taught me again?", L_Next8,
         "Thanks, master. I will come back later", L_Close;
+
+L_Next8:
     mes "[Waric]";
     mes "\"Yes, of course.\"";
     mes "\"To summon the snakes use " + getspellinvocation("summon-snakes") + ".\"";
@@ -400,4 +415,5 @@ L_Close:
 OnInit:
     if (!debug)
         disablenpc "DebugFlowerP";
+    end;
 }