Changes in npc scripts on 031-x:

- change zeny to Zeny and baselevel to BaseLevel
- set temporary variables to zero at the end of script
- some adaptions on timer handling on the yeti fight

1 files changed, 14 insertions, 7 deletions

diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt
index beae6e0a..13db7106 100644
--- a/world/map/npc/031-2/cindyHouse.txt
+++ b/world/map/npc/031-2/cindyHouse.txt
@@ -1,8 +1,6 @@
 // author: Jenalya
-// reviewed by:
 // state0,1,2: you shouldn't be able to reach this place
 // state3 and greater: Cindy is saved, she says one of some random phrases
-//
 
 031-2.gat,27,26,0|script|Cindy|197, {
 
@@ -14,14 +12,13 @@
     if (@rescue_Cindy > 2) goto L_Happy_Random;
 
     mes "...";
-    close;
+    goto L_Close;
 
 L_Happy_Random:
     getinventorylist;
     set @candy, rand(50);
-    if (@inventorylist_count < 100
-        && @candy == 42)
-            goto L_Candy;
+    if (@inventorylist_count < 100 && @candy == 42)
+        goto L_Candy;
 
     setarray @quote_Cindy$, "Thank you so much for rescuing me!",
     "My mother made really tasty cookies yesterday. But I already ate them all...",
@@ -38,12 +35,22 @@ L_Happy_Random:
     set @quote$, "\"" + @quote_Cindy$[@random] + "\"";
     mes "[Cindy]";
     mes @quote$;
-    close;
+    goto L_Close;
 
 L_Candy:
     mes "[Cindy]";
     mes "\"Santa gave me some candy! Please, take that!\"";
     getitem "Candy", 1;
+    goto L_Close;
+
+L_Close:
+    set @Q_Nivalis_state_MASK, 0;
+    set @Q_Nivalis_state_SHIFT, 0;
+    set @rescue_Cindy, 0;
+    set @candy, 0;
+    set @inventorylist_count, 0;
+    set @random, 0;
+    set @quote$, "";
     close;
 
 S_Update_Mask: