Add new values to ShipQuests_Peter variable for a more complet add on the quest log.

3 files changed, 10 insertions, 7 deletions

diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 5b3116298..475959c78 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -45,7 +45,7 @@ l_First:
     next;

     mesq l("My name is Julia, it's me who took care of you, when we found you in the sea.");

     next;

-    mesq l("I'm very happy to see you're okay now!");

+    mesq lg("I'm very happy to see you're okay now!");

     next;

     mesq lg("Could I ask you what your native language is? A sailor told me you're russian, but another one told me you're french... I'm a bit lost. I will register you on the ship boarding list just after that.");

     next;

diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index cd14c93c8..c38c5abb3 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -12,12 +12,13 @@
 // Variable:
 //    ShipQuests_Peter
 // Values:
-//    0   Did not start the quest.
+//    0   Doesn't know the quest.
 //    1   Task given.
 //    2   Task given and reward expected.
 //    3   Task completed without reward.
 //    4   Asked for reward after completion of the task.
 //    5   Task done and reward given.
+//    6   Did not start the quest.
 // "000-2-2.gat" - map with mobs.
 // "$@RAT_SAILOR_HELPER$" - Name of the participant.
 // "$@RAT_SAILOR_DEATHS - Number of deaths when the paticipant starts the fight.
@@ -38,11 +39,11 @@ OnTouch:
     if (BaseLevel < 5) goto L_Stop;
     if ($@RAT_SAILOR_HELPER$ != "") goto L_Occupied;
     set @q, getq(ShipQuests_Peter);
-    if (@q < 1) goto L_Task;
+    if (@q < 1 || @q > 5) goto L_Task;
     if (@q == 1 || @q == 2) goto L_Rfail;
     if (@q == 3 || @q == 4) goto L_Rwin;
+    if (@q > 5) goto L_SecondTime;
     doevent "Peter::OnReturnWin";
-
     close;
 
 L_Stop:
@@ -80,7 +81,8 @@ L_Rwin:
 
     set @q, getq(ShipQuests_Peter);
     if (@q == 1 || @q == 2) goto OnReturnFail;
-    if (@q >= 3) goto OnReturnWin;
+    if (@q == 3 || @q == 4 || @q == 5)  goto OnReturnWin;
+    setq ShipQuests_Peter, 6;
 
 OnGiveTask:
     mesn;
@@ -176,7 +178,7 @@ L_BonusTask:
         l("What? This reward is too small!"), L_Close;
 
     if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
-    if (@q == 0) setq ShipQuests_Peter, 2;
+    if (@q == 6) setq ShipQuests_Peter, 2;
     if (@q == 3) setq ShipQuests_Peter, 4;
 
     goto L_Start;
@@ -184,7 +186,7 @@ L_BonusTask:
 L_Task:
     mes "";
     if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
-    if (@q == 0) setq ShipQuests_Peter, 1;
+    if (@q == 6) setq ShipQuests_Peter, 1;
     goto L_Start;
 
 L_Start:
diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt
index 404038a60..f484973b9 100644
--- a/npc/000-2-2/doors.txt
+++ b/npc/000-2-2/doors.txt
@@ -16,6 +16,7 @@ OnTouch:
 l_Warn:
     set @q, getq(ShipQuests_Peter);
     if (@q == 5) goto l_Warp;
+
     mesn "Narrator";
     mes col(l("There are still some Rattos left! Do you want to abort the quest?"), 9);
     next;