Index: scripts/globals/missions.lua
===================================================================
--- scripts/globals/missions.lua	(revision 3994)
+++ scripts/globals/missions.lua	(working copy)
@@ -36,9 +36,9 @@
 LEAUTE_S_LAST_WISHES    = 16; -- ± --
 RANPERRE_S_FINAL_REST   = 17; -- ± --
 PRESTIGE_OF_THE_PAPSQUE = 18; -- ± --
-THE_SECRET_WEAPON       = 19;
-COMING_OF_AGE           = 20;
-LIGHTBRINGER            = 21;
+THE_SECRET_WEAPON       = 19; -- ± --
+COMING_OF_AGE           = 20; -- ± --
+LIGHTBRINGER            = 21; -- ± --
 BREAKING_BARRIERS       = 22;
 THE_HEIR_TO_THE_LIGHT   = 23;
 
@@ -306,7 +306,7 @@
 
 
 -----------------------------------
---  Assualt (7)
+--  Assault (7)
 -----------------------------------
 
 LEUJAOAM_CLEANSING                = 1;
@@ -590,7 +590,7 @@
 			if(player:hasCompletedMission(SANDORIA,COMING_OF_AGE) == false and getMissionRankPoints(player,20) == 1) then
 				-- 8-1
 				first_mission = first_mission + 1048576;
-			elseif(player:hasCompletedMission(SANDORIA,LIGHTBRINGER) == false and getMissionRankPoints(player,21) == 1) then
+			elseif(player:hasCompletedMission(SANDORIA,LIGHTBRINGER) == false and getMissionRankPoints(player,21) == 1 and player:getVar("Mission8-1Completed") == 1) then
 				-- 8-2
 				first_mission = first_mission + 2097152;
 			end
@@ -599,7 +599,7 @@
 			if(player:hasCompletedMission(SANDORIA,BREAKING_BARRIERS) == false and getMissionRankPoints(player,22) == 1) then
 				-- 9-1
 				first_mission = first_mission + 4194304;
-			elseif(player:hasCompletedMission(SANDORIA,THE_HEIR_TO_THE_LIGHT) == false and getMissionRankPoints(player,23) == 1) then
+			if(player:hasCompletedMission(SANDORIA,BREAKING_BARRIERS) == false and getMissionRankPoints(player,22) == 1 and player:getVar("Cutscenes_8-2") == 2) then
 				-- 9-2
 				first_mission = first_mission + 8388608;
 			end
