Properly fix Dausen quest (but don't write it)

2 files changed, 14 insertions, 19 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index 184db5487..f7cbd5a23 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -194,6 +194,10 @@ quest_db: (
     Name: "CandorQuest_Sailors"
 },
 {
+    Id: 42
+    Name: "TulimsharQuest_WaterForGuard"
+},
+{
 	Id: 1000
 	Name: "Test_testing1"
 },
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 63bd9b426..f1ef748ac 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -23,14 +23,10 @@
     }

 

     .@has = getq(TulimsharQuest_WaterForGuard);

-    if (.@has > 1) {

-        npctalk3 l("ERROR: Quest state is @@, should be 0 or 1!", .@has);

-        .@has=3;

-    }

     if (.@has == 0)

     {

         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

-            l("Hello can you help me for find all kids");

+            l("Hello can you help me?");

         do

         {

             select

@@ -48,8 +44,7 @@
     else if (.@has == 1)

     {

         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

-            l("You don't find all of them yet.");

-        close;

+            l("Not yet. Get level 255 and I'll reward you!");

     }

     else if (.@has == 2)

     {

@@ -57,14 +52,12 @@
             l("Thank you, there is your reward");

             narrator("You receive 30 exp.");

         getexp 30, 0;

-        setq CandorQuest_HAS, 3;

-        close;

+        setq TulimsharQuest_WaterForGuard, 3;

     }

     else

     {

         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

             l("Thank you for your help.");

-        close;

     }

 

     closedialog;

@@ -84,17 +77,14 @@ function	script	CheckGuard	{
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

             l("Oh! You found me well played !.");

             narrator("You receive 5 exp.");

-    if (.questCheck == 18)

-    {

-        setq CandorQuest_HAS, 2;

-    }

     getexp 5,0;

     close;

 }

 003-1,98,100,0	script	Guard Philip	NPC_GUARD1,{

-    if (getq(CandorQuest_HAS) == 1)

+    legiontalk;

+    if (getq(TulimsharQuest_WaterForGuard) == 1)

     {

-        //CheckEnfant(); // FIXME and everywhere else: Missing Function

+        //CheckGuard(); // FIXME This is not Hide And Seek

     }

     end;

     

@@ -188,7 +178,7 @@ OnInit:
 }

 003-1,58,100,0	script	Guard Popaul	NPC_GUARD1,{

     legiontalk;

-    if (getq(CandorQuest_HAS) == 1)

+    if (getq(TulimsharQuest_WaterForGuard) == 1)

     {

         //CheckGuard(); // TODO: TBD

     }

@@ -280,9 +270,10 @@ OnInit:
     end;

 }

 003-1,102,80,0	script	Guard Tetric	NPC_GUARD1,{

-    if (getq(CandorQuest_HAS) == 1)

+    legiontalk;

+    if (getq(TulimsharQuest_WaterForGuard) == 1)

     {

-        //CheckEnfant(); // FIXME and everywhere else: Missing Function

+        //CheckGuard(); // FIXME and everywhere else: Missing Function

     }

     end;