summaryrefslogtreecommitdiff
path: root/npc/commands
diff options
context:
space:
mode:
Diffstat (limited to 'npc/commands')
-rw-r--r--npc/commands/event.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 4e1fef6ee..1e11e51f4 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -260,6 +260,13 @@ OnCall:
else if (getmapname() == "boss" || getmapname() == "sec_pri" || getmapname() ~= "000-*" || getmapname() ~= "008-*" || getmapname() ~= "sore*")
dispbottom l("The Mana Plane is currently out of reach.");
else {
+ // Monster King events take precedence over Aeros Event
+ if ($@MK_SCENE == MK_SIEGE_TULIM) {
+ warp "003-1", 40, 49;
+ specialeffect(63, AREA, getcharid(3));
+ end;
+ }
+
.@gt=$@AEROS_SPWN;
if (.@gt == 2)
.@gt=rand(0,1);