Merge pull request #365 from mekolat/kaizei

Kaizei quests

1 files changed, 7 insertions, 31 deletions

diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index 218e4c08..68bb3f05 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -11,17 +11,12 @@
     set @KEYS_AMOUNT, 10;
     set @minlevel, 70;
 
-    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 (Sex == 0) set @title$, "Misses";
     if (Sex == 1) set @title$, "Mister";
 
-    if (@rescue_Cindy >= 3) goto L_Please_Visit;
-    if (@rescue_Cindy == 2) goto L_Reward;
-    if (@rescue_Cindy == 1) goto L_Please_Help;
+    if (QL_CINDY == 4) goto L_Please_Visit;
+    if (QL_CINDY == 2) goto L_Reward;
+    if (QL_CINDY == 1) 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;
@@ -89,16 +84,14 @@ L_Reward:
     if (@reward < 10)
         goto L_Wizard_Hat;
     getitem "WoodenStaff", 1;
-    set @rescue_Cindy, 3;
-    callsub S_Update_Mask;
+    set QL_CINDY, 3;
     goto L_Visit;
 
 L_Wizard_Hat:
     // get a wizard hat in one of the ten colors - no white
     setarray @wizardhats, 2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209;
     getitem @wizardhats[@reward], 1;
-    set @rescue_Cindy, 3;
-    callsub S_Update_Mask;
+    set QL_CINDY, 3;
     goto L_Visit;
 
 L_Visit:
@@ -126,9 +119,6 @@ L_Full_Inv:
 
 L_Close:
     set @KEYS_AMOUNT, 0;
-    set @Q_Nivalis_state_MASK, 0;
-    set @Q_Nivalis_state_SHIFT, 0;
-    set @rescue_Cindy, 0;
     set @title$, "";
     set @minlevel, 0;
     set @inventorylist_count, 0;
@@ -216,13 +206,9 @@ OnReward:
     set @bonus, (BaseLevel/2);
     set DailyQuestBonus, DailyQuestBonus + @bonus;
     message strcharinfo(0), "You feel a temporary rush of power and zest for action. " + @bonus + " daily bonus gained." ;
-    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 != 1 )
+    if (QL_CINDY != 1 )
         goto L_End;
-    set @rescue_Cindy, 2;
-    callsub S_Update_Mask;
+    set QL_CINDY, 2;
     message strcharinfo(0), "Cindy looks relieved and as if she wants to talk with you.";
     set BOSS_POINTS, BOSS_POINTS + 70;
     message strcharinfo(0), "You gain 70 Boss Points giving you a total of " + BOSS_POINTS + ".";
@@ -230,9 +216,6 @@ OnReward:
 
 L_End:
     set @bonus, 0;
-    set @Q_Nivalis_state_MASK, 0;
-    set @Q_Nivalis_state_SHIFT, 0;
-    set @rescue_Cindy, 0;
     end;
 
 OnInit:
@@ -250,11 +233,4 @@ OnInit:
         "Cindy : Watch your back! There are so many of them!",
         "Cindy : This seems to be their final attack! I believe in you!";
     end;
-
-/////////
-S_Update_Mask:
-    set QUEST_Nivalis_state,
-        (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
-            | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
-    return;
 }