diff options
Diffstat (limited to 'npc/commands')
| -rw-r--r-- | npc/commands/event.txt | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt index e46ea5558..e3d9e3b21 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -252,38 +252,45 @@ OnEffect: // Calculate if (BaseLevel < 10) { dispbottom l("You are not strong enough to survive this trip."); + atcommand "@refresh"; end; } else if (readparam(Sp) < @toeventval2) { dispbottom l("You must not be using mana to do this trip."); + atcommand "@refresh"; end; } else if (readparam(Hp) < @toeventval1) { dispbottom l("You cannot be fighting to do this trip."); + atcommand "@refresh"; end; } else if (getmapname() ~= "001-*") { dispbottom l("You are already at the Mana Plane of Existence."); + atcommand "@refresh"; end; } else if (getmapname() == "boss" || getmapname() == "sec_pri" || getmapname() ~= "000-*" || getmapname() ~= "008-*" || getmapname() ~= "sore*") { dispbottom l("The Mana Plane is currently out of reach."); + atcommand "@refresh"; end; } else { - // Monster King events take precedence over Aeros Event - switch ($@MK_SCENE) { - case MK_SIEGE_TULIM: - warp "003-1", 40, 49; - specialeffect(63, AREA, getcharid(3)); - end; - case MK_SIEGE_HALIN: - warp "009-1", 27, 30; - specialeffect(63, AREA, getcharid(3)); - end; - case MK_SIEGE_HURNS: - warp "012-1", 87, 70; - specialeffect(63, AREA, getcharid(3)); - end; - case MK_SIEGE_NIVAL: - warp "020-1", 57, 62; - specialeffect(63, AREA, getcharid(3)); - end; + if ($@MK_SCENE == MK_SIEGE_TULIM || BaseLevel > 20) { + // Monster King events take precedence over Aeros Event + switch ($@MK_SCENE) { + case MK_SIEGE_TULIM: + warp "003-1", 40, 49; + specialeffect(63, AREA, getcharid(3)); + end; + case MK_SIEGE_HALIN: + warp "009-1", 27, 30; + specialeffect(63, AREA, getcharid(3)); + end; + case MK_SIEGE_HURNS: + warp "012-1", 87, 70; + specialeffect(63, AREA, getcharid(3)); + end; + case MK_SIEGE_NIVAL: + warp "020-1", 57, 62; + specialeffect(63, AREA, getcharid(3)); + end; + } } // Aeros Events takes precedence over player events @@ -336,6 +343,7 @@ OnEffect: // Block here if (!$@GM_EVENT && !$@MK_SCENE && $EVENT$ == "") { + atcommand "@refresh"; dispbottom l("The mana bridge is closed at the moment."); end; } @@ -343,6 +351,7 @@ OnEffect: // Seems like it was a Blame Saulc-like event... dispbottom l("Have a nice @@ day!", $EVENT$); dispbottom l("The mana bridge is closed at the moment."); + atcommand "@refresh"; end; OnInit: |