convert cindy quest

2 files changed, 34 insertions, 30 deletions

diff --git a/world/map/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt
index 17bfff00..4b0c5db5 100644
--- a/world/map/npc/031-1/angelaOutside.txt
+++ b/world/map/npc/031-1/angelaOutside.txt
@@ -4,18 +4,41 @@
 // state2 and state3: Cindy is saved Angela invites you to visit them for giving a reward
 // state greater than 3: Angela invites and asks you to bring present boxes
 
-031-1,79,24,0|script|Angela|195
+031-1,81,24,0|script|Debug#Angela|195
 {
-    set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
-    set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
+    mes "Current state: " + QL_CINDY;
+    mes "---";
+    mes "Available states:";
+    mes "0 - does not have the quest.";
+    mes "1 - got the quest.";
+    mes "2 - rescued cindy.";
+    mes "3 - got reward from cindy.";
+    mes "4 - got reward from angela.";
+    menu
+        "set state", L_Set,
+        "close", L_Close;
+
+L_Set:
+    input @state;
+    if(@state < 0 || @state > 4) set @state, 0;
+    set QL_CINDY, @state;
+    goto L_Close;
 
-    set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
+L_Close:
+    close;
 
+OnInit:
+    if (!debug) disablenpc strnpcinfo(0);
+    end;
+}
+
+031-1,79,24,0|script|Angela|195
+{
     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;
+    if (QL_CINDY > 3) goto L_Please_Visit_Again;
+    if (QL_CINDY > 1) goto L_Please_Visit;
+    if (QL_CINDY == 1) goto L_Please_Help;
 
     mes "[Angela]";
     mes "\"Please, I need help! My little daughter!\"";
@@ -75,8 +98,7 @@ L_Calm_Down:
     mes "\"Oh my poor little girl. I'm so worried - what might they do with her? Oh no!\"";
     next;
     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;
+    set QL_CINDY, 1;
     goto L_Close;
 
 L_No_Potion:
@@ -103,15 +125,6 @@ L_Please_Visit_Again:
     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:
-    set QUEST_Nivalis_state,
-        (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
-            | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
-    return;
 }
diff --git a/world/map/npc/031-1/house.txt b/world/map/npc/031-1/house.txt
index c64009ba..bf678666 100644
--- a/world/map/npc/031-1/house.txt
+++ b/world/map/npc/031-1/house.txt
@@ -4,19 +4,10 @@
 
 031-1,95,80,0|script|#Door|45,0,0
 {
-    set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
-    set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
-
-    set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
-
-    if (@rescue_Cindy > 2)
+    if (QL_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;
+    message strcharinfo(0), "##3Door : ##BThe door is locked.";
+    end;
 
 L_Warp:
     warp "031-2", 23, 28;