diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/quests/quests_amatsu.txt | 33 | ||||
| -rw-r--r-- | npc/quests/quests_moscovia.txt | 7 |
2 files changed, 10 insertions, 30 deletions
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt index 3c55f91a3..504ab6032 100644 --- a/npc/quests/quests_amatsu.txt +++ b/npc/quests/quests_amatsu.txt @@ -399,11 +399,14 @@ OnStartArena: enablenpc "Grandma#ama1"; enablenpc "Grandpa#ama"; warpwaitingpc "ama_test",50,83; - donpcevent "Timer#ama::OnEnable"; + enablenpc("Timer#ama"); + initnpctimer("Timer#ama"); disablewaitingroomevent "Assistant#ama"; end; OnReset: + stopnpctimer("Timer#ama"); + disablenpc("Timer#ama"); enablewaitingroomevent "Assistant#ama"; end; } @@ -620,7 +623,6 @@ ama_test,50,100,3 script Coach#ama 4_M_JPN2,15,15,{ mes "Don't lose your high self-esteem"; mes "in the future. Farewell."; close2; - donpcevent "Timer#ama::OnDisable"; warp "amatsu",223,230; disablenpc "Coach#ama"; donpcevent "Assistant#ama::OnReset"; @@ -665,7 +667,6 @@ ama_test,50,100,3 script Coach#ama 4_M_JPN2,15,15,{ setquest 8128; warp "amatsu",223,230; disablenpc "Coach#ama"; - donpcevent "Timer#ama::OnDisable"; donpcevent "Assistant#ama::OnReset"; end; } @@ -754,7 +755,6 @@ OnTouch: changequest 8129,8130; warp "amatsu",223,230; disablenpc "Coach#after"; - donpcevent "Timer#ama::OnDisable"; donpcevent "Assistant#ama::OnReset"; end; } @@ -764,14 +764,6 @@ OnInit: disablenpc "Timer#ama"; end; -OnEnable: - enablenpc "Timer#ama"; - initnpctimer; - end; -OnDisable: - stopnpctimer; - end; - OnTimer1000: mapannounce "ama_test"," The Timer has been activated. You have 6 minutes. Annihilate the monsters in time! ",bc_map; end; @@ -788,26 +780,11 @@ OnTimer361000: end; OnTimer361500: - enablenpc "backwarp#ama"; - end; - -OnTimer362000: - disablenpc "backwarp#ama"; + areawarp("ama_test", 25, 75, 80, 130, "amatsu", 115, 95); end; OnTimer362500: donpcevent "Assistant#ama::OnReset"; - donpcevent "Timer#ama::OnDisable"; - end; -} - -ama_test,50,100,0 script backwarp#ama FAKE_NPC,25,25,{ -OnInit: - disablenpc "backwarp#ama"; - end; - -OnTouch: - warp "amatsu",115,95; end; } diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index 3f44a9b0a..e0678cec9 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -1134,7 +1134,7 @@ mosk_ship,101,111,4 script rudder#ship HIDDEN_NPC,{ mes "Hey! Listen to what I am saying."; mes "How come you go there without my"; mes "permission..."; - next; + close; } mes "[Mr. Ibanoff]"; mes "What? How did you get on"; @@ -1171,7 +1171,10 @@ S_Rud1: mes "ever encountered! Be careful! We"; mes "must repulse these monsters!"; ++$@mos1_edq; - donpcevent "Baehideun3#ship::OnEnable"; + if (mos_whale_edq >= 241) + donpcevent "Baehideun4#ship::OnEnable"; + else + donpcevent "Baehideun3#ship::OnEnable"; } mos_whale_edq = (getarg(1) == 2)?((mos_whale_edq >= 241)?((.@r != 3)?26:25):((.@r != 3)?10:11)):mos_whale_edq + 1; close; |