diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/001-1/bgmaster.txt | 10 | ||||
| -rw-r--r-- | npc/012-1/guards.txt | 51 |
2 files changed, 51 insertions, 10 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: diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt index b1bb17ee0..17fb36624 100644 --- a/npc/012-1/guards.txt +++ b/npc/012-1/guards.txt @@ -162,6 +162,17 @@ L_Assign: } close; + + + + + + + + + + + // Liberation Day facility L_Admus: mes ".:: " + col("HURNSCALD LIBERATION DAY - ADMUS PANEL", 2) + " ::."; @@ -169,7 +180,7 @@ L_Admus: mesc l("Protip: Use @hide to don't interfer."); mes l("Determine Team Size (If everyone is ready and stdby at Tulimshar, use: @@. Minimum 2 players.)", getusers(1)-1); input $@BG1_SIZE; - if ($@BG1_SIZE < 2) close; + if ($@BG1_SIZE < 2 && !$@GM_OVERRIDE) close; $@BG1_SIZE=$@BG1_SIZE+1; kickwaitingroomall("Hurnsguard"); @@ -203,7 +214,7 @@ L_Admus: disablenpc "Locamit"; disablenpc "Richard"; disablenpc "Soul Menhir#hurns"; - disablenpc "HurnsShip"; + disablenpc "HurnsShip#M"; disablenpc "Hinnak"; disablenpc "Tezzerin"; disablenpc "Luffyx"; @@ -256,6 +267,19 @@ OnInit: } + + + + + + + + + + + + + // Liberation Day Script 012-1,122,25,0 script Hurnsguard NPC_PLAYER,{ query_sql("SELECT online FROM `char` WHERE name='Saulc GM'", .@online); @@ -332,9 +356,9 @@ OnSkip: end; OnTimer300000: - .@Pl=getmapusers("012-1")+mobcount("012-1", "Cassia:OnSkip")-1; + .@Pl=getmapusers("012-1")+mobcount("012-1", "Cassia::OnSkip")-1; .@Pla=getmapusers("012-1"); - .@Mb=mobcount("012-1", "Hurnsguard:OnSkip")+mobcount("012-1", "Hurnsguard::OnXtreem")+2; // Saulc GM is an enemy for server code + .@Mb=mobcount("012-1", "Hurnsguard::OnSkip")+mobcount("012-1", "Hurnsguard::OnXtreem")+2; // Saulc GM is an enemy for server code for (.@i = 0; .@i < .@Pla; .@i++) bg_monster($@FK_Team1, "012-1", rand(131, 136), rand(64, 80), "Friendly Guard", FallenGuard1, "Cassia::OnSkip"); @@ -354,7 +378,7 @@ OnTimer300000: if ((.@Mb / .@Pl) > 3) { bg_monster($@FK_Team1, "012-1", rand(131, 136), rand(64, 80), "Additional Guard", FallenGuard2, "Cassia::OnSkip"); } - .@Pl=getmapusers("012-1")+mobcount("012-1", "Cassia:OnSkip")-1; + .@Pl=getmapusers("012-1")+mobcount("012-1", "Cassia::OnSkip")-1; .@Pla=getmapusers("012-1")-1; mapannounce("012-1", "Survivors: "+.@Pla+" Hurnscald Alliance: "+.@Pl+" Monsters: "+.@Mb, bc_map); @@ -450,7 +474,7 @@ OnVictory: enablenpc "Locamit"; enablenpc "Richard"; enablenpc "Soul Menhir#hurns"; - enablenpc "HurnsShip"; + enablenpc "HurnsShip#M"; enablenpc "Hinnak"; enablenpc "Tezzerin"; enablenpc "Luffyx"; @@ -482,6 +506,17 @@ OnReward: } + + + + + + + + + + + //== Battleground Engine ====================== 012-1,0,0,0 script start#hurns_lib NPC_HIDDEN,{ OnInit: @@ -498,14 +533,14 @@ OnPlayer2Death: // Check if we are done for. warp "000-1", 22, 22; .@Pl=getmapusers("012-1"); - if (.@Pl <= 1) { + if (.@Pl <= 1 && !$@GM_OVERRIDE) { announce "##1Hurnscald is lost!", bc_all | bc_npc; disablenpc "Hurnsguard"; pvpoff("012-1"); removemapmask "012-1", 10; removemapflag("012-1", mf_nocommand); removemapflag("012-1", mf_battleground); - killmonster("012-1", "All"); + killmonster("012-1", "all"); bg_destroy(1); bg_destroy(2); } |