Skip to content
Permalink
Browse files

Wounded Morroc cooldown (#4207)

* Fixed an issue with a cooldown after killing Wounded Morroc
* Fixed #4205 

Thanks to @Tokeiburu !
  • Loading branch information...
Atemo committed Jun 11, 2019
1 parent a548f20 commit 34971e57fa6b52a6811c7f1dae83486c58486aed
Showing with 4 additions and 15 deletions.
  1. +4 −15 npc/quests/quests_morocc.txt
@@ -1893,6 +1893,7 @@ OnTimer25000:
end;

OnDisable:
stopnpctimer;
disablenpc "Satan Broadcast#edq";
end;
}
@@ -1919,19 +1920,10 @@ moc_fild21,178,239,0 script Group of Evil#edq 844,1,1,{
close;
}

OnInit:
enablenpc "Group of Evil#edq";
end;

OnEnable:
enablenpc "Group of Evil#edq";
set $@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 844,1,1,{
@@ -1974,8 +1966,6 @@ OnTimer1800000:
end;

OnTimer21600000:
stopnpctimer;
set $@re_moc,0;
donpcevent "Time-Space Gap#edq::OnDisable";
end;
}
@@ -2004,7 +1994,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;

@@ -2014,9 +2006,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";
set $@re_moc,0;
donpcevent "Satan Summon#edq::OnDisable";
end;
}

0 comments on commit 34971e5

Please sign in to comment.
You can’t perform that action at this time.