diff options
| -rw-r--r-- | npc/001-2/_import.txt | 1 | ||||
| -rw-r--r-- | npc/001-2/mapflags.txt | 1 | ||||
| -rw-r--r-- | npc/004-1/bgmaster.txt | 79 |
3 files changed, 25 insertions, 56 deletions
diff --git a/npc/001-2/_import.txt b/npc/001-2/_import.txt index 5a67af8a4..d7c488a5e 100644 --- a/npc/001-2/_import.txt +++ b/npc/001-2/_import.txt @@ -1,2 +1,3 @@ // Map 001-2: Coliseum // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2/mapflags.txt", diff --git a/npc/001-2/mapflags.txt b/npc/001-2/mapflags.txt new file mode 100644 index 000000000..b4b4f8d52 --- /dev/null +++ b/npc/001-2/mapflags.txt @@ -0,0 +1 @@ +001-2 mapflag battleground diff --git a/npc/004-1/bgmaster.txt b/npc/004-1/bgmaster.txt index ce25295f0..7df29e8c1 100644 --- a/npc/004-1/bgmaster.txt +++ b/npc/004-1/bgmaster.txt @@ -19,7 +19,6 @@ if (!getgmlevel()) goto L_Close; mes ""; menu - rif(!$@BattleOn, l("Init!")), L_Init, l("Join team 1."), L_T1, l("Join team 2."), L_T2; */ @@ -52,39 +51,7 @@ L_T2: L_SuccessJoin: mesq l("Done!"); next; - warp "testbg", 0, 0; - close; - -L_Init: - .@Froz = getwaitingroomstate(0,"Emissary#1"); - .@Hali = getwaitingroomstate(0,"Emissary#2"); - if (!.@Froz || !.@Hali) { - mapannounce("004-1", "The Fallen King Event was cancelled.", bc_map); - } - mesn; - next; - $@BattleOn=1; - donpcevent("Emissary#1::SendToBattle"); - donpcevent("Emissary#2::SendToBattle"); - //bg_warp $@FK_Team1, "testbg", 13, 4; - //bg_warp $@FK_Team2, "testbg", 13, 26; - mesn; - next; - mesq str( bg_get_data($@FK_Team1, 0) ); - mesq str( bg_get_data($@FK_Team2, 0) ); - next; - //setbgteam $@FK_Team1, 1; - //setbgteam $@FK_Team2, 2; - //mesn; - //next; - mapannounce("testbg", "May the fight begin!", bc_map); - mesn; - next; - $@FKing_T1 = bg_monster($@FK_Team1, "testbg", 1, 1, "FallenKing1", 1079, "Cassia::OnVictor2"); - $@FKing_T2 = bg_monster($@FK_Team2, "testbg", 13, 28, "FallenKing2", 1080, "Cassia::OnVictor1"); - mesn; - next; - initnpctimer(); + warp "001-2", 0, 0; close; L_Close: @@ -109,11 +76,11 @@ OnPcDeath: end; OnTimer60000: - if (getmapusers("testbg") < 2 || .BGC > 10) goto L_Cancel; + if (getmapusers("001-2") < 2 || .BGC > 10) goto L_Cancel; - mapannounce("testbg", "Reinforcements raise!", bc_map); - $@FKing_T1 = bg_monster($@FK_Team1, "testbg", 1, 1, "FallenGuard1", 1081, "Cassia::OnSkip"); - $@FKing_T2 = bg_monster($@FK_Team2, "testbg", 13, 28, "FallenGuard2", 1082, "Cassia::OnSkip"); + mapannounce("001-2", "Reinforcements raise!", bc_map); + $@FKing_T1 = bg_monster($@FK_Team1, "001-2", 125, 38, "FallenGuard1", 1081, "Cassia::OnSkip"); + $@FKing_T2 = bg_monster($@FK_Team2, "001-2",124, 213, "FallenGuard2", 1082, "Cassia::OnSkip"); .BGC+=1; stopnpctimer(); initnpctimer(); @@ -140,9 +107,9 @@ L_RestartTimer: L_Cancel: stopnpctimer(); announce "The Fallen Kings Duel ended in a draw!", bc_all; - killmonsterall "testbg"; + killmonsterall "001-2"; - mapwarp "testbg", "004-2", 29, 23; + mapwarp "001-2", "004-2", 29, 23; bg_destroy($@FK_Team1); bg_destroy($@FK_Team2); $@BGMaster1=2; @@ -151,10 +118,10 @@ L_Cancel: OnVictor1: if (!$@BGMaster1) goto L_Skip; stopnpctimer(); - announce "Team 1 raises victorious at the Fallen Kings Duel!", bc_all; // TODO: Give players Bronze, Silver and Gold Medals. - killmonsterall "testbg"; + announce "Team 1 raises victorious at the Fallen Kings Duel!", bc_all; // TODO: Give players a reward + killmonsterall "001-2"; - mapwarp "testbg", "004-2", 29, 23; + mapwarp "001-2", "004-2", 29, 23; bg_destroy($@FK_Team1); bg_destroy($@FK_Team2); $@BGMaster1=2; @@ -164,9 +131,9 @@ OnVictor2: if (!$@BGMaster1) goto L_Skip; stopnpctimer(); announce "Team 2 raises victorious at the Fallen Kings Duel!", bc_all; - killmonsterall "testbg"; + killmonsterall "001-2"; - mapwarp "testbg", "004-2", 29, 23; + mapwarp "001-2", "004-2", 29, 23; bg_destroy($@FK_Team1); bg_destroy($@FK_Team2); $@BGMaster1=2; @@ -193,9 +160,9 @@ OnInit: OnDoEvent: .BGC=0; - mapannounce("testbg", "May the fight begin!", bc_map); - $@FKing_T1 = bg_monster($@FK_Team1, "testbg", 1, 1, "FallenKing1", 1079, "Cassia::OnVictor2"); - $@FKing_T2 = bg_monster($@FK_Team2, "testbg", 13, 28, "FallenKing2", 1080, "Cassia::OnVictor1"); + mapannounce("001-2", "May the fight begin!", bc_map); + $@FKing_T1 = bg_monster($@FK_Team1, "001-2", 125, 38, "FallenKing1", 1079, "Cassia::OnVictor2"); + $@FKing_T2 = bg_monster($@FK_Team2, "001-2", 124, 213, "FallenKing2", 1080, "Cassia::OnVictor1"); initnpctimer(); end; } @@ -326,11 +293,11 @@ OnInit: end; OnEnterBG: - $@FK_Team1 = waitingroom2bg("testbg",13, 4,"start#bat_a02::OnGuillaumeQuit",""); + $@FK_Team1 = waitingroom2bg("001-2",126, 38,"start#bat_a02::OnSide1Quit",""); end; } -004-1,117,93,0 script Lt. Gerry NPC_ELF,{ +001-2,0,0,0 script Lt. Gerry NPC_ELF,{ hello; OnInit: @@ -346,12 +313,12 @@ OnInit: end; OnEnterBG: - $@FK_Team2 = waitingroom2bg("testbg",13,28,"start#bat_a02::OnCroixQuit",""); + $@FK_Team2 = waitingroom2bg("001-2",124,213,"start#bat_a02::OnSide2Quit",""); end; } //== Tierra Gorge Battleground Engine ====================== -testbg,15,15,3 script start#bat_a02 NPC_HIDDEN,{ +001-2,0,0,3 script start#bat_a02 NPC_HIDDEN,{ OnInit: //mapwarp "bat_a02","bat_room",154,150; end; @@ -359,8 +326,8 @@ OnInit: OnEnable: end; -OnGuillaumeQuit: -OnCroixQuit: +OnSide1Quit: +OnSide2Quit: bg_leave; end; @@ -379,8 +346,8 @@ OnReadyCheck: donpcevent "Lt. Randy::OnEnterBG"; donpcevent "Lt. Gerry::OnEnterBG"; donpcevent "Cassia::OnDoEvent"; - bg_warp $@FK_Team1,"testbg",13,4; - bg_warp $@FK_Team2,"testbg",13,28; + bg_warp $@FK_Team1,"001-2",126,38; + bg_warp $@FK_Team2,"001-2",125,213; //initnpctimer; end; } |