diff options
| author | Reid Yaro <reidyaro@gmail.com> | 2013-02-22 00:28:19 +0000 |
|---|---|---|
| committer | Reid Yaro <reidyaro@gmail.com> | 2013-02-22 00:29:15 +0000 |
| commit | cbad674c70dc6c658be6d4f4962b3ade46cbaf50 (patch) | |
| tree | ef863520e3035fd98b877d5cf51e1fadbf2cfb85 /npc/000-2-1/peter.txt | |
| parent | 8e4ac8c3995180042d20635aec2eca87899b9057 (diff) | |
| download | serverdata-cbad674c70dc6c658be6d4f4962b3ade46cbaf50.tar.gz serverdata-cbad674c70dc6c658be6d4f4962b3ade46cbaf50.tar.bz2 serverdata-cbad674c70dc6c658be6d4f4962b3ade46cbaf50.tar.xz serverdata-cbad674c70dc6c658be6d4f4962b3ade46cbaf50.zip | |
Continue to fix Peter script. (Not yet 100% fixed...)
Diffstat (limited to 'npc/000-2-1/peter.txt')
| -rw-r--r-- | npc/000-2-1/peter.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt index b1675d19..7086d5ef 100644 --- a/npc/000-2-1/peter.txt +++ b/npc/000-2-1/peter.txt @@ -42,9 +42,12 @@ OnTouch: if (BaseLevel < 5) goto l_Stop; + if ($@RAT_SAILOR_COUNTDOWN$ == "") goto l_NoCountDown; if ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN$) < 600) goto l_NoGoodTick; - if ($@RAT_SAILOR_OLD_HELPER$ == strcharinfo(0) || (gettimetick(2) - $@RAT_SAILOR_COUNTDOWN$) < 1000) goto l_ThousandTick; + if (($@RAT_SAILOR_OLD_HELPER$ == strcharinfo(0)) && ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN$) < 1000)) goto l_NoGoodTick; set $@RAT_SAILOR_COUNTDOWN$, ""; + +l_NoCountDown: if ($@RAT_SAILOR_HELPER$ != "") goto l_Occupied; set @peter, getq(ShipQuests_Peter); if (@peter < 1 || @peter > 5) goto l_Task; @@ -87,10 +90,12 @@ l_NoGoodTick: 000-2-1.gat,70,35,0,1 script Peter 303;3,{ if (BaseLevel < 5) goto OnTooWeak; + if ($@RAT_SAILOR_COUNTDOWN$ == "") goto l_NoCountDown; if ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN$) < 600) goto OnNoGoodTick; - if ($@RAT_SAILOR_OLD_HELPER$ == strcharinfo(0) || (gettimetick(2) - $@RAT_SAILOR_COUNTDOWN$) < 1000) goto OnNoGoodTick; + if (($@RAT_SAILOR_OLD_HELPER$ == strcharinfo(0)) && ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN$) < 1000)) goto OnNoGoodTick; set $@RAT_SAILOR_COUNTDOWN$, ""; +l_NoCountDown: set @peter, getq(ShipQuests_Peter); if (@peter == 1 || @peter == 2) goto OnReturnFail; if (@peter == 3 || @peter == 4 || @peter == 5) goto OnReturnWin; |