add new states to cindy quest

5 files changed, 25 insertions, 11 deletions

diff --git a/world/map/npc/009-1/milly.txt b/world/map/npc/009-1/milly.txt
index 97752990..a32f7617 100644
--- a/world/map/npc/009-1/milly.txt
+++ b/world/map/npc/009-1/milly.txt
@@ -13,7 +13,7 @@
     set @got_boneknife, ((QUEST_Forestbow_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT) >= 4;
     set @got_setzer,  ((QUEST_Forestbow_state & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT) >= 8;
     set @saved_rossy, (FLAGS & FLAG_ROSSI_COMPLETED);
-    set @saved_cindy, QL_CINDY >= 4;
+    set @saved_cindy, QL_CINDY == 4;
 
     if (FLAGS & FLAG_GOT_BEANIEHAT) goto L_FinishedGood;
     if (FLAGS & FLAG_DECLINED_BEANIEHAT) goto L_FinishedBad;
diff --git a/world/map/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt
index 4b0c5db5..322cbfb0 100644
--- a/world/map/npc/031-1/angelaOutside.txt
+++ b/world/map/npc/031-1/angelaOutside.txt
@@ -9,8 +9,10 @@
     mes "Current state: " + QL_CINDY;
     mes "---";
     mes "Available states:";
-    mes "0 - does not have the quest.";
-    mes "1 - got the quest.";
+    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.";
@@ -20,7 +22,7 @@
 
 L_Set:
     input @state;
-    if(@state < 0 || @state > 4) set @state, 0;
+    if(@state < 0 || @state > 6) set @state, 0;
     set QL_CINDY, @state;
     goto L_Close;
 
@@ -32,12 +34,12 @@ OnInit:
     end;
 }
 
-031-1,79,24,0|script|Angela|195
+031-1,79,24,0|script|Angela|195,15,15
 {
     set @minlevel, 70;
 
-    if (QL_CINDY > 3) goto L_Please_Visit_Again;
-    if (QL_CINDY > 1) goto L_Please_Visit;
+    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;
 
     mes "[Angela]";
@@ -45,13 +47,18 @@ OnInit:
     next;
     mes "\"It's terrible, oh my dear child!\"";
     next;
-    if (countitem("ConcentrationPotion") > 0 && BaseLevel >= @minlevel)
+    if (countitem("ConcentrationPotion") > 0 && BaseLevel >= @minlevel && QL_CINDY == 6)
         goto L_Menu_Potion;
 
     menu
         "\"Please calm down and tell me what happened.\"", L_Whining,
         "Leave", L_Close;
 
+OnTouch:
+    if(BaseLevel >= @minlevel && !QL_CINDY)
+        set QL_CINDY, 5;
+    end;
+
 L_Whining:
     mes "[Angela]";
     mes "\"My poor little daughter, please! Oh no, oh no...\"";
@@ -73,6 +80,13 @@ 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...";
+    if(BaseLevel >= @minlevel) goto L_GetQuest;
+    goto L_Close;
+
+L_GetQuest:
+    next;
+    set QL_CINDY, 6;
+    mes "Perhaps you could give her something to help concentrate ?";
     goto L_Close;
 
 L_Menu_Potion:
diff --git a/world/map/npc/031-1/house.txt b/world/map/npc/031-1/house.txt
index bf678666..f7ffb549 100644
--- a/world/map/npc/031-1/house.txt
+++ b/world/map/npc/031-1/house.txt
@@ -4,7 +4,7 @@
 
 031-1,95,80,0|script|#Door|45,0,0
 {
-    if (QL_CINDY > 2)
+    if (QL_CINDY == 3 || QL_CINDY == 4)
         goto L_Warp;
     message strcharinfo(0), "##3Door : ##BThe door is locked.";
     end;
diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt
index 564e7935..c1f0c1e3 100644
--- a/world/map/npc/031-2/cindyHouse.txt
+++ b/world/map/npc/031-2/cindyHouse.txt
@@ -4,7 +4,7 @@
 
 031-2,27,26,0|script|Cindy#house|197
 {
-    if (QL_CINDY > 2) goto L_Happy_Random;
+    if (QL_CINDY == 3 || QL_CINDY == 4) goto L_Happy_Random;
 
     mes "...";
     goto L_Close;
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index 6459a047..68bb3f05 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -14,7 +14,7 @@
     if (Sex == 0) set @title$, "Misses";
     if (Sex == 1) set @title$, "Mister";
 
-    if (QL_CINDY >= 3) goto L_Please_Visit;
+    if (QL_CINDY == 4) goto L_Please_Visit;
     if (QL_CINDY == 2) goto L_Reward;
     if (QL_CINDY == 1) goto L_Please_Help;