* Rev. 13458 Looooots of bugfixes provided by various people! [L0ne_W0lf]

- Fixed Seal quest checking for oridecon hammer. Again. (Bugreport:2363)
- Fixed some requirements for the socket NPC. (famiong) (Bugreport:2572)
- Fixed a global variable-collision in Z-Gang quest. (Bugreport:2616)
- Fixed issue with Zhed saying things he shouldn't (Bugreport:2627)
- Fixed OnMyMobDwead in Nameless quest issue. (Bugreport:2628)
- Fixed Kyle Hyre script halting on delitem. (Bugreport:2633)
- Added missing part of Peace for Arunafelts (Gepard) (Bugreport:2639)
- Added missing Kafra npc to Comodo. (Daegaladh) (Bugreport:2662)
- Fixed a minor error in Einbroch Tower NPC. (magegahell) (Bugreport:2669)
- Fixed exp reward in Peace for Arunafeltz. (Gepard) (Bugreport:2676)
- Fixed exp reward in Meg. God Seal quest. (Daegaladh) (Bugreport:2677)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13458 54d463be-8e91-2dee-dedb-b68131a5f0ec

10 files changed, 234 insertions, 125 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 03c3987b6..aa3ea08ad 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,18 @@
 Date		Added
 ======
+2009/01/19
+	* Rev. 13458 Looooots of bugfixes provided by various people! [L0ne_W0lf]
+	- Fixed Seal quest checking for oridecon hammer. Again. (Bugreport:2363)
+	- Fixed some requirements for the socket NPC. (famiong) (Bugreport:2572)
+	- Fixed a global variable-collision in Z-Gang quest. (Bugreport:2616)
+	- Fixed issue with Zhed saying things he shouldn't (Bugreport:2627)
+	- Fixed OnMyMobDwead in Nameless quest issue. (Bugreport:2628)
+	- Fixed Kyle Hyre script halting on delitem. (Bugreport:2633)
+	- Added missing part of Peace for Arunafelts (Gepard) (Bugreport:2639)
+	- Added missing Kafra npc to Comodo. (Daegaladh) (Bugreport:2662)
+	- Fixed a minor error in Einbroch Tower NPC. (magegahell) (Bugreport:2669)
+	- Fixed exp reward in Peace for Arunafeltz. (Gepard) (Bugreport:2676)
+	- Fixed exp reward in Meg. God Seal quest. (Daegaladh) (Bugreport:2677)
 2009/01/06
 	* Rev. 13436 Uncommented warp moc_fild02 -> pay_fild04, in morroc_fild.txt. [L0ne_W0lf]
 2008/12/29
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index 1e2af04d4..a775e2fa1 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena dev team
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= 1.6 Split doomed sword quest to quests/quests_comodo.txt [Evera]
 //= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.8 Fixed a small bug. (close -> close2) [L0ne_W0lf]
+//= 1.9 Added a missing Kafra NPC. [L0ne_W0lf]
 //============================================================
 
 // Inside Comodo
@@ -422,6 +423,27 @@ cmd_fild07,94,134,4	script	Sarumane#cmd	100,{
 }
 
 
+cmd_in02,146,180,4	script	Kafra Employee::kaf_comodo2	721,{
+	cutin "kafra_07",2;
+	mes "[Kafra Misty]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "You know that our";
+	mes "service is always";
+	mes "on your side~";
+	next;
+	mes "[Kafra Misty]";
+	mes "The Kafra Corporation";
+	mes "Western Division promises";
+	mes "the best quality service that";
+	mes "emphasizes reliability, and";
+	mes "total consumer satisfaction.";
+	mes "Thank you for your patronage~";
+	close2;
+	cutin "", 255;
+	end;
+}
+
 // Morroc Field
 //============================================================
 moc_fild12,35,303,4	script	Serutero#cmd	59,{
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index 81b069f78..e59c94da0 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Everybody mentioned in the comments
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena Revision 3000+
 //===== Description: ========================================= 
@@ -28,6 +28,7 @@
 //= 1.4 Implemented the polution script. [MasterOfMuppets]
 //= 1.5 Updated Hotel Employee to work with Airship Ticket Quest [Samuray22]
 //= 1.6 Optimized several NPCs [DZeroX]
