Merge Sailor's quest from Crazyfefe.

Jesusalva changed formulas and stuff, it is... very... different.

2 files changed, 58 insertions, 2 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index 520808e13..21bb7fe9f 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -134,6 +134,10 @@ quest_db: (
     Id: 41
     Name: "CandorQuest_Liana"
 },
+{
+    Id: 42
+    Name: "CandorQuest_SailorCure"
+},
 
 // ID 51 to 70: Tulimshar quests
 {
diff --git a/npc/005-1/sailors.txt b/npc/005-1/sailors.txt
index d7f3b07c7..1d75758dc 100644
--- a/npc/005-1/sailors.txt
+++ b/npc/005-1/sailors.txt
@@ -1,8 +1,9 @@
 // TMW2 scripts.
 // Authors:
 //    Jesusalva
+//    Crazyfefe
 // Description:
-//    TODO
+//    A Sailor from Nard's crew.
 // CandorQuest_Sailors
 //  0: Not started
 //  1: Accepted
@@ -86,12 +87,63 @@ L_Elmo:
     close;
 
 L_Complete:
+    .@q = getq(CandorQuest_SailorCure);
     mesn;
     mesq l("Thanks for the help! Arr, that was some fine ale, indeed!");
+    if (.@q == 1)
+        close;
+    next;
+    mesn;
+    mesq l("A pity a friend of ours drank too much. Juliet knows how to cure, but she needs @@ to do a hangover potion.", getitemlink(ScorpionStinger));
+
+L_CureMaster:
+    if (countitem(ScorpionStinger) < 1)
+        close;
+
+    mesq l("...Dealing with scorpion stingers is a gamble, so we may need a few stingers before making a successful potion.");
+    next;
+    select
+        rif(countitem(ScorpionStinger) > 1, l("I have a Stinger with me. Try it!")),
+        l("I see.");
+
+    mes "";
+
+    if (@menu == 1)
+        goto L_CureLoop;
     close;
 
+L_CureLoop:
+    delitem ScorpionStinger,1;
+    setq2 CandorQuest_SailorCure, getq2(CandorQuest_SailorCure)+1;
+    if (rand(5) == 2) // Crazyfefe like this number :3
+        goto L_questCure_success;
+    goto questCure_failure;
+
+L_questCure_success:
+    if (getq2(CandorQuest_SailorCure) * 40 < 240)
+        Zeny = Zeny + 240 - getq2(CandorQuest_SailorCure) * 40;
+    else
+        Zeny = Zeny + 40;
+    getexp 50, 10;
+    setq CandorQuest_SailorCure, 1;
+    mesn;
+    mesq l("That... It... It worked! This is just the right claw!");
+    next;
+    mesn;
+    mesq lg("We'll bring this one to Juliet at once. Thanks for your help! Savior!");
+    close;
+
+L_questCure_failure:
+    Zeny = Zeny + 60;
+    mesn;
+    mesq l("That... Didn't worked. I'm sorry.");
+    next;
+    mesn;
+    mesq l("Here's 60 GP for your efforts.");
+    goto L_CureMaster;
+
 OnInit:
     .sex = G_OTHER;
-    .distance = 8;
+    .distance = 7;
     end;
 }