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

3 files changed, 27 insertions, 16 deletions

diff --git a/world/map/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt
index 9fce8e10..5e7017a8 100644
--- a/world/map/npc/031-1/angelaOutside.txt
+++ b/world/map/npc/031-1/angelaOutside.txt
@@ -1,5 +1,4 @@
 // author: Jenalya
-// reviewed by:
 // state0: Angela is to upset to tell you anything, needs a concentration potion
 // state1: got the mission to save Cindy
 // state2 and state3: Cindy is saved Angela invites you to visit them for giving a reward
@@ -12,6 +11,8 @@
 
     set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
 
+    set @minlevel, 70;
+
     if (@rescue_Cindy > 3) goto L_Please_Visit_Again;
     if (@rescue_Cindy > 1) goto L_Please_Visit;
     if (@rescue_Cindy == 1) goto L_Please_Help;
@@ -21,14 +22,13 @@
     next;
     mes "\"It's terrible, oh my dear child!\"";
     next;
-    if (countitem("ConcentrationPotion") > 0
-        && baselevel > 69)
-            goto L_Menu_Potion;
+    if (countitem("ConcentrationPotion") > 0 && BaseLevel >= @minlevel)
+        goto L_Menu_Potion;
 
     menu
         "\"Please calm down and tell me what happened.\"", L_Whining,
-        "Leave", -;
-    close;
+        "Leave", L_Close;
+    goto L_Close;
 
 L_Whining:
     mes "[Angela]";
@@ -51,14 +51,14 @@ L_Whining:
     mes "\"She is crying and sobbing.\"";
     next;
     mes "\"It seems she is too upset to tell you anything helpful. If she would just calm down and concentrate a bit...\"";
-    close;
+    goto L_Close;
 
 L_Menu_Potion:
     menu
         "\"Please calm down and tell me what happened.\"", L_Whining,
         "Give her a concentration potion.", L_Calm_Down,
-        "Leave", -;
-    close;
+        "Leave", L_Close;
+    goto L_Close;
 
 L_Calm_Down:
     if (countitem("ConcentrationPotion") == 0)
@@ -79,29 +79,36 @@ L_Calm_Down:
     mes "\"You look like an adventurer! Please, can you go in that cave and rescue my little Cindy? I beg you for help!\"";
     set @rescue_Cindy, 1;
     callsub S_Update_Mask;
-    close;
+    goto L_Close;
 
 L_No_Potion:
     mes "You don't have a concentration potion.";
-    close;
+    goto L_Close;
 
 L_Please_Help:
     mes "[Angela]";
     mes "\"Please go in that cave and rescue my daughter!\"";
-    close;
+    goto L_Close;
 
 L_Please_Visit:
     mes "[Angela]";
     mes "\"Thank you so much for rescuing my beloved Cindy. Please come to visit us in our house at the beach.\"";
     next;
     mes "\"My husband is an adventurer like you, and I want to give you something he got on his travels to show my gratitude.\"";
-    close;
+    goto L_Close;
 
 L_Please_Visit_Again:
     mes "[Angela]";
     mes "\"Hello! You are welcome to visit us in our house at the beach everytime. Cindy loves to see you!\"";
     next;
     mes "\"If you have found any present boxes the Yetis took away, please bring them to our house. Usually, the Yetis are very shy... their behavior is a bit odd.\"";
+    goto L_Close;
+
+L_Close:
+    set @Q_Nivalis_state_MASK, 0;
+    set @Q_Nivalis_state_SHIFT, 0;
+    set @rescue_Cindy, 0;
+    set @minlevel, 0;
     close;
 
 S_Update_Mask:
@@ -109,4 +116,4 @@ S_Update_Mask:
         (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
             | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
     return;
-}
\ No newline at end of file
+}
diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt
index 6a8eb467..b4fe4e77 100644
--- a/world/map/npc/031-1/frozenbeard.txt
+++ b/world/map/npc/031-1/frozenbeard.txt
@@ -10,11 +10,11 @@
     close;
 
 L_Frozenbeard_Argaes:
-    if (zeny < 500)
+    if (Zeny < 500)
         goto L_NoMoney;
     mes "[Frozenbeard]";
     mes "\"Pleasant Journeys!\"";
-    set zeny, zeny-500;
+    set Zeny, Zeny-500;
     warp "008-1.gat",137,64;
     close;
 
diff --git a/world/map/npc/031-1/house.txt b/world/map/npc/031-1/house.txt
index aa0d4067..f6e5c299 100644
--- a/world/map/npc/031-1/house.txt
+++ b/world/map/npc/031-1/house.txt
@@ -11,6 +11,10 @@
     if (@rescue_Cindy > 2)
         goto L_Warp;
     message strcharinfo(0), "The door is locked.";
+
+    set @Q_Nivalis_state_MASK, 0;
+    set @Q_Nivalis_state_SHIFT, 0;
+    set @rescue_Cindy, 0;
     close;
 
 L_Warp: