Fix Treasure Chest/Darlin Quest and a bug in Lean script.

4 files changed, 15 insertions, 92 deletions

diff --git a/db/questvars.txt b/db/questvars.txt
index 979d7b75..f667f0a5 100644
--- a/db/questvars.txt
+++ b/db/questvars.txt
@@ -15,7 +15,7 @@ ShipQuests,15,32768     // ShipQuests_Nard             4
 ShipQuests,1,1024       // ShipQuests_Knife            5
 ShipQuests,1,2048       // ShipQuests_ArpanMoney       6
 ShipQuests,1,4096       // ShipQuests_Door             7
-ShipQuests,3,8192       // ShipQuests_Darlin           8
+ShipQuests,3,8192       // ShipQuests_TreasureChest    8
 ShipQuests,1,524288     // ShipQuests_Couwan           9
 ShipQuests,1,1048576    // ShipQuests_Ale              10
 ShipQuests,1,2097152    // ShipQuests_Astapolos        11
diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt
index 46f455be..b8d85e78 100644
--- a/npc/000-1/chest.txt
+++ b/npc/000-1/chest.txt
@@ -6,16 +6,14 @@
 // Description:
 //    A treasure chest, with... Treasures inside!
 // Variable:
-//    x   ShipQuests_Darlin
+//    x   ShipQuests_TreasureChest
 // Values: 
-//    0   Never talked with Darlin.
-//    1   Spoke, and received quest.
-//    2   Opened the treasure chest.
-//    3   Get back to Darlin.
+//    0   Treasure Chest has not been opened yet.
+//    1   Treasure Chest has been opened.
 
 000-1.gat,83,70,0	script	#chest	316;2,{
 
-    set @q, getq(ShipQuests_Darlin);
+    set @q, getq(ShipQuests_TreasureChest);
     if (getnpcdir ("") == 4) goto l_Give;
 
     setnpcdir 2;
@@ -24,13 +22,13 @@
     close;
 
 l_Give:
-    if (@q > 1) goto l_Close;
+    if (@q > 0) goto l_Close;
 
     set @item, 514;
     set @count, 1;
     callfunc "InventoryPlace", @item, @count;
 
-    setq ShipQuests_Darlin, 2;
+    setq ShipQuests_TreasureChest, 1;
 
     set zeny, zeny + 100;
     getitem "OldBook", 1;
diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index ba6f3fa9..1e37e806 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -5,21 +5,17 @@
 // Description:
 //    Darlin talks from the top of the tall mast.
 // Variable:
-//    x   ShipQuests_Darlin
+//    x   ShipQuests_TreasureChest
 // Values: 
-//    0   Never talked with Darlin.
-//    1   Spoke, and received quest.
-//    2   Opened the treasure chest.
-//    3   Get back to Darlin.
+//    0   Treasure Chest has not been opened yet.
+//    1   Treasure Chest has been opened.
+
 
 000-1.gat,89,95,0,1	script	Darlin	103;14,{
 
-    mesn;
-    set @q, getq(ShipQuests_Darlin);
-    if (@q == 1 || @q == 2) goto OnQuestGiven;
-    if (@q > 2) goto l_QuestDone;
+    set @q, getq(ShipQuests_TreasureChest);
 
-OnStart:
+    mesn;
     setcamnpc;
     mesq l("HEY! HEY YOU!"); 
     next;
@@ -87,11 +83,7 @@ OnStart:
     next;
     restorecam;
 
-l_Menu:
-    set @q, getq(ShipQuests_Darlin);
-
     menu
-        l("Maybe you can come down to talk?"), l_GoDown,
         l("I'm looking for Gugli, where is he?"), -,
         l("I need to go, sorry."), l_Bye;
 
@@ -126,25 +118,10 @@ l_GoDown:
     mesn;
 
     if (@q > 0) goto l_DangerAround;
-    setq ShipQuests_Darlin, 1;
 
     setcamnpc;
     mesq l("Oh no, but I've noticed a weird light on the other edge of this island, I wonder what it can be...");
-    next;
-    mesq l("MAYBE YOU CAN LOOK AT THIS?!");
-    next;
-    restorecam;
-
-    menu
-        l("I'll look at it."), l_Bye,
-        l("Sure, but Gugli needs my help first."), -;
 
-    setcamnpc;
-    mes "";
-    mesn;
-    mesq l("IT'S OK, CREW TASKS ARE MUCH MORE IMPORTANT THAN CURIOSITY!");
-    next;
-    mesq l("ANYWAY, MAYBE WHEN YOU ARE LOOKING FOR FOOD WITH GUGLI YOU WILL HAVE THE TIME TO LOOK AT THIS!");
     close;
 
 l_Bye:
@@ -152,52 +129,8 @@ l_Bye:
     mes "";
     mesn;
     mesq l("FINE, BYE!");
-    close;
-
-OnQuestGiven:
-    setcamnpc;
-    mesq l("HEY @@!", strcharinfo(0));
-    next;
-    mesq l("DID YOU FIND OUT WHAT THE LIGHT WAS?!");
-    next;
-    restorecam;
-
-    menu
-        rif(@q == 1, l("I forgot where it was...")), -,
-        rif(@q == 2, l("Yes, it's a chest.")), l_Chest,
-        l("Oh, nothing important."), l_Nothing;
-
-    setcamnpc;
-    mes "";
-    mesn;
-    mesq l("ON THE TOP OF THE CLIFF!");
-    next;
-    mesq l("YOU NEED TO WALK NORTH!");
-    restorecam;
-
-    goto l_Menu;
-
-l_Nothing:
-    setcamnpc;
-    if (@q == 2) setq ShipQuests_Darlin, 3;
-    mes "";
-    mesn;
-    mesq l("OH, OK!");
-    restorecam;
-
-    goto l_Menu;
 
-l_Chest:
-    setcamnpc;
-    mes "";
-    mesn;
-    mesq l("SORRY, BUT WHAT DID YOU SAY? SPEAK LOUDER!");
-    next;
-    mesq l("IF YOU FIND SOMETHING, THEN IT'S GREAT!");
-
-    restorecam;
-    setq ShipQuests_Darlin, 3;
-    goto l_Menu;
+    close;
 
 l_DangerAround:
     setcamnpc;
@@ -205,14 +138,6 @@ l_DangerAround:
  
     close;
 
-l_QuestDone:
-    setcamnpc;
-    mesq l("HEY") + " " + strcharinfo(0) + "!"; 
-    next;
-
-    restorecam;
-    goto l_Menu;
-
 l_Quit:
     close;
 
diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt
index 7fbaff2c..47379f45 100644
--- a/npc/000-1/lean.txt
+++ b/npc/000-1/lean.txt
@@ -20,7 +20,7 @@
 
     menu
         rif(@gugli == 1, l("Well, I was in fact looking for them. Where are they now?")), l_Sailors,
-        l("Wait... Where are we going?"), l_Artis,
+        l("Wait... Where are we going?"), l_Artis;
 
 l_Artis:
     mes "";