Rewrite Cindy Quest to quest system, with ID 140

2 files changed, 26 insertions, 36 deletions

diff --git a/npc/031-1/angelaOutside.txt b/npc/031-1/angelaOutside.txt
index 92bb502a..dbacd7c3 100644
--- a/npc/031-1/angelaOutside.txt
+++ b/npc/031-1/angelaOutside.txt
@@ -1,26 +1,22 @@
 
 031-1,81,24,0	script	Debug#Angela	NPC195,{
-    mes "Current state: " + QL_CINDY;
+    mes "Current state: " + getq(KaizeiQuest_Cindy);
     mes "---";
     mes "Available states:";
-    mes "0 - can not do the quest.";
-    mes "5 - does not have the quest.";
-    mes "6 - got the quest.";
-    mes "1 - can go rescue cindy.";
-    mes "2 - rescued cindy.";
-    mes "3 - got reward from cindy.";
-    mes "4 - got reward from angela.";
+    mes "0 - can not do the quest or does not have the quest.";
+    mes "1 - got the quest.";
+    mes "2 - can go rescue cindy.";
+    mes "3 - rescued cindy.";
+    mes "4 - got reward from cindy.";
+    mes "5 - got reward from angela.";
     menu
         "set state", L_Set,
-        "close", L_close;
+        "close", -;
+    close;
 
 L_Set:
-    input @state;
-    if(@state < 0 || @state > 6) set @state, 0;
-    QL_CINDY = @state;
-    goto L_close;
-
-L_close:
+    input .@state, 0, 6;
+    setq(KaizeiQuest_Cindy, .@state);
     close;
 
 OnInit:
@@ -29,27 +25,23 @@ OnInit:
 }
 
 031-1,79,24,0	script	Angela	NPC195,15,15,{
-    if (QL_CINDY == 3) goto L_Please_Visit_Again;
-    if (QL_CINDY > 1 && QL_CINDY < 5) goto L_Please_Visit;
-    if (QL_CINDY == 1) goto L_Please_Help;
+    .@q = getq(KaizeiQuest_Cindy);
+    if (.@q == 4) goto L_Please_Visit_Again;
+    if (.@q > 2 && .@q < 6) goto L_Please_Visit;
+    if (.@q == 2) goto L_Please_Help;
 
     mes "[Angela]";
     mes "\"Please, I need help! My little daughter!\"";
     next;
     mes "\"It's terrible, oh my dear child!\"";
     next;
-    if (countitem("ConcentrationPotion") > 0 && BaseLevel >= .minlevel && QL_CINDY == 6)
+    if (countitem("ConcentrationPotion") > 0 && BaseLevel >= .minlevel && .@q == 1)
         goto L_Menu_Potion;
 
     menu
         "\"Please calm down and tell me what happened.\"", L_Whining,
         "Leave", L_close;
 
-OnTouch:
-    if(BaseLevel >= .minlevel && QL_CINDY < 1)
-        QL_CINDY = 5;
-    end;
-
 L_Whining:
     mes "[Angela]";
     mes "\"My poor little daughter, please! Oh no, oh no...\"";
@@ -76,8 +68,8 @@ L_Whining:
 
 L_GetQuest:
     next;
-    QL_CINDY = 6;
-    mes "Perhaps you could give her something to help concentrate ?";
+    setq(KaizeiQuest_Cindy, 1);
+    mes "Perhaps you could give her something to help concentrate?";
     goto L_close;
 
 L_Menu_Potion:
@@ -87,9 +79,9 @@ L_Menu_Potion:
         "Leave", L_close;
 
 L_Calm_Down:
-    if (countitem("ConcentrationPotion") == 0)
+    if (countitem(ConcentrationPotion) == 0)
         goto L_No_Potion;
-    delitem "ConcentrationPotion", 1;
+    delitem ConcentrationPotion, 1;
     mes "She drinks the concentration potions and calms down.";
     mes "[Angela]";
     mes "\"Thank you, this was helpful.\"";
@@ -103,7 +95,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!\"";
-    QL_CINDY = 1;
+    setq(KaizeiQuest_Cindy, 2);
     goto L_close;
 
 L_No_Potion:
diff --git a/npc/031-1/house.txt b/npc/031-1/house.txt
index 690d6da0..642be608 100644
--- a/npc/031-1/house.txt
+++ b/npc/031-1/house.txt
@@ -1,11 +1,9 @@
 
 031-1,95,80,0	script	#Door	NPC45,0,0,{
-    if (QL_CINDY == 3 || QL_CINDY == 4)
-        goto L_Warp;
-    message strcharinfo(0), "Door : ##BThe door is locked.";
-    end;
-
-L_Warp:
-    warp "031-2", 23, 28;
+    if (getq(KaizeiQuest_Cindy) > 3)
+        warp "031-2", 23, 28;
+    else
+        message strcharinfo(0), l("Door : ##BThe door is locked.");
     end;
 }
+