summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/003-3/malindou.txt2
-rw-r--r--npc/006-1/crazyfefe.txt1
-rw-r--r--npc/commands/kami.txt6
3 files changed, 6 insertions, 3 deletions
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index fe0e92edd..e14306b45 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -303,7 +303,7 @@ OnInit:
debugmes "* Main Storyline system updated";
debugmes "* Arkim updated";
debugmes "";
- donpcevent "@mkdbg::OnMsg1to2";
+ $@GM_DEBUGMK20190426=1;
}
diff --git a/npc/006-1/crazyfefe.txt b/npc/006-1/crazyfefe.txt
index a26cbe5a0..f948dbf4c 100644
--- a/npc/006-1/crazyfefe.txt
+++ b/npc/006-1/crazyfefe.txt
@@ -284,6 +284,7 @@ function CleanUp {
$@FEFE_CAVE_LEVEL = 0;
$@FEFE_WAVE = 0;
$@FEFE_CAVE_HERO$ = "";
+ $@FEFE_DELAY=gettimetick(2)+180;
.wtime=0;
killmonster "006-1", "Crazyfefe::OnPetDeath";
stopnpctimer;
diff --git a/npc/commands/kami.txt b/npc/commands/kami.txt
index 23120ba5c..b4f23dd6b 100644
--- a/npc/commands/kami.txt
+++ b/npc/commands/kami.txt
@@ -54,8 +54,10 @@ function script kamibroadcast {
// Required for GM use in 2019-04-27
- script @mkdbg 32767,{
end;
-OnMsg1to2:
- sleep(3600000);
+
+OnClock1415:
+ if (!$@GM_DEBUGMK20190426)
+ end;
// Game Story Change: Idle MK -> Active MK
kamibroadcast("I can't handle it anymore! NO MORE!", "Monster King");
sleep(2500);