@@ -825,7 +825,7 @@
 			timeline = {
 				 -- MissionID,{Guard#1 DialogID, option},{Guard#2 DialogID, option},{NPC#1 DialogID, option},{NPC#2 DialogID, option},{function list}
 				 0,{0x03e8,0},{0x07d0,0},{0,0},		{0,0},{{1},{2}}, 													-- MISSION 1-1 (First Mission [START])
-				 0,{0x03fc,0},{0x07e4,0},{0,0},		{0,0},{{4},{5,150},{12},{14,0}}, 											-- MISSION 1-1
+				 0,{0x03fc,0},{0x07e4,0},{0,0},		{0,0},{{4},{5,150},{12},{14,0}}, 									-- MISSION 1-1
 				 0,{0x03ea,0},{0x07d2,0},{0,0},		{0,0},{{4},{5,150},{12}},											-- MISSION 1-1 [Repeat]
 				 1,{0x03ff,0},{0x07e7,0},{0,0},		{0,0},{{4},{14,0},{5,200},{12}}, 									-- MISSION 1-2
 				 1,{0x03eb,0},{0x07d3,0},{0,0},		{0,0},{{4},{14,0},{5,200},{12}},									-- MISSION 1-2 [Repeat]
@@ -846,9 +846,12 @@
 				15,{0,0},	  {0,0},	 {0x0224,0},{0,0},{{11,6},{14,4}}, 												-- MISSION 5-2 (Finish 1st Part (Halver))
 				15,{0,0},	  {0,0},	 {0x003D,0},{0,0},{{14,0},{9,74},{8,20000},{6},{12}}, 							-- MISSION 5-2 (Finish 2nd Part (Trion in Great Hall))
 				16,{0,0},	  {0,0},	 {0x006f,0},{0,0},{{14,0},{9,268},{10,270},{12}}, 								-- MISSION 6-1 (Finish (Chalvatot))
-				17,{0x040a,0},{0x0409,0},{0,0},{0,0},{{14,0},{11,7},{8,40000},{6},{12}},									-- MISSION 6-2 (Finish (Guard))
+				17,{0x040a,0},{0x0409,0},{0,0},{0,0},{{14,0},{11,7},{8,40000},{6},{12}},								-- MISSION 6-2 (Finish (Guard))
 				18,{0,0},	  {0,0},	 {0x0007,0},{0,0},{{14,1}}, 													-- MISSION 7-1 (setVar("MissionStatus",1) (Door: Papal Chambers))
-				18,{0,0},	  {0,0},	 {0x0008,0},{0,0},{{14,0},{9,283},{5,1000},{12}} 								-- MISSION 7-1 (Finish (Door: Papal Chambers))
+				18,{0,0},	  {0,0},	 {0x0008,0},{0,0},{{14,0},{9,283},{5,1000},{12}}, 								-- MISSION 7-1 (Finish (Door: Papal Chambers))
+				19,{0x0414,0},{0x0413,0},{0,0},{0,0},{{14,0},{6},{3,"SecretWeaponStatus",0},{9,284},{11,8},{8,60000},{12}}, -- MISSION 7-2 (Finish)
+				20,{0,0},	  {0,0},	 {0x0066,0},{0,0},{{14,0},{9,288},{5,800},{12}},									-- MISSION 8-1 (Finish)
+				21,{0,0},     {0,0},     {0x0068,0},{0,0},{{14,0},{9,284},{11,9},{8,80000},{6},{12}}					-- MISSION 8-2 (Finish (Door: Great Hall))
 				--[[0,{0,0},{0,0},{0,0},{0,0},{0},{0,0},{0,0},{0,0},{0,0},{0},
 				0,{0,0},{0,0},{0,0},{0,0},{0},{0,0},{0,0},{0,0},{0,0},{0}, ]]--
 						};
@@ -878,6 +881,7 @@
 				18,{0x02fc,0},{0,0},{0,0},{0,0},{{14,0},{9,289},{5,700},{12}}, 											-- MISSION 7-1 (Finish (Cid))
 				19,{0x02fe,0},{0,0},{0,0},{0,0},{{14,0},{6},{11,8},{8,60000},{3,"OptionalCSforOMW",1},{12}}, 			-- MISSION 7-2 (Finish (Karst))
 				20,{0x0300,0},{0,0},{0,0},{0,0},{{14,0},{5,1133},{12}}                                                  -- MISSION 8-1 (Finish (Iron Eater))
+				
 						};
 		end
 	elseif(nation == WINDURST) then
Index: scripts/zones/Chateau_dOraguille/npcs/_6h0.lua
===================================================================
--- scripts/zones/Chateau_dOraguille/npcs/_6h0.lua	(revision 3994)
+++ scripts/zones/Chateau_dOraguille/npcs/_6h0.lua	(working copy)
@@ -2,7 +2,7 @@
 -- Area: Chateau d'Oraguille
 -- Door: Prince Royal's
 -- Finishes Quest: A Boy's Dream
--- Involved in Missions: 3-1, 5-2
+-- Involved in Missions: 3-1, 5-2, 8-2
 -- @pos -38 -3 73 233
 -----------------------------------
 package.loaded["scripts/zones/Chateau_dOraguille/TextIDs"] = nil;
@@ -43,6 +43,8 @@
 	    player:startEvent(0x0051);
 	elseif(currentMission == RANPERRE_S_FINAL_REST and MissionStatus == 7) then
 	    player:startEvent(0x0015);
+	elseif(player:hasCompletedMission(SANDORIA,LIGHTBRINGER) and player:getRank() == 9 and player:getVar("Cutscenes_8-2") == 0) then
+		player:startEvent(0x003F);
 	else
 		player:startEvent(0x020a);
 	end
