Clear temporary variables after you close npc window. Npcs from 001-1.

1 files changed, 21 insertions, 14 deletions

diff --git a/world/map/npc/001-1/trader.txt b/world/map/npc/001-1/trader.txt
index 031feb8f..a90ca8a5 100644
--- a/world/map/npc/001-1/trader.txt
+++ b/world/map/npc/001-1/trader.txt
@@ -17,7 +17,7 @@
     menu
         "Oh. I'll go then.", -,
         "You don't have anything?", L_More;
-    close;
+    goto L_Close;
 
 L_More:
     mes "[Trader]";
@@ -26,7 +26,7 @@ L_More:
     menu
         "Yes?", L_Except,
         "Ok then.",  -;
-    close;
+    goto L_Close;
 
 L_Except:
     mes "[Trader]";
@@ -35,7 +35,7 @@ L_Except:
     menu
         "Sure.", L_Teach,
         "No thank you.", -;
-    close;
+    goto L_Close;
 
 L_Teach:
     if (zeny < 5) goto L_NotEnoughMoney;
@@ -55,7 +55,7 @@ L_Teach:
 L_Later:
     mes "[Trader]";
     mes "\"Please feel free to check back later.  I'm expecting a large shipment of goods to trade.\"";
-    close;
+    goto L_Close;
 
 L_Trade:
     mes "[Trader]";
@@ -68,7 +68,7 @@ L_Trademenu:
         "How about Sulphur Powder?", L_Sulphur,
         "I need Medium Healing Potions.", L_Healpots,
         "I think I have everything I need, thanks.", -;
-    close;
+    goto L_Close;
 
 L_Iron:
     mes "[Trader]";
@@ -76,7 +76,7 @@ L_Iron:
     menu
         "Sure.", L_Ipowder,
         "What a ripoff!  No way!", -;
-    close;
+    goto L_Close;
 
 L_Sulphur:
     mes "[Trader]";
@@ -84,7 +84,7 @@ L_Sulphur:
     menu
         "Here you go.", L_Spowder,
         "Are you nuts?! Forget it!", -;
-    close;
+    goto L_Close;
 
 L_Healpots:
     mes "[Trader]";
@@ -92,7 +92,7 @@ L_Healpots:
     menu
         "Alright.", L_Pots,
         "Whoa, that's way too much.", -;
-    close;
+    goto L_Close;
 
 L_Ipowder:
     if (countitem("IronOre") < 1) goto L_Missing;
@@ -107,7 +107,7 @@ L_Ipowder:
     menu
         "Yes.", L_Trademenu,
         "No.", L_No;
-    close;
+    goto L_Close;
 
 L_Spowder:
     if (countitem("PileOfAsh") < 1) goto L_Missing;
@@ -122,7 +122,7 @@ L_Spowder:
     menu
         "Yes.", L_Trademenu,
         "No.", L_No;
-    close;
+    goto L_Close;
 
 L_Pots:
     if (countitem("SmallHealingPotion") < 3) goto L_Missing;
@@ -137,25 +137,32 @@ L_Pots:
     menu
         "Yes.", L_Trademenu,
         "No.", L_No;
-    close;
+    goto L_Close;
 
 L_Full:
     mes "[Trader]";
     mes "\"You must have been making a lot of trades...your bag is completely full!  Come back after you've made some room.\"";
-    close;
+    goto L_Close;
 
 L_Missing:
     mes "[Trader]";
     mes "\"It looks like you're missing some items.  Please come back when you have enough to trade.\"";
-    close;
+    goto L_Close;
 
 L_NotEnoughMoney:
     mes "[Trader]";
     mes "\"You don't have enough money.\"";
-    close;
+    goto L_Close;
 
 L_No:
     mes "[Trader]";
     mes "\"Have a great day!\"";
+    goto L_Close;
+
+L_Close:
+    set @TRADE_SKILL, 0;
+    set @Ironprice, 0;
+    set @Sulphurprice, 0;
+    set @Potionprice, 0;
     close;
 }