Move Cassia and lieutenants to GM island, Aeros

3 files changed, 34 insertions, 80 deletions

diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index 87e80b62a..0c9567cfa 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -1,5 +1,6 @@
 // Map 001-1: Floating Island of Aeros
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-1/bgmaster.txt",
 "npc/001-1/mapflags.txt",
 "npc/001-1/portal.txt",
 "npc/001-1/rewards.txt",
diff --git a/npc/004-1/bgmaster.txt b/npc/001-1/bgmaster.txt
index 7df29e8c1..b24996411 100644
--- a/npc/004-1/bgmaster.txt
+++ b/npc/001-1/bgmaster.txt
@@ -4,7 +4,7 @@
 
 // Original File
 
-004-1,119,96,0	script	Cassia	NPC_FEMALE,{
+001-1,96,37,0	script	Cassia	NPC_FEMALE,{
     mesn;
     /*
     //if ($@BattleOn) goto L_Busy;
@@ -23,6 +23,9 @@
         l("Join team 2."), L_T2;
     */
     if ($@BGMaster1) goto L_Busy;
+    if (getgmlevel()) goto L_Control;
+
+L_Intro:
     mesq l("Hello! I am Cassia, Ambassator. During the Monster War outbreak, Frostia and Halinarzo felt.");
     next;
     mesq l("To train their soldiers, they frequently face one against other in duels. Adventurers are welcome to join their drills.");
@@ -34,37 +37,36 @@
     mesq l("Be sure to have a friend before joining, or you may have to logout in order to be able to move again!");
     close;
 
-L_T1:
-    mesn;
-    if (bg_join_team($@FK_Team1))
-        goto L_SuccessJoin;
-    mes "An error happened.";
-    goto L_Close;
-
-L_T2:
-    mesn;
-    if (bg_join_team($@FK_Team1))
-        goto L_SuccessJoin;
-    mes "An error happened.";
-    goto L_Close;
-
-L_SuccessJoin:
-    mesq l("Done!");
-    next;
-    warp "001-2", 0, 0;
-    close;
-
 L_Close:
     close;
 
 L_Busy:
     if ($@BGMaster1 == 2) {
-        mesq l("The soldiers are resting. You can join them starting at ##B07:00, 15:00 and 23:00##b in UTC.");
+        mesq l("The soldiers are resting at the moment.");
     } else {
         mesq l("People are challenging now.");
     }
     close;
 
+L_Control:
+    menu
+        l("Introduce"), L_Intro,
+        l("Enable BG"), L_On,
+        l("Disable BG"), L_Off;
+
+L_On:
+    enablenpc "Lt. Randy";
+    enablenpc "Lt. Gerry";
+    mapannounce "001-1", "Frostia and Halinarzo are now on a spar!", bc_map;
+    mes "Event enabled.";
+    close;
+
+L_Off:
+    disablenpc "Lt. Randy";
+    disablenpc "Lt. Gerry";
+    mes "Event disabled.";
+    close;
+
 OnPcQuit:
     warp "002-4", 0, 0;
     bg_leave();
@@ -109,7 +111,7 @@ L_Cancel:
     announce "The Fallen Kings Duel ended in a draw!", bc_all;
     killmonsterall "001-2";
 
-    mapwarp "001-2", "004-2", 29, 23;
+    mapwarp "001-2", "001-1", 235, 27;
     bg_destroy($@FK_Team1);
     bg_destroy($@FK_Team2);
     $@BGMaster1=2;
@@ -121,7 +123,7 @@ OnVictor1:
     announce "Team 1 raises victorious at the Fallen Kings Duel!", bc_all; // TODO: Give players a reward
     killmonsterall "001-2";
 
-    mapwarp "001-2", "004-2", 29, 23;
+    mapwarp "001-2", "001-1", 117, 72;
     bg_destroy($@FK_Team1);
     bg_destroy($@FK_Team2);
     $@BGMaster1=2;
@@ -133,7 +135,7 @@ OnVictor2:
     announce "Team 2 raises victorious at the Fallen Kings Duel!", bc_all;
     killmonsterall "001-2";
 
-    mapwarp "001-2", "004-2", 29, 23;
+    mapwarp "001-2", "001-1", 117, 72;
     bg_destroy($@FK_Team1);
     bg_destroy($@FK_Team2);
     $@BGMaster1=2;
@@ -172,58 +174,15 @@ OnDoEvent:
 
 
 
-// This script is TODO WIP
-/*
-004-1,115,93,0	script	Emissary#1	NPC_ELF,{
-    hello;
 
-OnSendToBattle:
-    $@FK_Team1=waitingroom2bg("testbg", 13, 4, "Cassia::OnPcQuit", "Cassia::OnPcDeath");
-    setbgteam $@FK_Team1, 1;
-    bg_warp $@FK_Team1, "testbg", 13, 4;
-    end;
 
-OnInit:
-    .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 1312); // Light armor
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 2212); // Pants
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 1800); // Shoes
-    setunitdata(.@npcId, UDT_WEAPON, 3501);
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 13);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
 
-	waitingroom("Winterfall", 30, "Cassia::OnSkip", 1);
-    .sex = G_OTHER;
-    .distance = 5;
-    end;
-}
 
 
-004-1,117,93,0	script	Emissary#2	NPC_ELF,{
-    hello;
 
-OnSendToBattle:
-    $@FK_Team2=waitingroom2bg("testbg", 13, 26, "Cassia::OnPcQuit", "Cassia::OnPcDeath");
-    setbgteam $@FK_Team2, 2;
-    bg_warp $@FK_Team2, "testbg", 13, 26;
-    end;
 
-OnInit:
-    .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 1311); // Terran armor
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 2212); // Pants
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 1800); // Shoes
-    setunitdata(.@npcId, UDT_WEAPON, 3501);
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 13);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
 
-	waitingroom("Summerfall", 30, "Cassia::OnSkip", 1);
-    .sex = G_OTHER;
-    .distance = 5;
-    end;
 
-}
-*/
 
 
 
@@ -268,16 +227,7 @@ OnInit:
 
 
 
-
-
-
-
-
-
-
-
-
-004-1,115,93,0	script	Lt. Randy	NPC_ELF,{
+001-1,94,36,0	script	Lt. Randy	NPC_ELF,{
     hello;
 
 OnInit:
@@ -290,6 +240,8 @@ OnInit:
     setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
 
 	waitingroom("Battle Station", 2, "start#bat_a02::OnReadyCheck", 1);
+
+    disablenpc("Lt. Randy");
 	end;
 
 OnEnterBG:
@@ -297,7 +249,7 @@ OnEnterBG:
 	end;
 }
 
-001-2,0,0,0	script	Lt. Gerry	NPC_ELF,{
+001-1,98,36,0	script	Lt. Gerry	NPC_ELF,{
     hello;
 
 OnInit:
@@ -310,6 +262,8 @@ OnInit:
     setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
 
 	waitingroom("Battle Station", 2, "start#bat_a02::OnReadyCheck", 1);
+
+    disablenpc("Lt. Gerry");
 	end;
 
 OnEnterBG:
diff --git a/npc/004-1/_import.txt b/npc/004-1/_import.txt
index 123369a47..d8897b37d 100644
--- a/npc/004-1/_import.txt
+++ b/npc/004-1/_import.txt
@@ -2,5 +2,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/004-1/_mobs.txt",
 "npc/004-1/_warps.txt",
-"npc/004-1/bgmaster.txt",
 "npc/004-1/elanore.txt",