Set all temporary player variables to 0 before closing the NPC dialogues of Orum and Waric.

2 files changed, 67 insertions, 40 deletions

diff --git a/world/map/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt
index 1ef255d9..db9213a3 100644
--- a/world/map/npc/009-4/orum.txt
+++ b/world/map/npc/009-4/orum.txt
@@ -46,7 +46,7 @@
         "You're right, I'll be on my way.", -;
     mes "[Orum]";
     mes "\"Very smart thinking!\"";
-    close;
+    goto L_Close;
 
 L_Explain:
     mes "[Orum]";
@@ -60,7 +60,7 @@ L_Explain:
         "I'd like to help but I have to go...", -;
     mes "[Orum]";
     mes "\"Thats too bad... well, if you ever have some free time, I probably won't figure this out any time soon.\"";
-    close;
+    goto L_Close;
 
 L_Explain_Barriers:
     mes "[Orum]";
@@ -72,7 +72,7 @@ L_Explain_Barriers:
         "I think its meant to keep us out... Bye.", -;
     mes "[Orum]";
     mes "\"You may be right... but she kidnapped Waric. I know it! So I must do something! If you ever change your mind I could surely use the help.\"";
-    close;
+    goto L_Close;
 
 L_Explain_Note:
     mes "[Orum]";
@@ -87,7 +87,7 @@ L_Explain_Note:
         "Looks like you can do this without me.", -;
     mes "[Orum]";
     mes "\"Eh... well I guess I can't force you to stay.\"";
-    close;
+    goto L_Close;
 
 L_Explain_Aura:
     mes "[Orum]";
@@ -99,7 +99,7 @@ L_Explain_Aura:
     menu
         "Let me guess... that is my job?", L_Offer_Quest,
         "I think someone is calling me... Bye!", -;
-    close;
+    goto L_Close;
 
 L_Offer_Quest:
     mes "[Orum]";
@@ -109,7 +109,7 @@ L_Offer_Quest:
         "I'm not your servant! Bye.", -;
     mes "[Orum]";
     mes "\"Everyone answers to someone... that's just how the world is. If you ever change your mind I'll probably be here forever gathering these materials on my own.\"";
-    close;
+    goto L_Close;
 
 L_Start_Quest:
     mes "He pulls a crumpled piece of paper from his pocket, smooths it out and writes a list on it before handing it to you.";
@@ -123,13 +123,13 @@ L_Start_Quest:
         "You can forget it! I quit!", -;
     mes "[Orum]";
     mes "\"I know you'll be back... they always come back!\"";
-    close;
+    goto L_Close;
 
 L_Start_Gathering:
     mes "[Orum]";
     mes "\"That's the spirit! But try not to take too long.\"";
     set OrumQuest, 1;
-    close;
+    goto L_Close;
 
 L_Started:
     if (OrumQuest == 1) goto L_Gathering;
@@ -141,7 +141,7 @@ L_Started:
     if (OrumQuest == 7) goto L_Still_Gathering;
     if (OrumQuest == 8) goto L_Finish_Up;
     if (OrumQuest >= 9) goto L_Finished_Up;
-    close;
+    goto L_Close;
 
 L_Gathering:
     mes "[Orum]";
@@ -154,7 +154,7 @@ L_Gathering:
     next;
     mes "[Orum]";
     mes "\"You'd better get that stuff soon!\"";
-    close;
+    goto L_Close;
 
 L_List_Materials:
     mes "He scavenges around in his pocket for another piece of paper then writes a new list.";
@@ -166,7 +166,7 @@ L_List_Materials:
     next;
     mes "[Orum]";
     mes "\"And try not to lose this one... I'm running out of stuff to write on!\"";
