Rewrite Cindy Quest to quest system, with ID 140

1 files changed, 23 insertions, 26 deletions

diff --git a/npc/031-4/cindyCave.txt b/npc/031-4/cindyCave.txt
index d30b7281..39ff62e4 100644
--- a/npc/031-4/cindyCave.txt
+++ b/npc/031-4/cindyCave.txt
@@ -1,13 +1,11 @@
 
 031-4,42,42,0	script	Cindy	NPC198,{
+    .@q = getq(KaizeiQuest_Cindy);
     if ($@FIGHT_YETI_STATUS != 0) goto L_Yeti;
 
-    @KEYS_AMOUNT = 10;
-    @minLevel = 70;
-
-    if (QL_CINDY == 4) goto L_Please_Visit;
-    if (QL_CINDY == 2) goto L_Reward;
-    if (QL_CINDY == 1) goto L_Please_Help;
+    if (.@q > 4) goto L_Please_Visit;
+    if (.@q == 3) goto L_Reward;
+    if (.@q == 2) goto L_Please_Help;
 
     mes "There is a little girl in a cage. As you come near, she starts to shiver and back off from you as far as she can in that small cage.";
     next;
@@ -34,11 +32,11 @@ L_Next:
         "Leave", L_close;
 
 L_Try_Cage:
-    if (BaseLevel < @minLevel)
+    if (BaseLevel < .minLevel)
         goto L_To_Weak;
-    if (countitem(TreasureKey) < @KEYS_AMOUNT)
+    if (countitem(TreasureKey) < .KEYS_AMOUNT)
         goto L_Not_Enough_Keys;
-    delitem TreasureKey, @KEYS_AMOUNT;
+    delitem TreasureKey, .KEYS_AMOUNT;
     mes "As you try to open the door of the cage, there is a loud squeaking noise.";
     next;
     mes "You get an uncomfortable feeling and Cindy starts to shiver.";
@@ -71,18 +69,17 @@ L_Reward:
     if (@inventorylist_count == 100)
         goto L_Full_Inv;
 
-    @reward = rand(15);
-    if (@reward < 10)
+    .@reward = rand2(15);
+    if (.@reward < 10)
         goto L_Wizard_Hat;
-    getitem "WoodenStaff", 1;
-    QL_CINDY = 3;
+    getitem WoodenStaff, 1;
+    setq(KaizeiQuest_Cindy, 4);
     goto L_Visit;
 
 L_Wizard_Hat:
     // get a wizard hat in one of the ten colors - no white
-    setarray @wizardhats[0], 2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209;
-    getitem @wizardhats[@reward], 1;
-    QL_CINDY = 3;
+    getitem any(2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209), 1;
+    setq(KaizeiQuest_Cindy, 4);
     goto L_Visit;
 
 L_Visit:
@@ -95,16 +92,16 @@ L_Please_Visit:
     mesn;
     mes "\"Thank you, thank you! You're a hero! Please come home with me to our house at the beach!\"";
     next;
-    mesc l("You can relive the memories for %d %s, however, the rewards cannot be obtained again.", @KEYS_AMOUNT*2, getitemlink(TreasureKey));
-    if (countitem(TreasureKey) < @KEYS_AMOUNT*2)
+    mesc l("You can relive the memories for %d %s, however, the rewards cannot be obtained again.", .KEYS_AMOUNT*2, getitemlink(TreasureKey));
+    if (countitem(TreasureKey) < .KEYS_AMOUNT*2)
         goto L_close;
     mesc l("Do you want to?");
     next;
     if (askyesno() == ASK_YES &&
         !$@FIGHT_YETI_STATUS &&
-        BaseLevel >= @minLevel)
+        BaseLevel >= .minLevel)
     {
-        delitem TreasureKey, @KEYS_AMOUNT;
+        delitem TreasureKey, .KEYS_AMOUNT;
         goto L_Try_Cage;
     }
     goto L_close;
@@ -122,11 +119,7 @@ L_Full_Inv:
     goto L_close;
 
 L_close:
-    @KEYS_AMOUNT = 0;
-    @minLevel = 0;
     @inventorylist_count = 0;
-    cleararray @wizardhats, 0, 10;
-    @reward = 0;
     close;
 
 OnTimer5000:
@@ -207,9 +200,9 @@ OnReward:
     @bonus = (BaseLevel/2);
     DailyQuestBonus = DailyQuestBonus + @bonus;
     message strcharinfo(0), "You feel a temporary rush of power and zest for action. " + @bonus + " daily bonus gained." ;
-    if (QL_CINDY != 1 )
+    if (getq(KaizeiQuest_Cindy) != 2)
         goto L_End;
-    QL_CINDY = 2;
+    setq(KaizeiQuest_Cindy, 3);
     message strcharinfo(0), "Cindy looks relieved and as if she wants to talk with you.";
     BOSS_POINTS = BOSS_POINTS + 70;
     message strcharinfo(0), "You gain 70 Boss Points giving you a total of " + BOSS_POINTS + ".";
@@ -233,5 +226,9 @@ OnInit:
         "Cindy : There are coming more and more!",
         "Cindy : Watch your back! There are so many of them!",
         "Cindy : This seems to be their final attack! I believe in you!";
+
+    .KEYS_AMOUNT = 10;
+    .minLevel = 70;
+    .distance = 5;
     end;
 }