summaryrefslogtreecommitdiff
path: root/npc/001-1
diff options
context:
space:
mode:
Diffstat (limited to 'npc/001-1')
-rw-r--r--npc/001-1/bgmaster.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/npc/001-1/bgmaster.txt b/npc/001-1/bgmaster.txt
index 78a986de5..2fe4f8b04 100644
--- a/npc/001-1/bgmaster.txt
+++ b/npc/001-1/bgmaster.txt
@@ -47,6 +47,8 @@ L_On:
donpcevent "Lt. Randy::OnSet";
donpcevent "Lt. Gerry::OnSet";
+ kickwaitingroomall("Lt. Randy");
+ kickwaitingroomall("Lt. Gerry");
if ($@BGMaster1 == 2) $@BGMaster1=0;
enablenpc "Lt. Randy";
@@ -105,6 +107,8 @@ L_RestartTimer:
end;
L_Cancel:
+ if ($@GM_OVERRIDE)
+ end;
stopnpctimer();
announce "The Fallen Kings Duel ended in a draw!", bc_all;
killmonsterall "001-2";
@@ -235,9 +239,10 @@ OnDoEvent:
001-1,94,36,0 script Lt. Randy NPC_ELF,{
hello;
+ end;
OnSet:
- waitingroom("Battle Station", $@BG1_SIZE, "start#bat_a02::OnReadyCheck", $@BG1_SIZE-1);
+ waitingroom("Battle Station R", $@BG1_SIZE, "start#bat_a02::OnReadyCheck", $@BG1_SIZE-1);
end;
OnInit:
@@ -261,9 +266,10 @@ OnEnterBG:
001-1,98,36,0 script Lt. Gerry NPC_ELF,{
hello;
+ end;
OnSet:
- waitingroom("Battle Station", $@BG1_SIZE, "start#bat_a02::OnReadyCheck", $@BG1_SIZE-1);
+ waitingroom("Battle Station G", $@BG1_SIZE, "start#bat_a02::OnReadyCheck", $@BG1_SIZE-1);
end;
OnInit: