Add value 2 on ShipQuests_Julia const,

Add wall check around peter, to redirect the player to Julia,
Change value 0 to 2 on Julia and Peter scripts.

2 files changed, 32 insertions, 13 deletions

diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 7bf7c315..bf8b3fc0 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -9,8 +9,8 @@
 // Variable:

 //    ShipQuests_Julia

 // Values:

-//    0   First touch.

-//    1   Already touched.

+//    1   Already touched.
+//    2   First touch.

 

 000-2-0.gat,27,24,0,0	script	Julia	304,2,10;5,{

 
@@ -175,7 +175,7 @@ l_Rules:
 

 OnTouch:

     set @q, getq(ShipQuests_Julia);

-    if (@q == 0) goto l_First;

+    if (@q == 0 || @q == 2) goto l_First;

 

     close;

 

diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 3e0dec71..b60936ce 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -10,15 +10,19 @@
 // 4 bits array:
 //    ShipQuests
 // Variable:
-//    ShipQuests_Peter
+//    0 ShipQuests_Peter
+//    1 ShipQuests_Julia
 // Values:
-//    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.
+//    00   Doesn't know the quest.
+//    01   Task given.
+//    02   Task given and reward expected.
+//    03   Task completed without reward.
+//    04   Asked for reward after completion of the task.
+//    05   Task done and reward given.
+//    06   Did not start the quest.
+//    10   Doesnt' know Julia.
+//    11   Registred to Julia.
+//    12   Need to see Julia.
 // "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.
@@ -36,6 +40,8 @@
 000-2-1.gat,61,34,0,1	script	AreaNPC	0,0,1,{
 
 OnTouch:
+    set @q_julia, getq(ShipQuests_Julia);
+    if (@q_julia == 0) goto OnTalkToJulia;
     if (BaseLevel < 5) goto L_Stop;
     if ($@RAT_SAILOR_HELPER$ != "") goto L_Occupied;
     set @q, getq(ShipQuests_Peter);
@@ -70,13 +76,15 @@ L_Rwin:
     doevent "Peter::OnReturnWin";
 
     close;
+L_TalkToJulia:
+    doevent "Peter::OnTalkToJulia";
 
 }
 
 000-2-1.gat,60,35,0,1	script	Peter	303;3,{
 
     set @q_julia, getq(ShipQuests_Julia);
-    if (@q_julia == 0) goto L_TalkToJulia;
+    if (@q_julia == 0) goto OnTalkToJulia;
     if (BaseLevel < 5) goto OnTooWeak;
 
     set @q, getq(ShipQuests_Peter);
@@ -104,7 +112,7 @@ OnGiveTask:
 
     goto L_Close;
 
-L_TalkToJulia:
+OnTalkToJulia:
     mesn;
     mesq l("Hey, you should go see Julia to be registered on the ship board.");
     next;
@@ -112,6 +120,7 @@ L_TalkToJulia:
     mesn "Narrator";
     mes col(l("Julia is on the upper level of the ship, use the arrow keys to walk to the stairs or click on the stairs at the top right of your screen."), 9);
 
+    setq ShipQuests_Julia, 2;
     goto L_Close;
 
 OnTooWeak:
@@ -306,3 +315,13 @@ L_Close:
     close;
 
 }
+
+000-2-1.gat,54,32,0,1	script	PeterBarrierCheck	0,0,2,{
+    set @q, getq(ShipQuests_Julia);
+    if (@q > 0) close;
+    setq ShipQuests_Julia, 2;
+    doevent "Peter::OnTalkToJulia";
+
+    close;
+
+}
\ No newline at end of file