Peter barrier-check removed. Julia Quest cleaned up.

4 files changed, 36 insertions, 69 deletions

diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt
index 4290bf91..a1971c8d 100644
--- a/npc/000-2-0/doors.txt
+++ b/npc/000-2-0/doors.txt
@@ -12,9 +12,10 @@
 //    01   Nard spoke and gave access to the outdoor of the ship.
 //    02   Completed the quest.
 //    03   Opened the chest and finished the introduction.
-//    10   Doesnt' know Julia.
-//    11   Registred to Julia.
-//    12   Need to see Julia.
+//    10   Has not talked to Julia
+//    11   Need to see Julia
+//    12   Has been registered by Julia
+
 000-2-0.gat,20,27,0,1	script	AreaNPC	0,0,0,{
 
 OnTouch:
@@ -58,7 +59,7 @@ l_End:
 
 OnTouch:
     set @julia, getq(ShipQuests_Julia);
-    if (@julia == 1) goto l_Warp;
+    if (@julia == 2) goto l_Warp;
     close;
 
 l_Warp:
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 441189d8..f7d08fc9 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -4,18 +4,19 @@
 //    Vasily_Makarov
 // Description:
 //    Allows to change language and talks about what happened to him.
-// 2 Bits Array:
+//    2 Bits Array:
 //    ShipQuests
 // Variables:
-//    ShipQuests_Julia
-//    ShipQuests_ChefGado
+//    0 ShipQuests_Julia
+//    1 ShipQuests_ChefGado
 // Values ShipQuests_Julia:
-//    1   Already touched.
-//    2   First touch.
+//    00   Has not talked to Julia
+//    01   Need to see Julia
+//    02   Has been registered by Julia
 // Values ShipQuests_ChefGado:
-//    2   Ingredients collected, ready to poison Julia.
-//    3   Julia poisoned.
-//    5   Quest aborted.
+//    12   Ingredients collected, ready to poison Julia.
+//    13   Julia poisoned.
+//    15   Quest aborted.
 
 000-2-0.gat,27,24,0,0	script	Julia	304,2,10;5,{
 
@@ -82,7 +83,7 @@ l_First:
     mesq l("Ok, done.");
 
     set @q, getq(ShipQuests_Julia);
-    if (@q == 1) goto l_NoRules;
+    if (@q == 2) goto l_NoRules;
 
     next;
     mesq l("I'm sure that you've got some questions for me, feel free to ask them, but firstly I need to tell you the rules of proper social conduct on board.");
@@ -114,7 +115,7 @@ l_First:
     mesq l("I think I'm done with that now. Do you have any questions?");
     next;
 
-    setq ShipQuests_Julia, 1;
+    setq ShipQuests_Julia, 2;
     goto l_Menu;
 
 l_NoRules:
@@ -184,7 +185,7 @@ l_Rules:
 
 OnTouch:
     set @q, getq(ShipQuests_Julia);
-    if (@q == 0 || @q == 2) goto l_First;
+    if (@q == 0 || @q == 1) goto l_First;
 
     close;
 
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 8884c44e..033cc47f 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -4,12 +4,16 @@
 // Description:
 //    Tells to the player how he got here.
 // Variable:
-//    ShipQuests_Arpan
+//    0 ShipQuests_Arpan
+//    1 ShipQuests_Julia
 // Values:
-//    0   Has not talked to Arpan yet.
-//    1   Talked to Arpan and needs to get the clothes.
-//    2   Has the clothes.
-//    3   Has and equipped the clothes.
+//    00   Has not talked to Arpan yet.
+//    01   Talked to Arpan and needs to get the clothes.
+//    02   Has the clothes.
+//    03   Has and equipped the clothes.
+//    10   Has not talked to Julia
+//    11   Need to see Julia
+//    12   Has been registered by Julia
 
 000-2-1.gat,39,36,0,1	script	LeftDoorCheck	0,0,0,{
     set @q, getq(ShipQuests_Arpan);
@@ -80,6 +84,7 @@ l_EquipDone:
 000-2-1.gat,39,33,0,1	script	Magic Arpan	307;5,{
 
     set @q, getq(ShipQuests_Arpan);
+    set @q_julia, getq(ShipQuests_Julia);
     if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto l_EquipDone;
 
 OnTalk:
@@ -119,6 +124,7 @@ l_Story:
     mes "";
     mesq lg("You were yaying sleeping for quite some time there, our shipkeeper, Julia, was here with you, she did her best to heal your injuries.");
     next;
+    if (@q_julia == 0) setq ShipQuests_Julia, 1;
     mesq lg("Yaya, you should go see her! She'll be happy to see you.");
     next;
     mesq lg("Also, we took your yayed clothes, as they were... Yeyeye... In a bad shape. Go check the chest near your bed, there are some other ones inside.");
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index eaa7b942..9f3e4f94 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -10,19 +10,15 @@
 // 4+2 bits array:
 //    ShipQuests
 // Variable:
-//    0 ShipQuests_Peter
-//    1 ShipQuests_Julia
+//    ShipQuests_Peter
 // Values:
-//    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.
+//    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.
@@ -40,8 +36,6 @@
 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);
@@ -75,16 +69,10 @@ L_Rfail:
 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 OnTalkToJulia;
     if (BaseLevel < 5) goto OnTooWeak;
 
     set @q, getq(ShipQuests_Peter);
@@ -112,18 +100,6 @@ OnGiveTask:
 
     goto L_Close;
 
-OnTalkToJulia:
-    setq ShipQuests_Julia, 2;
-
-    mesn;
-    mesq l("Hey, you should go see Julia to be registered on the ship board.");
-    next;
-
-    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);
-
-    goto L_Close;
-
 OnTooWeak:
     mesn;
     mesq lg("I need help for clean the edge of the ship, but you aren't strong enough to help.");
@@ -311,24 +287,7 @@ L_Thanks:
 
 L_Close:
     set @q, 0;
-    set @q_julia, 0;
 
     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;
-
-    mesn;
-    mesq l("Hey, you should go see Julia to get registered on the ship.");
-    next;
-
-    mesn "Narrator";
-    mes col(l("Julia is on the upper level of the ship. Use the arrow keys to walk to the stairs or just click on the stairs with your mouse to walk to them."), 9);
-
-    close;
-
-}
\ No newline at end of file