-    close;
+    goto L_Close;
 
 L_Check_Materials:
     if (countitem("WispPowder") < @B0_WISPPOWDER ||
@@ -198,14 +198,14 @@ L_Check_Materials:
     mes "[Orum]";
     mes "\"Well we are both still in one piece so that is a good sign! Now we'll have to see if I did it right... mind going first?\"";
     goto L_Setup_Lair;
-    close;
+    goto L_Close;
 
 L_Missing_Materials:
     mes "Orum carefully looks over all of the items then squints his eyes at you.";
     next;
     mes "[Orum]";
     mes "\"I'm not going to attempt this spell until I have ALL the items on this note. Go gather the missing materials!\"";
-    close;
+    goto L_Close;
 
 L_Setup_Lair:
     set OrumQuest, 2;
@@ -267,12 +267,12 @@ L_Setup_Lair:
     set @Color, rand(1, 12);
     callfunc("SetTorchColor");
     callfunc("SetTorchIntensity");
-    close;
+    goto L_Close;
 
 L_Use_First_Barrier:
     mes "[Orum]";
     mes "\"Casting that aura took a lot out of me. Why don't you go explore the cave a bit while I rest?\"";
-    close;
+    goto L_Close;
 
 L_Explore:
     mes "Orum looks up as you approach.";
@@ -286,12 +286,12 @@ L_Explore:
         "Going to explore more, bye.", -;
     mes "[Orum]";
     mes "\"Be sure to let me know if you find anything. I've almost gained my energy back.\"";
-    close;
+    goto L_Close;
 
 L_Explain_Objective:
     mes "[Orum]";
     mes "\"I'm positive this is where that witch took Waric, so this cave must lead to somewhere. Try looking around for another exit. I've almost gained my energy back and then I can help.\"";
-    close;
+    goto L_Close;
 
 L_Found_Barriers:
     mes "Orum looks up as you approach.";
@@ -305,7 +305,7 @@ L_Found_Barriers:
         "Going to explore more, bye.", -;
     mes "[Orum]";
     mes "\"Be sure to let me know if you find anything. I'm still gaining my energy back.\"";
-    close;
+    goto L_Close;
 
 L_Explain_Barriers_More:
     mes "[Orum]";
@@ -315,7 +315,7 @@ L_Explain_Barriers_More:
         "I'm not sure, I'll go try again.", -;
     mes "[Orum]";
     mes "\"Always a good idea to double check things!\"";
-    close;
+    goto L_Close;
 
 L_Explain_Note_More:
     mes "[Orum]";
@@ -325,7 +325,7 @@ L_Explain_Note_More:
     mes "\"It mentions some sort of security system to keep people from entering the actual lair but it doesn't explain in great detail. Try exploring more, maybe we will find some answers.\"";
     next;
     mes "Orum continues examining the note.";
-    close;
+    goto L_Close;
 
 L_Found_Torches:
     mes "Orum looks up as you approach.";
@@ -341,7 +341,7 @@ L_Found_Torches:
         "Going to explore more, bye.", -;
     mes "[Orum]";
     mes "\"Be sure to let me know if you find anything new.\"";
-    close;
+    goto L_Close;
 
 L_Explain_Torches:
     mes "Orum has you direct him to the torch and he walks off to examine it before returning shortly after.";
@@ -359,7 +359,7 @@ L_Explain_Torches:
         "I'm done doing stuff for you!", -;
     mes "[Orum]";
     mes "\"I'm surprised you give up after we've gotten so far. Shame.\"";
-    close;
+    goto L_Close;
 
 L_Gather_More:
     mes "Orum begins writing down another list of materials.";
@@ -374,13 +374,13 @@ L_Gather_More:
         "No way! Too much stuff!", -;
     mes "[Orum]";
     mes "\"The note says to get these and I'm not going to attempt this spell until I have what the note says.\"";
-    close;
+    goto L_Close;
 
 L_Gathering_More:
     set OrumQuest, 7;
     mes "[Orum]";
     mes "\"Wonderful! Try to make it quick, we must save Waric!\"";
-    close;
+    goto L_Close;
 
 L_Still_Gathering:
     mes "[Orum]";
@@ -391,7 +391,7 @@ L_Still_Gathering:
         "I've almost got them all.", -;
     mes "[Orum]";
     mes "\"Don't make me remind you again! Warics life is on the line here! Hurry up!\"";
-    close;
+    goto L_Close;
 
 L_List_Materials_More:
     mes "He scavenges around in his pocket for another piece of paper then writes a new list.";
@@ -404,7 +404,7 @@ L_List_Materials_More:
     next;
     mes "[Orum]";
     mes "\"And try not to lose this one. I don't have much more to write on!\"";
-    close;
+    goto L_Close;
 
 L_Finished_Gathering_More:
     if (countitem("IronPowder") < @BT_IRONPOWDER ||
@@ -438,14 +438,14 @@ L_Finished_Gathering_More:
     getitem "YellowPowder", @BT_REWARDCOUNT;
     getitem "BluePowder", @BT_REWARDCOUNT;
     set OrumQuest, 8;
-    close;
+    goto L_Close;
 
 L_Missing_Materials_More:
     mes "Orum carefully looks over all of the items then squints his eyes at you.";
     next;
     mes "[Orum]";
     mes "\"You really enjoy playing games with Warics life, don't you! Come back when you have ALL of the items I told you.\"";
-    close;
+    goto L_Close;
 
 L_Finish_Up:
     mes "Orum seems to be sitting around doing nothing as you approach.";
@@ -458,7 +458,7 @@ L_Finish_Up:
         "I'm still trying...", -;
     mes "[Orum]";
     mes "\"Excellent! Let me know when you've made any progress.\"";
-    close;
+    goto L_Close;
 
 L_Explain_Torches_More:
     mes "[Orum]";
@@ -467,7 +467,7 @@ L_Explain_Torches_More:
     mes "\"It seems that the powders are only in these 3 colors, so you may have to experiment a bit to get the colors right.\"";
     next;
     mes "\"Also while looking around I saw that behind one of the barriers was a cave. Maybe Waric is in there... we should try to get that barrier dropped.\"";
-    close;
+    goto L_Close;
 
 L_More_Powder:
     mes "[Orum]";
@@ -478,7 +478,7 @@ L_More_Powder:
         "I'll go get those for you.", -;
     mes "[Orum]";
     mes "\"You better not waste any time gathering those materials!\"";
-    close;
+    goto L_Close;
 
 L_More_Powder_Make:
     if (countitem("IronPowder") < @BT_IRONPOWDER ||
@@ -506,7 +506,7 @@ L_More_Powder_Make:
     getitem "RedPowder", @BT_REWARDCOUNT;
     getitem "YellowPowder", @BT_REWARDCOUNT;
     getitem "BluePowder", @BT_REWARDCOUNT;
-    close;
+    goto L_Close;
 
 L_Finished_Up:
     mes "As you approch you think you see Orum rolling his eyes... maybe you're imagining it.";
@@ -519,7 +519,7 @@ L_Finished_Up:
         "Cut me some slack! I'm working on it!", -;
     mes "[Orum]";
     mes "\"Just hurry it up! Warics life is on the line here!\"";
-    close;
+    goto L_Close;
 
 L_Enter_Cavern:
     if (OrumQuest >= 10) goto L_Ready_Cavern;
@@ -527,7 +527,7 @@ L_Enter_Cavern:
     mes "Orum heads to the barrier then gives you a look as if he does not believe you before walking forward.";
     next;
     mes "He is suddenly thrown against the wall behind him! Angered, he gets up, brushes himself off, and heads back to the entrance without speaking.";
-    close;
+    goto L_Close;
 
 L_Ready_Cavern:
     // you should not get that twice ;)
@@ -554,13 +554,34 @@ L_Ready_Cavern:
         "I thought this would never be over!", -;
     mes "[Orum]";
     mes "\"Well I guess this is farewell!\"";
-    close;
+    goto L_Close;
 
 L_Inventory:
     mes "\"You're carrying too much. Come back to me after you got rid of some stuff. And hurry, I don't want to spent all day waiting on you.\"";
-    close;
+    goto L_Close;
 
 L_Got_Reward:
     mes "\"You've done enough here to help. I will go the rest of the way alone so that your life is not endangered.\"";
+    goto L_Close;
+
+L_Close:
+    set @B0_WISPPOWDER, 0;
+    set @B0_POLTERGEISTPOWDER, 0;
+    set @B0_SPECTREPOWDER, 0;
+    set @B0_HARDSPIKES, 0;
+
+    set @BT_IRONPOWDER, 0;
+    set @BT_PILESOFASH, 0;
+    set @BT_HERBS, 0;
+
+    set @BT_REWARDCOUNT, 0;
+
+    set @EXP_BREAK_BARRIERS, 0;
+
+    set @temp, 0;
+    set @Color, 0;
+    set @Barrier, 0;
+    set @Torch, 0;
+    set @Intensity, 0;
     close;
 }
diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt
index 47389726..df914e52 100644
--- a/world/map/npc/009-4/waric.txt
+++ b/world/map/npc/009-4/waric.txt
@@ -14,6 +14,7 @@
     mes "";
     mes "[Orum]";
     mes "\"Be quiet Waric... " + @gender$ + " awake...\"";
+    set @gender$, "";
     close;
 }
 
@@ -27,7 +28,8 @@
 
 009-4.gat,118,42,0|script|Waric|153,{
     set @EXP_LEARNED_ALOT, 10000;
-    if (OrumQuest >= 13) goto L_Behave;
+    if (OrumQuest >= 13)
+        goto L_Behave;
     mes "Waric looks toward you rubbing his chin...";
     next;
     mes "[Waric]";
@@ -43,7 +45,7 @@
     next;
     mes "They begin discussing plans of some sort...";
     set OrumQuest, 13;
-    close;
+    goto L_Close;
 
 L_Behave:
     mes "Waric looks toward you shaking his finger.";
@@ -57,7 +59,7 @@ L_Behave:
     mes "\"Having fun I take it?\"";
     next;
     mes "They continue discussing their plans.";
-    close;
+    goto L_Close;
 
 L_Explain:
     mes "[Waric]";
@@ -84,7 +86,11 @@ L_Explain:
     set OrumQuest, 14;
     misceffect 10;
     warp "008-1.gat", 65, 90;
-    mes "You awake on your back with a squirrel sitting on top of you arranging it's acorns. It quickly gathers them up and runs off as it sees you looking at it them.";
     getexp @EXP_LEARNED_ALOT, 0;
+    mes "You awake on your back with a squirrel sitting on top of you arranging it's acorns. It quickly gathers them up and runs off as it sees you looking at it them.";
+    goto L_Close;
+
+L_Close:
+    set @EXP_LEARNED_ALOT, 0;
     close;
 }