diff options
Diffstat (limited to 'npc/001-13/main.txt')
| -rw-r--r-- | npc/001-13/main.txt | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/npc/001-13/main.txt b/npc/001-13/main.txt index fe52bfbd5..cdb295ddf 100644 --- a/npc/001-13/main.txt +++ b/npc/001-13/main.txt @@ -5,6 +5,7 @@ // Controls boss raid showdown (Freeyorp Event System - Boss Raid) function script FYRaid_Select { + .@abort = getarg(0, false); if ($EVENT$ != "Raid") return; sleep2(100); // Anti-flood protection: Hold execution for 100ms mes l("Current Boss: %s", $RAIDING_BOSS$); @@ -35,6 +36,8 @@ function script FYRaid_Select { } } } + if (.@abort) + return; next; setarray .@opt$, l("Cancel"), -1; freeloop(true); @@ -197,8 +200,16 @@ OnClose: deltimer("sBossRaid::OnPump"); deltimer("sBossRaid::OnTimeout"); sleep2(500); - teleporthome(); - end; + if (@aurora_map$ != "" && @aurora_x && @aurora_y) { + warp @aurora_map$, @aurora_x, @aurora_y; + @aurora_map$=""; + @aurora_x=0; + @aurora_y=0; + } else { + teleporthome(); + } + FYRaid_Select(true); // Formally close the raid session + close; } 001-13 mapflag zone MMO |