From 833c70cf2ada6b6015ed49fc3f98c9aa4bb4ad4c Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Mon, 4 May 2015 11:43:47 -0400
Subject: convert well quest

---
 world/map/db/quest-log.txt   |  7 +++++++
 world/map/npc/020-1/well.txt | 32 +++++---------------------------
 2 files changed, 12 insertions(+), 27 deletions(-)

(limited to 'world/map')

diff --git a/world/map/db/quest-log.txt b/world/map/db/quest-log.txt
index 3802640d..ab1fd166 100644
--- a/world/map/db/quest-log.txt
+++ b/world/map/db/quest-log.txt
@@ -5,9 +5,16 @@
 //SHIFT: Posistion shifted. (SHIFT * MASK)
 //MASK: Size of shift to make. ((1 << MASK) - 1) << (SHIFT * MASK)
 //Quest ID,CommonVar,ServerVar,SHIFT,MASK
+//
+// CANDOR
+//
 1,QL_BEGIN,STARTAREA,0,4
 2,QL_VALON,STARTAREA,1,4
 3,QL_MORGAN,STARTAREA,3,4
 4,QL_ZEGAS,STARTAREA,4,4
 5,QL_VINCENT,QUEST_SouthTulimshar,4,2
 6,QL_HIDENSEEK,QUEST_NorthTulimshar,0,8
+//
+// KAIZEI
+//
+7,QL_WELL,QUEST_Nivalis_state,4,4
diff --git a/world/map/npc/020-1/well.txt b/world/map/npc/020-1/well.txt
index a4513536..5c9c9d75 100644
--- a/world/map/npc/020-1/well.txt
+++ b/world/map/npc/020-1/well.txt
@@ -16,11 +16,7 @@
 
 020-1,99,83,0|script|#Well|400
 {
-    set @Q_MASK, NIBBLE_4_MASK;
-    set @Q_SHIFT, NIBBLE_4_SHIFT;
-    set @Q_status, ((QUEST_Nivalis_state) & @Q_MASK) >> @Q_SHIFT;
-
-    if(@Q_status == 2) goto L_Finished;
+    if(QL_WELL == 2) goto L_Finished;
     set @item_ID, 0;
     setarray @quote_item$, "Yuck! Who has thrown that on me?","Ouch! Who hurts me?","White powder!? What's going on up there?","Ahw! It's raining ","","","";
 
@@ -76,8 +72,7 @@ L_MenuItems1:
             set @quote$, "";
     mes "[Mysterious voice inside the well]";
     mes "\" "+ @quote$ +". So if you can call help for me... please do so!\"";
-    set @Q_status, 1;
-    callsub S_Update_Var;
+    set QL_WELL, 1;
     close;
 
 L_NO_ITEM:
@@ -90,24 +85,14 @@ L_Finished:
 
 L_Close:
     close;
-
-S_Update_Var:
-    set QUEST_Nivalis_state,
-          (QUEST_Nivalis_state & ~(@Q_MASK)
-        | (@Q_status << @Q_SHIFT));
-    return;
 }
 
 020-2,100,28,0|script|Miler|100
 {
-    set @Q_MASK, NIBBLE_4_MASK;
-    set @Q_SHIFT, NIBBLE_4_SHIFT;
-    set @Q_status, ((QUEST_Nivalis_state) & @Q_MASK) >> @Q_SHIFT;
-
     mes "[Miler]";
     mes "\"Hello!\"";
-    if(@Q_status == 2) close;
-    if(@Q_status == 1)
+    if(QL_WELL == 2) close;
+    if(QL_WELL == 1)
         menu
             "Hello.", L_Close,
             "Hello, Can you help me?", L_HELP;
@@ -122,16 +107,9 @@ L_Next:
     mes "[Miler]";
     mes "\"Ho! I'll help him!\"";
     getexp (BaseLevel * 111), 0;
-    set @Q_status, 2;
-    callsub S_Update_Var;
+    set QL_WELL, 2;
     close;
 
 L_Close:
     close;
-
-S_Update_Var:
-    set QUEST_Nivalis_state,
-        (QUEST_Nivalis_state & ~(@Q_MASK)
-      | (@Q_status << @Q_SHIFT));
-    return;
 }
-- 
cgit v1.2.3-70-g09d2