Put back the door that warps you inside the basement for ratto quest.

1 files changed, 51 insertions, 9 deletions

diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 3d9c0898..a03584fa 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -32,16 +32,50 @@
 // [8] = Shows how many seconds passed since Ratto number 4 died
 // [9] = Shows how many seconds passed since the player started the quest
 
+000-2-1.gat,61,34,0,1	script	AreaNPC	0,0,1,{
+
+OnTouch:
+    if (BaseLevel < 5) goto L_Stop;
+    if ($@RAT_SAILOR_HELPER$ != "") goto L_Occupied;
+    set @q, geta4(ShipQuests, ShipQuests_Peter);
+    if (@q < 1) goto L_Task;
+    if (@q == 1 || @q == 2) goto L_Rfail;
+    if (@q == 3 || @q == 4) goto L_Rwin;
+    doevent "Peter::OnStartOutside";
+    close;
+
+L_Stop:
+    doevent "Peter::OnStop";
+    close;
+
+L_Occupied:
+    doevent "Peter::OnDontneedHelp";
+    close;
+
+L_Task:
+    doevent "Peter::OnGiveTask";
+    close;
+
+L_Rfail:
+    doevent "Peter::OnReturnFail";
+    close;
+
+L_Rwin:
+    doevent "Peter::OnReturnWin";
+    close;
+}
+
 000-2-1.gat,60,35,0,1	script	Peter	303,{
 
     set @q_julia, geta2(ShipQuests, ShipQuests_Julia);
     if (@q_julia == 0) goto L_TalkToJulia;
-    if (BaseLevel < 5) goto L_TooWeak;
+    if (BaseLevel < 5) goto OnTooWeak;
 
     set @q, geta4(ShipQuests, ShipQuests_Peter);
-    if (@q == 1 || @q == 2) goto L_ReturnFail;
-    if (@q >= 3) goto L_ReturnWin;
+    if (@q == 1 || @q == 2) goto OnReturnFail;
+    if (@q >= 3) goto OnReturnWin;
 
+OnGiveTask:
     mesn;
     mesq g(l("Hey, girl!"),
         l("Hey, man!"));
@@ -60,12 +94,18 @@ L_TalkToJulia:
     mesq l("Hey, you should go see Julia to be registered on the ship board.");
     goto L_Close;
 
-L_TooWeak:
+OnTooWeak:
     mesn;
     mesq lg("I need help for cleaning the wedge of the ship, but you aren't strong enough to help me.");
     goto L_Close;
 
-L_ReturnFail:
+OnStop:
+    mesn;
+    mesq l("You can't go there!");
+    warp "000-2-1",61,36;
+    close;
+
+OnReturnFail:
     mesn;
     mesq l("I see it is not easy to get rid of those rattos. Do you want to try again?");
     menu
@@ -75,7 +115,7 @@ L_ReturnFail:
     mesq l("Ok, ok. Come back if you change your mind.");
     goto L_Close;
 
-L_ReturnWin:
+OnReturnWin:
     mesn;
     mesq l("Thanks again for helping me. But those rattos are a permanent problem and your help is always welcome. The only problem is that I can give you a reward only one time.");
     if (@q == 3 || @q == 4)
@@ -98,19 +138,21 @@ L_BonusTask:
     menu
     lg("Okay, I'm ready to work!"), -,
     l("What? This reward is too small!"), L_Close;
-    if ($@RAT_SAILOR_HELPER$ != "") goto L_DontNeedHelp;
+    if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
     if (@q == 0) seta4 ShipQuests, ShipQuests_Peter, 2;
     if (@q == 3) seta4 ShipQuests, ShipQuests_Peter, 4;
     goto L_Start;
 
 L_Task:
-    if ($@RAT_SAILOR_HELPER$ != "") goto L_DontNeedHelp;
+    if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
     if (@q == 0) seta4 ShipQuests, ShipQuests_Peter, 1;
     goto L_Start;
 
 L_Start:
     mesn;
     mesq l("Okay, you can start!");
+
+OnStartOutside:
     set $@RAT_SAILOR_HELPER$, strcharinfo(0);
     set $@RAT_SAILOR_DEATHS, PC_DIE_COUNTER;
     initnpctimer;
@@ -140,7 +182,7 @@ L_CheckRattos:
     setnpctimer 0;
     end;
 
-L_DontNeedHelp:
+OnDontneedHelp:
     mesn;
     mesq l("I don't need your help right now, come back later.");
     mesq l("@@ is helping me.", $@RAT_SAILOR_HELPER$);