diff options
author | Jesusaves <cpntb1@ymail.com> | 2019-02-10 01:56:37 -0200 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2019-02-10 01:56:37 -0200 |
commit | f1656170420751dd93bbc12601d239b3c0f6a000 (patch) | |
tree | a54deaa07fc2aa0bb9efa1bd060ff6038fb2f1ad /npc | |
parent | 317872bbb29326bc96ca4fb1db8cb91dd498c0e5 (diff) | |
download | serverdata-f1656170420751dd93bbc12601d239b3c0f6a000.tar.gz serverdata-f1656170420751dd93bbc12601d239b3c0f6a000.tar.bz2 serverdata-f1656170420751dd93bbc12601d239b3c0f6a000.tar.xz serverdata-f1656170420751dd93bbc12601d239b3c0f6a000.zip |
Handle $@GM_OVERRIDE
Diffstat (limited to 'npc')
-rw-r--r-- | npc/005-1-1/main.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/npc/005-1-1/main.txt b/npc/005-1-1/main.txt index 99b17a51f..3852d5af4 100644 --- a/npc/005-1-1/main.txt +++ b/npc/005-1-1/main.txt @@ -36,6 +36,12 @@ OnStart: //initnpctimer; + if ($@GM_OVERRIDE) { + addtimer(400, "Nylo#Marggo::OnTimer55000"); + addtimer(5000, "Nylo#Marggo::OnTimer60000"); + addtimer(5300, "Nylo#Marggo::OnBegin"); + end; + } addtimer(10000, "Nylo#Marggo::OnTimer10000"); addtimer(20000, "Nylo#Marggo::OnTimer20000"); addtimer(30000, "Nylo#Marggo::OnTimer30000"); @@ -176,7 +182,7 @@ OnMurder: htidelete(.@hti); if (@TOTAL_MRG >= 8) { debugmes("Current MARGGO Size: %d", htsize(@MARGGO)); - if (htsize(@MARGGO) == 0) + if (htsize(@MARGGO) <= 1) doevent("Nylo#Marggo::OnFinish"); } end; |