+//= 1.7 Replaced outdated variable with getarg. [L0ne_W0lf]
 //============================================================
 
 einbroch,218,198,5	script	Mark#ein	855,{
@@ -89,7 +90,7 @@ einbroch,176,172,5	script	Khemko#ein	855,{
 }
 
 function	script	EinTower	{
-	mes "["+.@name$+"]";
+	mes "[" + getarg(0) + "]";
 	mes "Good day~";
 	mes "I'm " + getarg(0) + ", your";
 	mes "guide to exploring";
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index ca5cf1242..247d9dbc7 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= eAthena dev team
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -22,6 +22,7 @@
 //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.5 Removed Ontouch trigger area from NPCs. [L0ne_W0lf]
 //= 1.6 Replaced effect numerics with constants. [Samuray22]
+//= 1.7 Adjusted prices on some armor and weapons. [L0ne_W0lf]
 //============================================================
 
 payon,140,151,5	script	Seiyablem	84,{
@@ -73,7 +74,7 @@ payon,140,151,5	script	Seiyablem	84,{
 						case 1: callfunc "Func_Socket",1,1519,1520,40,61,300,1010,10; break;
 						case 2: callfunc "Func_Socket",2,1219,1220,40,61,300,984,1,999,5; break;
 						case 3: callfunc "Func_Socket",2,1714,1716,40,61,300,984,2,999,5; break;
-						case 4: callfunc "Func_Socket",1,1407,1408,40,61,300,1010,10; break;
+						case 4: callfunc "Func_Socket",1,1407,1408,40,61,200,1010,10; break;
 						case 5: callfunc "Func_Socket",2,1123,1128,40,61,300,984,2,999,5; break;
 						case 6: callfunc "Func_Socket",1,1905,1906,40,61,300,1011,10; break;
 						case 7: callfunc "Func_Socket",1,1954,1955,40,61,300,1011,10; break;
@@ -94,14 +95,14 @@ payon,140,151,5	script	Seiyablem	84,{
 					switch( select( "Hunter Bow","Survivor's Rod(INT)","Zweihander","Flamberge","Infiltrator","Ballista","Stunner","Berserk","Claymore","Dragon Killer","Katar of Frozen Icicle","Katar of Quaking","Katar of Raging Blaze","Katar of Piercing Wind","Golden Mace","Oriental Lute","Queen's Whip","Phantom Spear","Schweizersabel" ) )
 					{
 						case 1: callfunc "Func_Socket",2,1718,1726,40,61,500,984,2,999,10; break;
-						case 2: callfunc "Func_Socket",2,1619,1620,40,61,500,984,2,999,10; break;
+						case 2: callfunc "Func_Socket",2,1619,1620,40,61,500,984,5,999,10; break;
 						case 3: callfunc "Func_Socket",2,1168,1171,40,61,800,984,5,999,10; break;
 						case 4: callfunc "Func_Socket",2,1129,1149,40,61,500,984,2,999,10; break;
 						case 5: callfunc "Func_Socket",2,1261,1266,40,61,700,984,5,999,10; break;
 						case 6: callfunc "Func_Socket",2,1722,1727,40,61,500,984,5,999,10; break;
-						case 7: callfunc "Func_Socket",2,1522,1532,40,61,700,984,2,999,10; break;
-						case 8: callfunc "Func_Socket",2,1814,1816,40,61,700,984,5,999,10; break;
-						case 9: callfunc "Func_Socket",2,1163,1172,40,61,700,984,5,999,10; break;
+						case 7: callfunc "Func_Socket",2,1522,1532,40,61,500,984,2,999,10; break;
+						case 8: callfunc "Func_Socket",2,1814,1816,40,61,500,984,5,999,10; break;
+						case 9: callfunc "Func_Socket",2,1163,1172,40,61,500,984,5,999,10; break;
 						case 10: callfunc "Func_Socket",1,13001,13030,40,61,500,984,2; break;
 						case 11: callfunc "Func_Socket",1,1256,1275,40,61,500,984,2; break;
 						case 12: callfunc "Func_Socket",1,1257,1276,40,61,500,984,2; break;
@@ -166,7 +167,7 @@ payon,140,151,5	script	Seiyablem	84,{
 						case 2: callfunc "Func_Socket",1,2309,2310,40,66,200,999,3; break;
 						case 3: callfunc "Func_Socket",1,2232,2233,40,66,200,999,3; break;
 						case 4: callfunc "Func_Socket",1,2216,2217,40,66,200,999,3; break;
-						case 5: callfunc "Func_Socket",1,2253,5351,40,66,200,999,3; break;
+						case 5: callfunc "Func_Socket",1,2253,5351,40,66,100,999,3; break;
 						case 6: callfunc "Func_Socket",1,5012,5347,40,66,200,999,3; break;
 						case 7: callfunc "Func_Socket",1,2244,5348,40,66,200,999,5; break;
 						case 8: callfunc "Func_Socket",1,5016,5349,40,66,200,999,5; break;
@@ -241,11 +242,11 @@ payon,140,151,5	script	Seiyablem	84,{
 						case 4:  callfunc "Func_Socket",1,5019,5163,40,51,2000,985,2; break;
 						case 5:  callfunc "Func_Socket",1,2235,5165,40,51,2000,985,2; break;
 						case 6:  callfunc "Func_Socket",1,2234,5164,40,51,2000,985,2; break;
-						case 7:  callfunc "Func_Socket",1,5053,5166,40,51,1000,985,2; break;
-						case 8:  callfunc "Func_Socket",1,2343,2360,40,51,1000,985,2; break;
-						case 9:  callfunc "Func_Socket",1,2602,2622,40,51,1000,985,2; break;
-						case 10: callfunc "Func_Socket",1,2601,2621,40,51,1000,985,2; break;
-						case 11: callfunc "Func_Socket",1,2619,2671,40,51,1000,985,2; break;
+						case 7:  callfunc "Func_Socket",1,5053,5166,40,51,2000,985,2; break;
+						case 8:  callfunc "Func_Socket",1,2343,2360,40,51,2000,985,2; break;
+						case 9:  callfunc "Func_Socket",1,2602,2622,40,51,2000,985,2; break;
+						case 10: callfunc "Func_Socket",1,2601,2621,40,51,2000,985,2; break;
+						case 11: callfunc "Func_Socket",1,2619,2671,40,51,2000,985,2; break;
 						case 12: callfunc "Func_Socket",1,2334,2372,40,51,1000,985,1; break;
 						case 13: callfunc "Func_Socket",1,2327,2373,40,51,1000,985,1; break;
 						case 14: callfunc "Func_Socket",1,2111,2128,40,51,1000,985,1; break;
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 470a980b6..aabe87184 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf (Script), DZeroX (Timer)
 //===== Current Version: ===================================== 
-//= 4.4
+//= 4.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -95,6 +95,7 @@
 //= 4.3 Fixed improper condition in the Elly NPC. [L0ne_W0lf]
 //=     Corrected some typos in the dialogs.
 //= 4.4 Updated reviecer and robots NPC to use mobcount. (bugreport:2380) [L0ne_W0lf]
+//= 4.5 Removed a delitem that was no logner needed. [L0en_W0lf]
 //============================================================ 
 
 //============================================================================
@@ -4459,7 +4460,6 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		mes "wrong... and she just... just...";
 		mes "The river swallowed her...";
 		mes "I felt empty. She was gone. ";
-		delitem 7498,1; //Rosimier_Key
 		delitem 7499,1; //Family_Portrait
 		delitem 7500,1; //Elysia_Portrait
 		delitem 7501,1; //Kyll_Hyre_Letter2
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index eeb41e4d5..a806db290 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -13,7 +13,6 @@
 //= - Quest to gain access to Nameless Island and dungeon.
 //= - Variable in use: aru_monas  (Max: 26)
 //= Peace for Arunafeltz:
-//= - -CURRENTLY INCOMPATABLE WITH EPISODE 12+
 //- - Help to keep peace between Arunafeltz and Midgard.
 //= - Variable in use: aru_em (Max: 23)
 //= Muff's Loan:
@@ -28,13 +27,11 @@
 //- - Help to aprehend the infamous Z-Gang.
 //= - Variable in use: zdan_edq (Max: 19)
 //= Unlucky Emerald:
-//= - -CURRENTLY INCOMPATABLE WITH EPISODE 12+
 //- - Help a treasure hunter from Prontera get home, and 
 //=   learn the origins of the Unlucky Emerald.
 //= - Variable in use: treasure_nd (Max: 12)
 //= - Variable in use: jewel_nd (Max: 31)
 //= Rogue Guild Investigation Assistance:
-//= - -CURRENTLY INCOMPATABLE WITH EPISODE 12+
 //- - Assist the Rogue Guild with their investigations.
 //= - Variable in use: rumour_nd (Max: 22)
 //===== Additional Comments: ================================= 
@@ -53,6 +50,8 @@
 //=     Added Quest: Unlucky Emerald
 //=     Added Quest: Rogue Guild Investigation
 //= 1.7 Fixed a typo in monestary quest. [L0ne_W0lf]
+//= 1.8 Renamed temporary global variable. [L0ne_W0lf]
+//=     moved OnMyMobDead for access quest to a different NPC.
 //============================================================ 
 
 // Nameless Island and Cursed Monestary Access Quest
@@ -1823,14 +1822,14 @@ nameless_in,13,53,0	script	Creature#Aru	1864,{
 OnInit:
 	hideonnpc "Creature#Aru";
 	end;
-}
-
-nameless_in,13,53,0	script	#Aru_Trigger2	-1,3,1,{
-	end;
 
 OnMyMobDead:
 	enablenpc "aru_warp";
 	end;
+}
+
+nameless_in,13,53,0	script	#Aru_Trigger2	-1,3,1,{
+	end;
 
 OnTouch:
 	if (aru_monas == 19 && !@mymobcount) {
@@ -1839,7 +1838,7 @@ OnTouch:
 		close2;
 		hideonnpc "Creature#Aru";
 		set @mymobcount,1;
-		monster "nameless_in",13,53,"Zombie",1864,1,"#Aru_Trigger2::OnMyMobDead";
+		monster "nameless_in",13,53,"Zombie",1864,1,"Creature#Aru::OnMyMobDead";
 		end;
 	}
 	end;
@@ -1960,7 +1959,7 @@ abbey02,224,70,0	script	Book#Aru	111,{
 		mes "these old, moldy books.^000000";
 		next;
 		if(select("Examine Book:Ignore")==1) {
-			//Readbook 7755;
+			Readbook 7755,1;
 			getitem 7755,1; // Reasearch_Note
 			set aru_monas,22;
 			close;
@@ -8537,11 +8536,11 @@ OnTouch:
 
 z_agit,98,44,0	script	EntranceCheck#1	-1,10,10,{
 OnTouch:
-	if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster == 0)) {
-		set $@monster,1;
+	if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster_zgang == 0)) {
+		set $@monster_zgang,1;
 		donpcevent "#zdan_broad::OnEnable";
 	}
-	else if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster > 0)) {
+	else if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster_zgang > 0)) {
 		end;
 	}
 	else if (zdan_edq == 17) {
@@ -8557,7 +8556,7 @@ OnTouch:
 		mes "terribly wrong, hasn't";
 		mes "it? Let me go baaaack~!";
 		close2;
-		set $@monster,0;
+		set $@monster_zgang,0;
 		set $@door2,0;
 		warp "moc_fild17",209,235;
 	}
