summaryrefslogtreecommitdiff
path: root/npc/000-2-1
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-12-25 17:19:48 +0100
committerReid <reidyaro@gmail.com>2012-12-25 17:24:04 +0100
commit9cfd51f23bf4eda05517989f1e0a377a964fe956 (patch)
tree67b5afb2fb7c5760aa6f01d0603d3d93b33baff0 /npc/000-2-1
parent7f7871901dd157a0a20b1aff37259cce0b7dc784 (diff)
downloadserverdata-9cfd51f23bf4eda05517989f1e0a377a964fe956.tar.gz
serverdata-9cfd51f23bf4eda05517989f1e0a377a964fe956.tar.bz2
serverdata-9cfd51f23bf4eda05517989f1e0a377a964fe956.tar.xz
serverdata-9cfd51f23bf4eda05517989f1e0a377a964fe956.zip
Correct some issue on peter script.
Reported by: o11c.
Diffstat (limited to 'npc/000-2-1')
-rw-r--r--npc/000-2-1/peter.txt24
1 files changed, 18 insertions, 6 deletions
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 039591b6..48b7392e 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -190,9 +190,10 @@ OnStartOutside:
goto l_Quit;
-OnTimer5000:
+OnTimer2000:
if (attachrid(getcharid(3,$@RAT_SAILOR_HELPER$)) == 0) goto l_Logoff;
- set $@RAT_SAILOR_CONTROL[9], $@RAT_SAILOR_CONTROL[9] + 5;
+ set $@RAT_SAILOR_CONTROL[9], $@RAT_SAILOR_CONTROL[9] + 2;
+ if ($@RAT_SAILOR_CONTROL[9] > 115) goto l_Timeout;
if ($@RAT_SAILOR_CONTROL[9] > 100) goto l_Timeout;
if (PC_DIE_COUNTER > $@RAT_SAILOR_DEATHS) goto l_Dead;
if ($@RAT_SAILOR_CONTROL[1] && $@RAT_SAILOR_CONTROL[2] && $@RAT_SAILOR_CONTROL[3] && $@RAT_SAILOR_CONTROL[4]) goto l_Done;
@@ -202,10 +203,10 @@ OnTimer5000:
end;
l_CheckRattos:
- if ($@RAT_SAILOR_CONTROL[1]) set $@RAT_SAILOR_CONTROL[5], $@RAT_SAILOR_CONTROL[5] + 5;
- if ($@RAT_SAILOR_CONTROL[2]) set $@RAT_SAILOR_CONTROL[6], $@RAT_SAILOR_CONTROL[6] + 5;
- if ($@RAT_SAILOR_CONTROL[3]) set $@RAT_SAILOR_CONTROL[7], $@RAT_SAILOR_CONTROL[7] + 5;
- if ($@RAT_SAILOR_CONTROL[4]) set $@RAT_SAILOR_CONTROL[8], $@RAT_SAILOR_CONTROL[8] + 5;
+ if ($@RAT_SAILOR_CONTROL[1]) set $@RAT_SAILOR_CONTROL[5], $@RAT_SAILOR_CONTROL[5] + 2;
+ if ($@RAT_SAILOR_CONTROL[2]) set $@RAT_SAILOR_CONTROL[6], $@RAT_SAILOR_CONTROL[6] + 2;
+ if ($@RAT_SAILOR_CONTROL[3]) set $@RAT_SAILOR_CONTROL[7], $@RAT_SAILOR_CONTROL[7] + 2;
+ if ($@RAT_SAILOR_CONTROL[4]) set $@RAT_SAILOR_CONTROL[8], $@RAT_SAILOR_CONTROL[8] + 2;
if ($@RAT_SAILOR_CONTROL[5] > 40) doevent "RattosControl::OnRatto1Respawn";
if ($@RAT_SAILOR_CONTROL[6] > 40) doevent "RattosControl::OnRatto2Respawn";
if ($@RAT_SAILOR_CONTROL[7] > 40) doevent "RattosControl::OnRatto3Respawn";
@@ -239,6 +240,17 @@ l_Dead:
goto l_CleaningEnd;
l_Done:
+ mesn "Peter";
+ mesq l("Are you done in there?");
+
+ menu
+ l("Yes, everything is ok."), l_WarpOut,
+ l("Soon, soon."), -;
+
+ initnpctimer;
+ end;
+
+l_WarpOut:
warp "000-2-1", 72, 36;
set @q, getq(ShipQuests_Peter);
if (@q == 2 || @q == 4) goto l_Reward;