@@ -92,6 +94,8 @@
 	    player:setVar("MissionStatus",1);
 	elseif(csid == 0x0015) then
 	    player:setVar("MissionStatus",8);
+	elseif(csid == 0x003F) then
+		player:setVar("Cutscenes_8-2",1)
 	end
 	
 end;
Index: scripts/zones/Chateau_dOraguille/npcs/_6h1.lua
===================================================================
--- scripts/zones/Chateau_dOraguille/npcs/_6h1.lua	(revision 3994)
+++ scripts/zones/Chateau_dOraguille/npcs/_6h1.lua	(working copy)
@@ -34,6 +34,8 @@
 		elseif(preludeOfBandW == QUEST_COMPLETED and pieujesDecision == QUEST_AVAILABLE) then
 			player:startEvent(0x0228); -- Start Quest "Pieuje's Decision"
 		end
+	elseif(player:hasCompletedMission(SANDORIA,LIGHTBRINGER) and player:getRank() == 9 and player:getVar("Cutscenes_8-2") == 1) then
+		player:startEvent(0x004A);
 	else
 		player:startEvent(0x020b);
 	end
@@ -63,6 +65,8 @@
 		player:addQuest(SANDORIA,PRELUDE_OF_BLACK_AND_WHITE);
 	elseif(csid == 0x0228) then
 		player:addQuest(SANDORIA,PIEUJE_S_DECISION);
+	elseif(csid == 0x004A) then
+		player:setVar("Cutscenes_8-2",2);
 	end
 	
 end;
\ No newline at end of file
Index: scripts/zones/Chateau_dOraguille/npcs/_6h4.lua
===================================================================
--- scripts/zones/Chateau_dOraguille/npcs/_6h4.lua	(revision 3994)
+++ scripts/zones/Chateau_dOraguille/npcs/_6h4.lua	(working copy)
@@ -1,7 +1,7 @@
 -----------------------------------
 -- Area: Chateau d'Oraguille
 -- Door: Great Hall
--- Involved in Missions: 3-3, 5-2, 6-1
+-- Involved in Missions: 3-3, 5-2, 6-1, 8-2
 -- @pos 0 -1 13 233
 -----------------------------------
 package.loaded["scripts/zones/Chateau_dOraguille/TextIDs"] = nil;
@@ -33,6 +33,10 @@
 		player:startEvent(0x003D);
 	elseif(currentMission == LEAUTE_S_LAST_WISHES and player:getVar("MissionStatus") == 1) then
 	    player:startEvent(87);
+	elseif(currentMission == LIGHTBRINGER and player:getVar("MissionStatus") == 0) then
+		player:startEvent(0x0064);
+	elseif(currentMission == LIGHTBRINGER and player:getVar("MissionStatus") == 6) then
+		player:startEvent(0x0068)
     else
         player:startEvent(0x202);
 	end
@@ -66,6 +70,12 @@
 		finishMissionTimeline(player,3,csid,option);
 	elseif(csid == 87)then
         player:setVar('MissionStatus',2);
+	elseif(csid == 0x0064) then
+		player:setVar("Mission8-1Completed",0) -- dont need this var anymore. JP midnight is done and prev mission completed.
+		player:setVar("MissionStatus",1);
+	elseif(csid == 0x0068) then
+		player:setVar("Mission8-2Kills",0);
+		finishMissionTimeline(player,3,csid,option);
 	end
 	
 end;

Index: scripts/zones/Chateau_dOraguille/npcs/Rahal.lua
===================================================================
--- scripts/zones/Chateau_dOraguille/npcs/Rahal.lua	(revision 3994)
+++ scripts/zones/Chateau_dOraguille/npcs/Rahal.lua	(working copy)
@@ -64,6 +64,11 @@
 		end
 	elseif (player:getVar("KnightStalker_Option2") == 1) then
 		player:startEvent(118); -- Optional CS after Knight Stalker