@@ -8566,11 +8565,11 @@ OnTouch:
 
 z_agit,98,92,0	script	EntranceCheck#2	-1,10,10,{
 OnTouch:
-	if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster == 0)) {
-		set $@monster,1;
+	if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster_zgang == 0)) {
+		set $@monster_zgang,1;
 		donpcevent "#zdan_broad::OnEnable";
 	}
-	else if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster > 0)) {
+	else if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster_zgang > 0)) {
 		end;
 	}
 	else if (zdan_edq == 17) {
@@ -8586,7 +8585,7 @@ OnTouch:
 		mes "terribly wrong, hasn't";
 		mes "it? Let me go baaaack~! ";
 		close2;
-		set $@monster,0;
+		set $@monster_zgang,0;
 		set $@door2,0;
 		warp "moc_fild17",209,235;
 	}
@@ -8652,7 +8651,7 @@ OnTimer21000:
 OnTimer300000:
 	killmonster "z_agit","#ZGuard::OnMyMobDead";
 	donpcevent "#zdan_broad::OnDisable";
-	set $@monster,0;
+	set $@monster_zgang,0;
 	set $@door2,0;
 	end;
 
@@ -8661,7 +8660,7 @@ OnTimer350000:
 	hideonnpc "Louis";
 	hideonnpc "Martha";
 	hideonnpc "Catfoii";
