diff options
| -rw-r--r-- | npc/quests/quests_morocc.txt | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 890c17356..2700244d5 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -1887,6 +1887,7 @@ OnTimer25000: end; OnDisable: + stopnpctimer; disablenpc "Satan Broadcast#edq"; end; } @@ -1912,20 +1913,11 @@ moc_fild21,178,239,0 script Group of Evil#edq CLEAR_NPC,1,1,{ mes "You can feel the power of the darkness rise from the gap where light and darkness are mingled."; close; } - -OnInit: - enablenpc "Group of Evil#edq"; - end; - + OnEnable: enablenpc "Group of Evil#edq"; $@re_moc_time$ = ""; end; - -OnDisable: - disablenpc "Group of Evil#edq"; - donpcevent "Time-Space Gap#edq::OnEnable"; - end; } moc_fild21,177,239,0 script Time-Space Gap#edq CLEAR_NPC,1,1,{ @@ -1968,8 +1960,6 @@ OnTimer1800000: end; OnTimer21600000: - stopnpctimer; - $@re_moc = 0; donpcevent "Time-Space Gap#edq::OnDisable"; end; } @@ -1998,7 +1988,9 @@ OnMyMobDead: mapannounce "moc_fild21","I'll let live just a little longer. You'll never find me through this time-space gap!",bc_map,"0xFFFF00"; donpcevent "Time-Space Gap#edq::OnEnable"; donpcevent "Satan Broadcast#edq::OnDisable"; - donpcevent "Group of Evil#edq::OnDisable"; + disablenpc "Group of Evil#edq"; + stopnpctimer; + killmonster "moc_fild21","Satan Summon#edq::OnMyMobDead"; disablenpc "Satan Summon#edq"; end; @@ -2008,9 +2000,6 @@ OnTimer5400000: OnTimer5415000: mapannounce "moc_fild21","I don't have time for this! Go away!",bc_map,"0xFFFF00"; - stopnpctimer; - killmonster "moc_fild21","Satan Summon#edq::OnMyMobDead"; - $@re_moc = 0; donpcevent "Satan Summon#edq::OnDisable"; end; } |