+		-- Mission 8-2 San dOria --
+	elseif(player:getCurrentMission(SANDORIA) == LIGHTBRINGER and player:getVar("MissionStatus") == 1) then
+		player:startEvent(0x006A)
+	elseif(player:getCurrentMission(SANDORIA) == LIGHTBRINGER and player:getVar("MissionStatus") == 2) then
+		player:startEvent(0x006b);
 	end
 	
 end;
@@ -105,6 +110,14 @@
 		player:setVar("KnightStalker_Progress",4);
 	elseif (csid == 118) then
 		player:setVar("KnightStalker_Option2",0);
+	elseif(csid == 0x006A) then
+		if(player:hasKeyItem(CRYSTAL_DOWSER)) then
+			player:delKeyItem(CRYSTAL_DOWSER); -- To prevent them getting a message about already having the keyitem
+		else
+			player:setVar("MissionStatus",2);
+			player:addKeyItem(CRYSTAL_DOWSER);
+			player:messageSpecial(KEYITEM_OBTAINED,CRYSTAL_DOWSER);
+		end
 	end
 end;
 		
Index: sql/mob_groups.sql
===================================================================
--- sql/mob_groups.sql	(revision 3994)
+++ sql/mob_groups.sql	(working copy)
@@ -8448,8 +8448,8 @@
 INSERT INTO `mob_groups` VALUES (8421,2101,159,1056,0,1805,0,0,64,68);
 INSERT INTO `mob_groups` VALUES (8422,2552,159,7920,0,2195,0,0,69,69);
 INSERT INTO `mob_groups` VALUES (8423,2664,159,0,128,2280,0,0,65,65);
-INSERT INTO `mob_groups` VALUES (8424,2888,159,0,128,0,0,0,69,69);
-INSERT INTO `mob_groups` VALUES (8425,2889,159,0,128,0,0,0,69,69);
+INSERT INTO `mob_groups` VALUES (8424,2888,159,0,128,0,8000,0,70,70);
+INSERT INTO `mob_groups` VALUES (8425,2889,159,0,128,0,8000,0,70,70);
 INSERT INTO `mob_groups` VALUES (8426,3388,159,0,128,0,5000,0,63,63);
 INSERT INTO `mob_groups` VALUES (8427,3415,159,1056,0,3015,0,0,53,56);
 INSERT INTO `mob_groups` VALUES (8428,3434,159,0,128,3030,0,0,66,68);

Index: sql/mob_spawn_points.sql
===================================================================
--- sql/mob_spawn_points.sql	(revision 3994)
+++ sql/mob_spawn_points.sql	(working copy)
@@ -32658,8 +32658,8 @@
 INSERT INTO `mob_spawn_points` VALUES ('17428492', 'Tonberry_s_Elemental', '8444', '1.000', '1.000', '1.000', '0');
 INSERT INTO `mob_spawn_points` VALUES ('17428493', 'Tonberry_s_Avatar', '8443', '-500.000', '-500.000', '-500.000', '127');
 INSERT INTO `mob_spawn_points` VALUES ('17428494', 'Temple_Guardian', '8433', '-64.472', '-0.523', '-102.889', '190');
-INSERT INTO `mob_spawn_points` VALUES ('17428495', 'Nio-A', '8424', '0.000', '0.000', '0.000', '0');
-INSERT INTO `mob_spawn_points` VALUES ('17428496', 'Nio-Hum', '8425', '0.000', '0.000', '0.000', '0');
+INSERT INTO `mob_spawn_points` VALUES ('17428495', 'Nio-A', '8424', '-47.124', '-17.000', '-144.151', '0');
+INSERT INTO `mob_spawn_points` VALUES ('17428496', 'Nio-Hum', '8425', '-52.853', '-17.000', '-143.869', '0');
 INSERT INTO `mob_spawn_points` VALUES ('17428497', 'Mimic', '8423', '1.000', '1.000', '1.000', '0');
 INSERT INTO `mob_spawn_points` VALUES ('17428498', 'Wespe', '8449', '205.000', '-0.110', '19.000', '60');
 INSERT INTO `mob_spawn_points` VALUES ('17428499', 'Temple_Opo-opo', '8434', '197.000', '-0.114', '20.000', '52');