-	set $@monster,0;
+	set $@monster_zgang,0;
 	set $@door2,0;
 	end;
 }
@@ -8687,7 +8686,7 @@ OnDisable:
 
 Onreset:
 	killmonster "z_agit","#ZGuard::OnMyMobDead";
-	set $@monster,0;
+	set $@monster_zgang,0;
 	end;
 
 OnMyMobDead:
@@ -8733,7 +8732,7 @@ OnTimer300000:
 	mapwarp "z_agit","moc_fild17",209,235;
 	donpcevent "#zdan_broad::OnDisable";
 	killmonster "z_agit","#ZGuard::OnMyMobDead";
-	set $@monster,0;
+	set $@monster_zgang,0;
 	set $@door2,0;
 	donpcevent "#ZGuard::OnDisable";
 	stopnpctimer;
@@ -8832,7 +8831,7 @@ z_agit,97,101,3	script	Louis	931,{
 		getitem 7724,1; //Forbidden_Secret_Art
 		set zdan_edq,18;
 		mapwarp "z_agit","moc_fild09",68,298;
-		set $@monster,0;
+		set $@monster_zgang,0;
 		set $@door2,0;
 		hideonnpc "Louis";
 		hideonnpc "Martha";
@@ -8847,7 +8846,7 @@ z_agit,97,101,3	script	Louis	931,{
 		mes "terribly wrong, hasn't";
 		mes "it? Let me go baaaack~! ";
 		set zdan_edq,15;
-		set $@monster,0;
+		set $@monster_zgang,0;
 		set $@door2,0;
 		close2;
 		warp "moc_fild17",209,235;
@@ -8954,7 +8953,7 @@ z_agit,99,101,3	script	Martha	101,{
 		getitem 7724,1; //Forbidden_Secret_Art
 		set zdan_edq,18;
 		mapwarp "z_agit","moc_fild17",209,235;
-		set $@monster,0;
+		set $@monster_zgang,0;
 		set $@door2,0;
 		hideonnpc "Louis";
 		hideonnpc "Martha";
@@ -8970,7 +8969,7 @@ z_agit,99,101,3	script	Martha	101,{
 		mes "terribly wrong, hasn't";
 		mes "it? Let me go baaaack~! ";
 		set zdan_edq,15;
-		set $@monster,0;
+		set $@monster_zgang,0;
 		set $@door2,0;
 		close2;
 		warp "moc_fild17",209,235;
@@ -9073,7 +9072,7 @@ z_agit,95,101,3	script	Catfoii	876,{
 		getitem 7724,1; //Forbidden_Secret_Art
 		set zdan_edq,18;
 		mapwarp "z_agit","moc_fild17",209,235;
-		set $@monster,0;
+		set $@monster_zgang,0;
 		set $@door2,0;
 		hideonnpc "Louis";
 		hideonnpc "Martha";
@@ -9089,7 +9088,7 @@ z_agit,95,101,3	script	Catfoii	876,{
 		mes "terribly wrong, hasn't";
 		mes "it? Let me go baaaack~! ";
 		set zdan_edq,15;
-		set $@monster,0;
+		set $@monster_zgang,0;
 		set $@door2,0;
 		close2;
 		warp "moc_fild17",209,235;
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 16ed29cba..cffde368e 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 3.0
+//= 3.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -56,6 +56,7 @@
 //= 3.0 Large reordering of Zhed, and Peace to the Arunafeltz addition. [L0ne_W0lf]
 //=     Some more numeric conversion, and some other cleanup.
 //= 3.1 Updated Ice Necklace quest, added missing checks. [L0ne_W0lf]
+//= 3.2 Added missing updates for Peace to the Arunafeltz quest. [L0ne_W0lf]
 //============================================================ 
 
 // Lost Child Quest (Prerequisite to High Priest quest)
@@ -4953,7 +4954,7 @@ que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 }
 
 ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
-	if (ra_tem_q > 14) set lost_boy,14;
+	if ((ra_tem_q > 14) || (MISC_QUEST&8192)) set lost_boy,14;
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -5465,11 +5466,12 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		getexp 900000,600000;
 		end;
 	}
-	if (MISC_QUEST & 8192) {
+	else if (MISC_QUEST & 8192) {
 		// Start Veins "Thor Volcano Base" Quest Addition
 		if (rachel_camel == 25) {
 			// Start Nameless Island Access Quest Addition
 			if (aru_monas == 11) {
+				cutin "ra_gman",2;
 				mes "[High Priest Zhed]";
 				mes "Ah, it's been a while,";
 				mes "hasn't it? You look well,";
@@ -5538,7 +5540,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				}
 			}
 			// End Nameless Island Access Quest Addition.
-			if (aru_vol == 0) {
+			else if (aru_vol == 0) {
 				cutin "ra_gman",2;
 				mes "[High Priest Zhed]";
 				mes "Ah, it does my heart to";
@@ -6454,7 +6456,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "Your place in Valhalla is";
 					mes "already assured, I'm sure.";
 					set aru_em,24;
-					set BaseExp,BaseExp+1500000;
+					getexp 1500000,0;
 				}
 				else {
 					mes "[High Priest Zhed]";
@@ -6923,71 +6925,47 @@ L_End:
 }
 
 ra_temin,134,128,3	script	Pope's Office Guard#rac::raofficeguard	926,{
-	if (MISC_QUEST & 8192) {
+	if ((ra_tem_q == 15) && (countitem(7561) > 39)) {
 		mes "[Pope's Office Guard]";
-		mes "I'm sorry, but the pope";
-		mes "is officiating a service";
-		mes "now. Please come back";
-		mes "after the service is ended.";
-		close;
+		mes "Hm? What's that you have";
+		mes "there? Oh, you've gathered";
+		mes "40 Glacial Hearts and brought";
+		mes "a recommendation letter from";
+		mes "a High Priest? Most impressive.";
+		next;
+		mes "[Pope's Office Guard]";
+		mes "I think I know why you're";
+		mes "here. Thanks for bringing";
+		mes "those to me, and I'll let you";
+		mes "enter and see the pope";
+		mes "Welcome, brave "+strcharinfo(0)+".";
+		close2;
+		set ra_tem_q,16;
+		delitem 7561,40; //Ice_Heart
+		end;
 	}
-
-	if ((ra_tem_q < 15) || (ra_tem_q == 15) && (countitem(7561) < 40)) {
+	else if (ra_tem_q == 16) {
 		mes "[Pope's Office Guard]";
-		mes "I'm sorry, but outsiders";
-		mes "typically aren't allowed";
-		mes "to visit the pope without";
-		mes "special authorization.";
+		mes "The pope is inside";
+		mes "expecting you, so please";
+		mes "don't keep her waiting long.";
 		close;
 	}
-
-
-	else {
-		if (ra_tem_q == 15) {
-			mes "[Pope's Office Guard]";
-			mes "Hm? What's that you have";
-			mes "there? Oh, you've gathered";
-			mes "40 Glacial Hearts and brought";
-			mes "a recommendation letter from";
-			mes "a High Priest? Most impressive.";
-			next;
-			mes "[Pope's Office Guard]";
-			mes "I think I know why you're";
-			mes "here. Thanks for bringing";
-			mes "those to me, and I'll let you";
-			mes "enter and see the pope";
-			mes "Welcome, brave "+strcharinfo(0)+".";
-			close2;
-			set ra_tem_q,16;
-			delitem 7561,40; //Ice_Heart
-		}
-
-		if (ra_tem_q == 16) {
-			mes "[Pope's Office Guard]";
-			mes "The pope is inside";
-			mes "expecting you, so please";
-			mes "don't keep her waiting long.";
+	else if (MISC_QUEST & 8192) {
+		if ((aru_em == 15) || (aru_em == 21)) {
+			mes "- Niren told me to pay a visit to the Pope in her office... -";
 			close;
 		}
-
 		else {
 			mes "[Pope's Office Guard]";
-			mes "I'm sorry, but the pope";
-			mes "is officiating a service";
-			mes "now. Please come back";
-			mes "after the service is ended.";
+			mes "I'm sorry, but outsiders";
+			mes "typically aren't allowed";
+			mes "to visit the pope without";
+			mes "special authorization.";
 			close;
 		}
-
 	}
-
-}
-
-ra_temin,134,134,3	duplicate(raofficeguard)	Pope's Office Guard#2ra	926
-
-ra_temin,134,131,0	script	gyoin1#rachel	45,1,1,{
-OnTouch:
-	if ((ra_tem_q > 16) || (MISC_QUEST & 8192)){
+	else {
 		mes "[Pope's Office Guard]";
 		mes "I'm sorry, but the pope";
 		mes "is officiating a service";
@@ -6995,15 +6973,42 @@ OnTouch:
 		mes "after the service is ended.";
 		close;
 	}
+}
 
+ra_temin,134,134,3	duplicate(raofficeguard)	Pope's Office Guard#2ra	926
+
+ra_temin,134,131,0	script	gyoin1#rachel	45,1,1,{
+OnTouch:
+	if (ra_tem_q == 16) {
+		warp "ra_temin",276,239;
+	}
+	else if ((ra_tem_q > 16) || (MISC_QUEST & 8192)){
+		if ((aru_em == 15) || (aru_em == 21)) {
+			warp "ra_temin",276,239;
+		}
+		else {
+			mes "[Pope's Office Guard]";
+			mes "I'm sorry, but the pope";
+			mes "is officiating a service";
+			mes "now. Please come back";
+			mes "after the service is ended.";
+			close;
+		}
+	}
 	if (ra_tem_q < 16) {
 		mes "^3355FFThe door is locked.^000000";
 		close;
 	}
-	else if (ra_tem_q == 16) {
-		warp "ra_temin",276,239;
-	}
+	end;
+}
 
+ra_temin,275,226,0	script	#rachel33	45,1,1,{
+	end;
+OnTouch:
+	if (aru_em == 21)
+		warp "que_temsky",99,11;
+	else
+		warp "ra_temsky",99,11;
 	end;
 }
 
@@ -7145,20 +7150,85 @@ ra_temsky,99,99,5	script	Pope#rachel	936,{
 		cutin "",255;
 		end;
 	}
-
-	else if (ra_tem_q == 17) {
-		mes "[Pope]";
-		mes "Oh, that's right...";
-		mes "Zhed... Er, High Priest";
-		mes "Zhed wanted to speak to you!";
-		close2;
-		cutin "",255;
-		end;
+	else {
+		if (aru_em < 15) {
+			mes "[Pope]";
+			mes "Oh, that's right...";
+			mes "Zhed... Er, High Priest";
+			mes "Zhed wanted to speak to you!";
+			close2;
+			cutin "",255;
+			end;
+		}
+		else if (aru_em == 15) {
+			mes "[Pope]";
+			mes "Oh, hello! It's you again!";
+			mes "Have you come to tell me";
+			mes "interesting stories about";
+			mes "the outside world again?";
+			next;
+			input .@input$;
+			mes "[Pope]";
+			mes "Mm. That sounds pretty";
+			mes "strange to me. Well, it's";
+			mes "good to hear it from you.";
+			next;
+			mes "["+PcName+"]";
+			mes "(^333333I can't just leave";
+			mes "now. I should try to see";
+			mes "if I can learn anything";
+			mes "useful from the pope...^000000)";
+			next;
+			switch(select("Aren't you lonely?:Do you ever take a break?")) {
+			case 1:
+				mes "[Pope]";
+				mes "Well, there are always";
+				mes "some priests with me all";
+				mes "the time. Some of them";
+				mes "even watch me when I sleep.";
+				mes "I don't think I have time";
+				mes "to feel lonely, actually.";
+				next;
+				mes "[Pope]";
+				mes "Thank you for asking.";
+				mes "Sometimes... Sometimes";
+				mes "I wonder if I have a real";
+				mes "family. I don't even know";
+				mes "who'd they be or if they";
+				mes "exist. I don't know...";
+				next;
+				mes "[Pope]";
+				mes "I... I'm sorry.";
+				mes "I guess you didn't";
+				mes "expect to hear something";
+				mes "like that. ^666666*Sigh*^000000 I'm feeling";
+				mes "pretty exhausted. I better...";
+				mes "I better get some rest...";
+				set aru_em,16;
+				close2;
+				cutin "",255;
+				end;
+			case 2:
+				mes "[Pope]";
+				mes "Well, even if I wanted";
+				mes "to, I can't just go out";
+				mes "and play. As pope... Well...";
+				mes "Everyone and everything";
+				mes "sort of needs my attention.";
+				close2;
+				cutin "",255;
+				end;
+			}
+		}
+		else if (aru_em == 16) {
+			mes "[Follower]";
+			mes "The pope said that she's";
+			mes "exhausted. Please come";
+			mes "back when she's feeling";
+			mes "better, and she will have";
+			mes "an audience with you.";
+		}
 	}
-
-	mes "[Pope]";
-	mes "...";
-	mes "...";
 	close2;
 	cutin "",255;
 	end;
diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index 50c683703..8a2b7696e 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -17,6 +17,7 @@
 //= 1.5 Fixed missing close2 in Rebarev Doug. [L0ne_w0lf]
 //= 1.6 Corrected mismatched variables. [L0ne_W0lf]
 //= 1.7 Replaced effect numerics with constants. [Samuray22]
+//= 1.8 Corrected how exp reward is applied. [L0ne_W0lf]
 //============================================================
 
 prt_castle,44,151,0	script	Rebarev Doug	56,{
@@ -3166,7 +3167,7 @@ niflheim,109,254,0	script	Egnigem	796,{
 			specialeffect EF_LOCKON;
 			specialeffect2 EF_HOLYCROSS;
 			set god_eremes,27;
-			set BaseExp,BaseExp+1220358;
+			getexp 1220358,0;
 			close;
 		}
 		else if (god_eremes == 26) {
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index 4a3674729..0f8a6d800 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -19,6 +19,7 @@
 //= 1.6 Fixed checking for Oridecon Hammer. [L0ne_W0lf]
 //=     Corrected Sudi's and player's HP settings.
 //= 1.7 Fixed a copy/paste error in Nordri. [L0ne_W0lf]
+//= 1.8 Fixed item check for Oridecon. [L0ne_W0lf]
 //============================================================
 
 prontera,124,297,3	script	Tialfi	706,{
@@ -2248,7 +2249,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					mes "to work!";
 					close;
 				}
-				if (countitem(615) > 0) {
+				if (countitem(984) > 0) {
 					delitem 984,1; //Oridecon
 				}
 				else {
diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index c508dc696..f614f778f 100644
--- a/npc/warps/cities/rachel.txt
+++ b/npc/warps/cities/rachel.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= erKURITA & RockmanEXE
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -16,6 +16,7 @@
 //= 1.2 Fully official rachel warps [Playtester]
 //= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf]
 //= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf]
+//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] 
 //============================================================
 
 rachel,150,249,0	warp	rachel01	1,1,ra_temple,120,30
@@ -54,7 +55,7 @@ ra_temin,130,93,0	warp	rachel30	1,1,ra_temin,239,258
 ra_temin,206,93,0	warp	rachel31	1,1,ra_temin,312,258
 ra_temin,275,332,0	warp	rachel32	1,1,ra_temin,27,305
 
-ra_temin,275,226,0	warp	rachel33	1,1,ra_temsky,99,11
+//ra_temin,275,226,0	warp	rachel33	1,1,ra_temsky,99,11
 
 ra_temsky,99,118,0	warp	rachel34	1,1,ra_temsky,99,140
 ra_temsky,112,143,0	warp	rachel35	1,1,ra_temsky,141,139