Clear Temporary variables after you close npc window. Npcs from maps 001-2, 002-1 and 003-1.

1 files changed, 29 insertions, 21 deletions

diff --git a/world/map/npc/003-1/stranger.txt b/world/map/npc/003-1/stranger.txt
index 09c81f36..31667b8c 100644
--- a/world/map/npc/003-1/stranger.txt
+++ b/world/map/npc/003-1/stranger.txt
@@ -26,7 +26,7 @@
     menu
         "Yeah, sure.",L_Items,
         "No.",L_Close;
-    close;
+    goto L_Close;
 
 L_Items:
     if (countitem("IngotIron") < @IRONINGOT) goto L_No_Item;
@@ -238,7 +238,7 @@ L_Explain:
     mes "\"Depending on the color it will bring you to different places. It might wear out after a while and it'll loose its color, but I can prepare it for you again.\"";
     next;
     mes "\"Since I'm not familar with this plane-, ahm, with this area, I can't tell which places you will end up in.\"";
-    close;
+    goto L_Close;
 
 L_No_Event:
     mes "[Stranger]";
@@ -251,7 +251,7 @@ L_No_Event:
         menu
             "Thanks for the advice.",-,
             "I have my towel with me too.",L_Dye;
-    close;
+    goto L_Close;
 
 L_Dye:
     mes "[Stranger]";
@@ -265,17 +265,17 @@ L_Dye:
         "Oh? Can you explain about it?",L_Explain,
         "I know. Could you dye it for me?",L_Dye_Towel,
         "It's great, isn't it? I have to go now.",-;
-    close;
+    goto L_Close;
 
 L_No_Item:
     mes "[Stranger]";
     mes "\"Hu? It seems you haven't.\"";
-    close;
+    goto L_Close;
 
 L_Wrong_Answer:
     mes "[Stranger]";
     mes "\"Nah, that's wrong. Come back if you want to try again.\"";
-    close;
+    goto L_Close;
 
 L_Event_Done:
     mes "[Stranger]";
@@ -302,7 +302,7 @@ L_Dye_Towel:
 //        "Lime",L_Lime,
 //        "Teal",L_Teal,
         "I changed my mind.", L_Close;
-    close;
+    goto L_Close;
 
 L_Red:
     mes "[Stranger]";
@@ -321,7 +321,7 @@ L_Red:
     next;
     mes "[Stranger]";
     mes "\"Done! It'll use its color after being used, but just come back and I can dye it again for you.\"";
-    close;
+    goto L_Close;
 
 L_Yellow:
     mes "[Stranger]";
@@ -340,7 +340,7 @@ L_Yellow:
     next;
     mes "[Stranger]";
     mes "\"Done! It'll use its color after being used, but just come back and I can dye it again for you.\"";
-    close;
+    goto L_Close;
 
 
 L_White:
@@ -360,7 +360,7 @@ L_White:
     next;
     mes "[Stranger]";
     mes "\"Done! It'll use its color after being used, but just come back and I can dye it again for you.\"";
-    close;
+    goto L_Close;
 
 L_Blue:
     mes "[Stranger]";
@@ -379,7 +379,7 @@ L_Blue:
     next;
     mes "[Stranger]";
     mes "\"Done! It'll use its color after being used, but just come back and I can dye it again for you.\"";
-    close;
+    goto L_Close;
 
 L_Green:
     mes "[Stranger]";
@@ -398,7 +398,7 @@ L_Green:
     next;
     mes "[Stranger]";
     mes "\"Done! It'll use its color after being used, but just come back and I can dye it again for you.\"";
-    close;
+    goto L_Close;
 
 L_Purple:
     mes "[Stranger]";
@@ -417,7 +417,7 @@ L_Purple:
     next;
     mes "[Stranger]";
     mes "\"Done! It'll use its color after being used, but just come back and I can dye it again for you.\"";
-    close;
+    goto L_Close;
 
 L_Orange:
     mes "[Stranger]";
@@ -438,7 +438,7 @@ L_Orange:
     next;
     mes "[Stranger]";
     mes "\"Done! It'll use its color after being used, but just come back and I can dye it again for you.\"";
-    close;
+    goto L_Close;
 
 L_Pink:
     mes "[Stranger]";
@@ -459,7 +459,7 @@ L_Pink:
     next;
     mes "[Stranger]";
     mes "\"Done! It'll use its color after being used, but just come back and I can dye it again for you.\"";
-    close;
+    goto L_Close;
 
 L_Lime:
     mes "[Stranger]";
@@ -480,7 +480,7 @@ L_Lime:
     next;
     mes "[Stranger]";
     mes "\"Done! It'll use its color after being used, but just come back and I can dye it again for you.\"";
-    close;
+    goto L_Close;
 
 L_Teal:
     mes "[Stranger]";
@@ -501,28 +501,36 @@ L_Teal:
     next;
     mes "[Stranger]";
     mes "\"Done! It'll use its color after being used, but just come back and I can dye it again for you.\"";
-    close;
+    goto L_Close;
 
 L_No_Water:
     mes "[Stranger]";
     mes "\"You don't have water.\"";
-    close;
+    goto L_Close;
 
 L_No_Powder:
     mes "[Stranger]";
     mes "\"You need to bring me enough gem powder in that color. Maybe someone used to mining can help you with that.\"";
-    close;
+    goto L_Close;
 
 L_No_Towel:
     mes "[Stranger]";
     mes "\"Where's your towel? It is really useful, you should always keep it with you.\"";
-    close;
+    goto L_Close;
 
 L_Full_Inv:
     mes "[Stranger]";
     mes "\"You carry a lot of stuff with you, don't you? Maybe you should get rid of something.\"";
-    close;
+    goto L_Close;
 
 L_Close:
+    set @month, 0;
+    set @start_day, 0;
+    set @end_day, 0;
+    set @IRONINGOT, 0;
+    set @PINKANTENNA, 0;
+    set @EXP, 0;
+    set @random, 0;
+    set @quizparam$, "";
     close;
 }