summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2019-07-28 19:23:00 +0200
committerGitHub <noreply@github.com>2019-07-28 19:23:00 +0200
commit69fb0fe4a3dfda93fbe6a4dc742dad55cc1c1d77 (patch)
tree26cc8feff2f41279efd0737b69421a6fed3abe1f /npc
parent754f7fe5752d3f22bb2a23eb27cbd2f9244533a7 (diff)
parente9ece8734212235fb96d2b5dc5a3a5a101c10b3b (diff)
downloadhercules-69fb0fe4a3dfda93fbe6a4dc742dad55cc1c1d77.tar.gz
hercules-69fb0fe4a3dfda93fbe6a4dc742dad55cc1c1d77.tar.bz2
hercules-69fb0fe4a3dfda93fbe6a4dc742dad55cc1c1d77.tar.xz
hercules-69fb0fe4a3dfda93fbe6a4dc742dad55cc1c1d77.zip
Merge pull request #2503 from Emistry/wounded_morocc_cd
Fix Wounded Morocc Cooldown
Diffstat (limited to 'npc')
-rw-r--r--npc/quests/quests_morocc.txt21
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;
}