From f1656170420751dd93bbc12601d239b3c0f6a000 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 10 Feb 2019 01:56:37 -0200
Subject: Handle $@GM_OVERRIDE

---
 npc/005-1-1/main.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'npc/005-1-1')

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;
-- 
cgit v1.2.3-60-g2f50