Test & Polish this new event kind. It will be heavy on the GM to note members.

1 files changed, 33 insertions, 27 deletions

diff --git a/npc/001-1/bgmaster.txt b/npc/001-1/bgmaster.txt
index b24996411..9a1813d6c 100644
--- a/npc/001-1/bgmaster.txt
+++ b/npc/001-1/bgmaster.txt
@@ -6,29 +6,14 @@
 
 001-1,96,37,0	script	Cassia	NPC_FEMALE,{
     mesn;
-    /*
-    //if ($@BattleOn) goto L_Busy;
-    mesq l("Hello! I am @@, currently in charge of the Desert Pass.", .name$);
-    next;
-    atcommand("@time");
-    mesq l("The Fallen Kings challenge ownership of this pass at ##B08:00##b, ##B16:00##b and ##B00:00##b.");
-    next;
-    mesq l("Right click on one of their representatives, and choose to join a \'Chat\' when it is close of the time!");
-    next;
-    mesq l("Just as a warning, main chat will change. Use it to discuss the strategy!");
-    if (!getgmlevel()) goto L_Close;
-    mes "";
-    menu
-        l("Join team 1."), L_T1,
-        l("Join team 2."), L_T2;
-    */
-    if ($@BGMaster1) goto L_Busy;
+
     if (getgmlevel()) goto L_Control;
+    if ($@BGMaster1) goto L_Busy;
 
 L_Intro:
-    mesq l("Hello! I am Cassia, Ambassator. During the Monster War outbreak, Frostia and Halinarzo felt.");
+    mesq l("Hello! I am Cassia, Ambassator. During the Monster War outbreak, Halinarzo felt.");
     next;
-    mesq l("To train their soldiers, they frequently face one against other in duels. Adventurers are welcome to join their drills.");
+    mesq l("To train their soldiers, they frequently face Frostia in duels. Adventurers are welcome to join their drills.");
     next;
     mesq l("To join a drill, right click on one of the lieutenants and join their Battle Stations. The drill can last up to 10 minutes.");
     next;
@@ -51,13 +36,22 @@ L_Busy:
 L_Control:
     menu
         l("Introduce"), L_Intro,
-        l("Enable BG"), L_On,
+        rif($@BGMaster1 != 1 && getgmlevel() >= 99,l("Enable BG")), L_On,
         l("Disable BG"), L_Off;
 
 L_On:
+    mes "";
+    mes l("Determine Team Size +1 (so 1 each side, use 2)");
+    input $@BG1_SIZE;
+    if ($@BG1_SIZE < 2) close;
+
+	donpcevent "Lt. Randy::OnSet";
+	donpcevent "Lt. Gerry::OnSet";
+
+    if ($@BGMaster1 == 2) $@BGMaster1=0;
     enablenpc "Lt. Randy";
     enablenpc "Lt. Gerry";
-    mapannounce "001-1", "Frostia and Halinarzo are now on a spar!", bc_map;
+    mapannounce "001-1", l("Frostia and Halinarzo are now on a spar!"), bc_map;
     mes "Event enabled.";
     close;
 
@@ -81,8 +75,10 @@ OnTimer60000:
     if (getmapusers("001-2") < 2 || .BGC > 10) goto L_Cancel;
 
 	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");
+	$@FKing_T1 = bg_monster($@FK_Team1, "001-2", 125, 38, "Frostia Guard", 1081, "Cassia::OnSkip");
+	bg_monster($@FK_Team1, "001-2", 126, 38, "Frostia Guard", 1081, "Cassia::OnSkip");
+	$@FKing_T2 = bg_monster($@FK_Team2, "001-2",124, 213, "Halinarzo Guard", 1082, "Cassia::OnSkip");
+    bg_monster($@FK_Team2, "001-2",125, 213, "Halinarzo Guard", 1082, "Cassia::OnSkip");
     .BGC+=1;
 	stopnpctimer();
 	initnpctimer();
@@ -163,8 +159,10 @@ OnInit:
 OnDoEvent:
     .BGC=0;
 	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");
+	$@FKing_T1 = bg_monster($@FK_Team1, "001-2", 125, 38, "Frostia King", 1079, "Cassia::OnVictor2");
+	$@FKing_T2 = bg_monster($@FK_Team2, "001-2", 124, 213, "Halinarzo King", 1080, "Cassia::OnVictor1");
+	bg_monster($@FK_Team1, "001-2", 124, 38, "Frostia Guard", 1081, "Cassia::OnSkip");
+    bg_monster($@FK_Team2, "001-2",123, 213, "Halinarzo Guard", 1082, "Cassia::OnSkip");
 	initnpctimer();
     end;
 }
@@ -230,6 +228,10 @@ OnDoEvent:
 001-1,94,36,0	script	Lt. Randy	NPC_ELF,{
     hello;
 
+OnSet:
+	waitingroom("Battle Station", $@BG1_SIZE, "start#bat_a02::OnReadyCheck", $@BG1_SIZE-1);
+    end;
+
 OnInit:
     .@npcId = getnpcid(0, .name$);
     setunitdata(.@npcId, UDT_HEADTOP, 1312); // Light armor
@@ -239,7 +241,7 @@ OnInit:
     setunitdata(.@npcId, UDT_HAIRSTYLE, 13);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
 
-	waitingroom("Battle Station", 2, "start#bat_a02::OnReadyCheck", 1);
+	//waitingroom("Battle Station", 2, "start#bat_a02::OnReadyCheck", 1);
 
     disablenpc("Lt. Randy");
 	end;
@@ -252,6 +254,10 @@ OnEnterBG:
 001-1,98,36,0	script	Lt. Gerry	NPC_ELF,{
     hello;
 
+OnSet:
+	waitingroom("Battle Station", $@BG1_SIZE, "start#bat_a02::OnReadyCheck", $@BG1_SIZE-1);
+    end;
+
 OnInit:
     .@npcId = getnpcid(0, .name$);
     setunitdata(.@npcId, UDT_HEADTOP, 1311); // Terranite armor
@@ -261,7 +267,7 @@ OnInit:
     setunitdata(.@npcId, UDT_HAIRSTYLE, 13);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
 
-	waitingroom("Battle Station", 2, "start#bat_a02::OnReadyCheck", 1);
+	//waitingroom("Battle Station", 2, "start#bat_a02::OnReadyCheck", 1);
 
     disablenpc("Lt. Gerry");
 	end;