Update to last rAthena npc.

Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt

87 files changed, 12941 insertions, 15203 deletions

diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt
index 596f89d63..981d33cb5 100644
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@@ -1,17 +1,17 @@
 //===== Hercules Script ======================================
 //= Wandering Minstrel Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Riotblade and L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
 //= Help the bard remember how his song goes.
 //===== Comments: ============================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Needs optimizing.
 //= Reconverted with iRO Dialogs.
 //= Possible NPC conflict with "Representative"
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, needs testing. [L0ne_W0lf]
 //= 1.1 Fixed bug, optimized. Not yet final version [Lupus]
 //=
@@ -21,10 +21,11 @@
 //=
 //= This Quest has relation with brisingamen_seal.txt (Seals)
 //= 1.2 Changed variable to "gef_bards_q" to avoid job quest conflict. [L0ne_W0lf]
-//=	Progress prior to the 5th+ step will be lost. Job quest takes priority.
+//=     Progress prior to the 5th+ step will be lost. Job quest takes priority.
 //= 1.3 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.4 Replaced effect numerics with constants. [L0ne_W0lf]
-//============================================================ 
+//= 1.5 Updated RE/Pre-RE EXP. [Euphy]
+//============================================================
 
 geffen,132,38,3	script	Bard#2	51,{
 	if (bard_q > 5) set gef_bard_q,bard_q;
@@ -40,19 +41,36 @@ geffen,132,38,3	script	Bard#2	51,{
 		mes "Ah~ There are only two things that can make this picturesque moment even more beautiful: story and song. Now then, which would you like to hear?";
 		callsub S_StorySong,1;
 
-	} else if (gef_bard_q == 15) {
-		cutin "bard_eland01",2;
-		mes "[Errende]";
-		mes "Ah, so how did it go?";
-		mes "Wait, you already found it?";
-		mes "Yes, this is it! Great!";
-		mes "This is so amazing!!";
-		mes "Ah, yes, right.";
-		mes "Right.";
-		next;
-		mes "[Errende]";
-		mes "I would like to express my gratitute. But, what would be appropriate for an adventurer";
-		mes "like yourself?";
+	} else if (gef_bard_q == 14 || gef_bard_q == 15) {
+		if (gef_bard_q == 14) {
+			cutin "bard_eland04",2;
+			mes "[Errende]";
+			mes "Hmmm?";
+			mes "Is that the seal of black...? Huh. Kino Kitty removed the one he gave me without a trace, so I surmise that he likes you a lot. Otherwise...";
+			next;
+			mes "^3355FFYou give Errende the letter";
+			mes "you have received from Kino Kitty.^000000";
+			next;
+			cutin "bard_eland01",2;
+			mes "[Errende]";
+			mes "Er, he knows everything already? From this spot of blood, I think he still has health problems. He should stop torturing himself...";
+			next;
+			mes "[Errende]";
+			mes "Thank you, I really appreciate what you've done for me. But, what would be an appropriate way to express my gratitude for an adventurer like yourself?";
+		} else {
+			cutin "bard_eland01",2;
+			mes "[Errende]";
+			mes "Ah, so how did it go?";
+			mes "Wait, you already found it?";
+			mes "Yes, this is it! Great!";
+			mes "This is so amazing!!";
+			mes "Ah, yes, right.";
+			mes "Right.";
+			next;
+			mes "[Errende]";
+			mes "I would like to express my gratitute. But, what would be appropriate for an adventurer";
+			mes "like yourself?";
+		}
 		next;
 		mes "[Errende]";
 		mes "Oh~! I have just the thing. Alright, please make yourself comfortable, and listen to my song.";
@@ -105,106 +123,28 @@ geffen,132,38,3	script	Bard#2	51,{
 		next;
 		specialeffect2 EF_RESURRECTION;
 		mes "^3355FFWhile listening to his song, you feel at ease, and your thoughts become clearer. You believe that you see the vision of an angel, and you gain some experience points.^000000";
-		set gef_bard_q,31;
-		if (BaseLevel < 56) getexp 450,0;
-		else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 550,0;
-		else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 968,0;
-		else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 1341,0;
-		else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 3576,0;
-		else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 6025,0;
-		else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 7034,0;
-		else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 9205,0;
-		else if (BaseLevel > 90) getexp 15679,0;
-		next;
-		cutin "bard_eland02",2;
-		mes "[Errende]";
-		mes "So, how do you feel now? I hope my song has refreshed you. I'm afraid it may not be enough to repay you, but please understand that this is the best way for me to express my gratitude.";
-		next;
-		mes "[Errende]";
-		mes "Besides, I've been thinking of you now as my friend, with whom I may candidly speak without any worry. And I think you have a beautiful smile. Am I wrong~? Hahaha~";
-		next;
-		mes "[Errende]";
-		mes "I hope that you'll always remain honest and respectful towards other people, and that you continue to ignore greed for fortune or power.";
-		goto L_End;
-
-	} else if (gef_bard_q == 14) {
-		cutin "bard_eland04",2;
-		mes "[Errende]";
-		mes "Hmmm?";
-		mes "Is that the seal of black...? Huh. Kino Kitty removed the one he gave me without a trace, so I surmise that he likes you a lot. Otherwise...";
-		next;
-		mes "^3355FFYou give Errende the letter";
-		mes "you have received from Kino Kitty.^000000";
-		next;
-		cutin "bard_eland01",2;
-		mes "[Errende]";
-		mes "Er, he knows everything already? From this spot of blood, I think he still has health problems. He should stop torturing himself...";
-		next;
-		mes "[Errende]";
-		mes "Thank you, I really appreciate what you've done for me. But, what would be an appropriate way to express my gratitude for an adventurer like yourself?";
-		next;
-		mes "[Errende]";
-		mes "Oh~! I have just the thing. Alright, please make yourself comfortable, and listen";
-		mes "to my song.";
-		next;
-		cutin "bard_eland03",2;
-		mes "^483D8BEvery god never grows old";
-		mes "Because of beautiful";
-		mes "Goddess, Idun.";
-		mes "Keeper of the apples of youth";
-		mes "Goddess of immortality.^000000";
-		specialeffect2 EF_STEAL;
-		next;
-		mes "^483D8BEvery god never grows old.";
-		mes "Idun, the wife of Bragi,";
-		mes "Idun, Odin's daughter in law~";
-		mes "The apples she keeps";
-		mes "In her basket.^000000";
-		next;
-		mes "^483D8BWithout Idun,";
-		mes "Every god would";
-		mes "have succumbed to age.";
-		mes "Even Thor, the strongest of gods,";
-		mes "would grow frail, Megingjard would";
-		mes "slip from his waist, and Mjolnir";
-		mes "would never fly again.^000000";
-		next;
-		mes "^483D8BWithout Idun,";
-		mes "Every god would";
-		mes "have succumbed to age.";
-		mes "Loki was careless once,";
-		mes "and made her lost to the gods.";
-		mes "He was forced to get her back.^000000";
-		specialeffect2 EF_STEAL;
-		next;
-		mes "^483D8BMy goddess stands";
-		mes "In the field of Asgard";
-		mes "She hands me fruit from heaven.";
-		mes "You will be loved by every god...";
-		mes "You will be blessed";
-		mes "By every god...^000000";
-		next;
-		specialeffect EF_BEGINSPELL6;
-		mes "^483D8BIf you share the";
-		mes "Apple of youth with me";
-		mes "Even a bite of it with";
-		mes "This poor poet.";
-		mes "You will be loved by every god...";
-		mes "You will be blessed";
-		mes "By every god...^000000";
-		next;
-		specialeffect2 EF_RESURRECTION;
-		mes "^3355FFWhile listening to his song, you feel at ease, and your thoughts become clearer. You believe that you see the vision of an angel, and you gain some experience points.^000000";
-		set gef_bard_q,30;
-		if (BaseLevel < 56) getexp 450,0;
-		else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 550,0;
-		else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 968,0;
-		else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 1341,0;
-		else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 3576,0;
-		else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 6025,0;
-		else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 7034,0;
-		else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 9205,0;
-		else if (BaseLevel > 90) getexp 15679,0;
+		set gef_bard_q, gef_bard_q + 16; //30,31
+		if (checkre(3)) {
+			if (BaseLevel < 56) getexp 450,0;
+			else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 550,0;
+			else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 968,0;
+			else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 1341,0;
+			else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 3575,0;
+			else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 6024,0;
+			else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 7034,0;
+			else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 9205,0;
+			else getexp 15678,0;
+		} else {
+			if (BaseLevel < 56) getexp 4500,0;
+			else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 5500,0;
+			else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 9684,0;
+			else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 13411,0;
+			else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 35757,0;
+			else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 60246,0;
+			else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 70340,0;
+			else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 92052,0;
+			else getexp 156786,0;
+		}
 		next;
 		cutin "bard_eland02",2;
 		mes "[Errende]";
@@ -573,7 +513,7 @@ geffen,132,38,3	script	Bard#2	51,{
 		mes "At Nine, love is reborn.";
 		mes "At Ten, my Love is gone.";
 		mes "At Eleven I find out why.";
-		if (sex)
+		if (Sex)
 			mes "At Twelve I see his new girlfriend?";
 		else
 			mes "At Twelve I see her new boyfriend?";
@@ -907,7 +847,7 @@ geffen,132,38,3	script	Bard#2	51,{
 		mes "At Nine, love is reborn.";
 		mes "At Ten, my Love is gone.";
 		mes "At Eleven I find out why.";
-		if (sex)
+		if (Sex)
 			mes "At Twelve I see her new boyfriend?";
 		else
 			mes "At Twelve I see his new girlfriend?";
@@ -1186,8 +1126,8 @@ S_StorySong:
 
 		case 1:
 			mes "[Errende]";
-			if (zeny > 499) {
-				set zeny,zeny-500;
+			if (Zeny > 499) {
+				set Zeny, Zeny-500;
 				cutin "bard_eland03",2;
 				mes "Alright.";
 				mes "Here we go~";
@@ -1311,7 +1251,7 @@ S_StorySong:
 				// For 3 and 4 cases we set more chance earlier on .@random
 				if(getarg(0) == 3 || getarg(0) == 4){
 					mes "[Errende]";
-					if (sex)
+					if (Sex)
 						mes "Heroic warrior,";
 					else
 						mes "My fair lady,";
@@ -2098,7 +2038,7 @@ morocc,134,111,3	script	Bard#3	741,{
 				}
 
 			} else {
-				if (sex) {
+				if (Sex) {
 					mes "[Kino Kitty]";
 					mes "You're such a nice young man. I will remember your name. I would much appreciate it if you would also remember mine.";
 					next;
@@ -2618,8 +2558,8 @@ payon,181,172,3	script	Bard#4	51,{
 			next;
 			switch(select("A song:A story:Maybe some other time")) {
 			case 1:
-				set @song_random,rand(1,3);
-				if (@song_random == 1) {
+				switch(rand(1,3)) {
+				case 1:
 					mes "[Gunther Doubleharmony]";
 					mes "Gunther sings!";
 					mes "Gunther dances!";
@@ -2669,7 +2609,7 @@ payon,181,172,3	script	Bard#4	51,{
 					mes "That's a very old story about rich Mr. Kim, and his rise from rags to riches to rags to riches. Is it true or is it fiction? Oh, please don't ask me! I've no clue!";
 					close;
 
-				} else if (@song_random == 2) {
+				case 2:
 					mes "[Gunther Doubleharmony]";
 					mes "*Ahem*";
 					mes "Gunther sings ";
@@ -2723,7 +2663,7 @@ payon,181,172,3	script	Bard#4	51,{
 					mes "Is it truth or fiction? But please don't ask me, I have no idea~!";
 					close;
 
-				} else {
+				case 3:
 					mes "[Gunther Doubleharmony]";
 					mes "I will sing one of Luke's songs, you know, Luke, one of the greatest Bards of his time? But I changed the words a little bit.";
 					next;
@@ -2757,8 +2697,8 @@ payon,181,172,3	script	Bard#4	51,{
 				}
 
 			case 2:
-				set @story,rand(1,3);
-				if (story == 1) {
+				switch(rand(1,3)) {
+				case 1:
 					mes "[Gunther Doubleharmony]";
 					mes "Um, have you ever";
 					mes "tasted Comodo cheese?";
@@ -2773,7 +2713,7 @@ payon,181,172,3	script	Bard#4	51,{
 					mes "Why don't you go taste it if you haven't yet? I tried to taste it once. It was kind of yummy, but then I fainted. Hahahaha~!";
 					close;
 
-				} else if (story == 2) {
+				case 2:
 					mes "[Gunther Doubleharmony]";
 					mes "I was passing Prontera the other day at the place where it used to be the Swordman training ground.";
 					next;
@@ -2787,7 +2727,7 @@ payon,181,172,3	script	Bard#4	51,{
 					mes "I got bored watching him do the same thing over and over and over again, but I think the Monster Research Organization would like him if I introduced him.";
 					close;
 
-				} else {
+				case 3:
 					mes "[Gunther Doubleharmony]";
 					mes "Have you ever been in Lutie,";
 					mes "land of year round snow?";
@@ -2964,7 +2904,7 @@ yuno_in04,33,119,3	script	Adventurer#1	828,{
 	mes "Err...?";
 	mes "What is it?";
 	next;
-	if (!sex) {
+	if (!Sex) {
 		emotion e_heh;
 		mes "[Energetic Young Man]";
 		mes "Oh...!";
diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt
index dffd650dd..852f93619 100644
--- a/npc/quests/bunnyband.txt
+++ b/npc/quests/bunnyband.txt
@@ -1,18 +1,18 @@
 //===== Hercules Script ======================================
 //= Bunny Band Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quest to obtain a Bunny Band headgear.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //	Changed @BUNYBAN back to BUNYBND, it should be this way.
 //	Removed duplicates. NPC is ALberta-only.
 //= 1.6 Cleaning. [Euphy]
-//============================================================ 
+//============================================================
 
 alberta,26,229,0	script	Kafra Employee#bunny	83,{
 	if (BUNYBND == 1) {
@@ -141,11 +141,11 @@ L_Info:
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 using duplicate command
 //= 1.2 Fixed NPC location, removed NPC dupes [Lupus]
 //= 1.3 RE-Fixed exploit V_V, also cleared used VAR [Lupus]
 //= 1.4 replaced BUNYBND with @BUNYBND [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt
index 4a5cfcd67..1b94ab8ea 100644
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -4,10 +4,8 @@
 //= Reddozen; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.8a
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Official Cooking Quest (10.3)
 //===== Additional Comments: =================================
 //= 1.1 Fixed wrong item ID, added missing ";, optimized [Lupus]
@@ -15,13 +13,13 @@
 //= 1.2 Fixed exploit, some typos [Lupus]
 //= 1.3 Fixed wrong label [Lupus] 1.3a updated to Reddozen's changes
 //= 1.3b Fixed wrong id, fixed Puch quest, added more Pouch Quest
-//= dialogues [Lupus]
+//=     dialogues [Lupus]
 //= 1.4 Fixed spelling, added some dialoguesm optimized
-//= fixed bugs. Tested, fully working [Lupus]
+//=     fixed bugs. Tested, fully working [Lupus]
 //= 1.5 More fixes [Lupus]
 //= 1.6 Quest is now up to iRO 10.3 standards. [L0ne_W0lf]
 //= - Not sure what the EnableItemMove is for, as there is no 
-//= command to disable being able to move items.
+//=   command to disable being able to move items.
 //= 1.6a Corrected a bad cutin, a Typo error ";;" and a bad delitem (bugreport:911) [Samuray22]
 //= 1.6b Corrected a "donpcevent" missing a ":". (bugreport:962) [Samuray22]
 //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
@@ -30,8 +28,7 @@
 //============================================================
 
 prt_castle,43,30,3	script	Charles Orleans#cook	878,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (MaxWeight - Weight < 2000) {
 		mes "[Charles Orleans]";
 		mes "Just one second.";
 		mes "You're carrying too";
@@ -44,7 +41,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		end;
 	}
 	if (BaseJob == Job_Novice) {
-		if (sex) {
+		if (Sex) {
 			cutin "orleans_5",0;
 			mes "[Charles Orleans]";
 			mes "Excuse me, monsieur?";
@@ -81,7 +78,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		goto L_End;
 	}
 	else if (getequipid(1) != 5026) {
-		if (sex) {
+		if (Sex) {
 			cutin "orleans_5",0;
 			emotion e_an;
 			mes "[Charles Orleans]";
@@ -1482,8 +1479,7 @@ L_End:
 }
 
 prt_castle,45,35,5	script	Madeleine Chu#cook	886,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (MaxWeight - Weight < 2000) {
 		mes "[Madeleine Chu]";
 		mes "I'm sorry, but right now";
 		mes "you're carrying too many";
@@ -2095,7 +2091,7 @@ S_SellSets:
 	}
 	set .@total_cost,.@sell * .@item_cost;
 	set .@total_weight,.@sell * .@item_weight;
-	if (zeny < .@total_cost) {
+	if (Zeny < .@total_cost) {
 		mes "[Madeleine Chu]";
 		mes "Oh, I'm sorry, but you";
 		mes "can't afford this many";
@@ -2112,7 +2108,7 @@ S_SellSets:
 		mes getitemname(getarg(0))+"...";
 		close;
 	}
-	set zeny,zeny-.@total_cost;
+	set Zeny, Zeny-.@total_cost;
 	getitem getarg(0),.@sell;
 	mes "[Madeleine Chu]";
 	mes "Here you are~";
@@ -2191,7 +2187,7 @@ payon,209,127,3	script	Servant	88,{
 		next;
 		switch(select("Sure, I'll buy one!:No, thanks.:Actually, Madeleine sent me...")) {
 		case 1:
-			if (zeny < 200) {
+			if (Zeny < 200) {
 				mes "[Chulsoo]";
 				mes "Oh, I'm sorry, but";
 				mes "you don't have enough";
@@ -2200,7 +2196,7 @@ payon,209,127,3	script	Servant	88,{
 				mes "raise 200 zeny, right?";
 				close;
 			}
-			set zeny,zeny-200;
+			set Zeny, Zeny-200;
 			getitem 555,1; //Rice_Cake
 			mes "[Chulsoo]";
 			mes "Thank you very";
@@ -2362,7 +2358,7 @@ payon,209,127,3	script	Servant	88,{
 		mes "it's oh-so-delicious~";
 		next;
 		if (select("Sure, I'll buy one!:No, thanks.") == 1) {
-			if (zeny < 200) {
+			if (Zeny < 200) {
 				mes "[Chulsoo]";
 				mes "Oh, I'm sorry, but";
 				mes "you don't have enough";
@@ -2371,7 +2367,7 @@ payon,209,127,3	script	Servant	88,{
 				mes "raise 200 zeny, right?";
 				close;
 			}
-			set zeny,zeny-200;
+			set Zeny, Zeny-200;
 			getitem 555,1; //Rice_Cake
 			mes "[Chulsoo]";
 			mes "Thank you very";
diff --git a/npc/quests/counteragent_mixture.txt b/npc/quests/counteragent_mixture.txt
index f5558586a..dc54d625a 100644
--- a/npc/quests/counteragent_mixture.txt
+++ b/npc/quests/counteragent_mixture.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Counteragent and Mixture Quest(Morgenstein)
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
 //= added some dialogs for Morgenstein by Komurka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2b
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis COnversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Counteragent and Mixtures for making dyes & Alchemist Job Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 2.2a A few minor fixes. (bugreport:1122) [L0ne_W0lf]
 //= 2.2b Follow up fixes to bugreport:1122 [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 alberta_in,133,55,3	script	Louitz#cm	84,{
 	if (molgenstain == 2) {
@@ -471,7 +469,7 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 					delitem 970,1; //Alchol
 					delitem 971,1; //Detrimindexta
 					delitem 713,1; //Empty_Bottle
-					set zeny,zeny-3000;
+					set Zeny, Zeny-3000;
 					getitem 973,1; //Counteragent
 					mes "[Chemist Molgenstein]";
 					mes "Hee hee hee...";
@@ -515,7 +513,7 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 					delitem 970,1; //Alchol
 					delitem 972,1; //Karvodailnirol
 					delitem 713,1; //Empty_Bottle
-					set zeny,zeny-4000;
+					set Zeny, Zeny-4000;
 					getitem 974,1; //Mixture
 					mes "[Chemist Molgenstein]";
 					mes "Hee hee hee...";
@@ -579,9 +577,9 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Fully working
 //= 1.1 Update for Alchemist Quest.
 //= 1.2 added check for Empty Bottle [Lupus]
@@ -592,4 +590,4 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 //= 1,7 Fixed exploit
 //= 1.8 Got rid of 'al_morgen' var [Lupus]
 //= 2.1 now uses (MISC_QUEST & 4) bit instead of al_morgen [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt
index 028b71016..a5c7f0149 100644
--- a/npc/quests/dandelion_request.txt
+++ b/npc/quests/dandelion_request.txt
@@ -1,15 +1,16 @@
 //===== Hercules Script ======================================
 //= Dandelion's Request / Morocc Invasion quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= SinSloth
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.3
+//===== Description: =========================================
 //= A Morroc quest that is no longer used.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed a small bug in Dandelion's Request. [SinSloth]
 //= 1.2 Moved Dandelion's Request to its own file.
-//============================================================ 
+//= 1.3 Added GM management function. [Euphy]
+//============================================================
 
 izlude,103,106,3	script	Guildsman#1	48,3,3,{
 
@@ -2723,16 +2724,12 @@ que_job01,49,49,5	script	Tao	877,{
 
 que_job01,51,55,1	script	#roombar1	45,1,1,{
 
-OnInit:
-	set $maobar_room,0;
-	end;
-	
 OnTouch:
 	if(mao_request == 2 || mao_request == 24 || mao_request == 28 || mao_request == 29 || mao_request == 123 || mao_request == 126 || mao_request == 127 || prt_curse == 24)
 	{
-		if(!$maobar_room)
+		if(!$@maobar_room)
 		{
-			set $maobar_room,1;
+			set $@maobar_room,1;
 			donpcevent "#maobartimer1::OnEnter";
 			if(mao_request == 2 || mao_request == 28 || mao_request == 29 || mao_request == 126 || mao_request == 127)
 			{
@@ -2845,10 +2842,6 @@ OnTouch:
 
 que_job01,51,44,1	script	#roombar2	45,1,1,{
 
-OnInit:
-	set $maobar_room2,0;
-	end;
-	
 OnTouch:
 	if(mao_request == 25 || (mao_request > 102 && mao_request < 123))
 	{
@@ -2863,9 +2856,9 @@ OnTouch:
 			warp "que_job01",52,50;
 			end;
 		}
-		if(!$maobar_room2)
+		if(!$@maobar_room2)
 		{
-			set $maobar_room2,1;
+			set $@maobar_room2,1;
 			donpcevent "#maobartimer2::OnEnter";
 			if(mao_request == 25)
 			{
@@ -7932,7 +7925,7 @@ OnTouch:
 	mes ".........";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "...Isn't the moon";
 	mes "so beautiful tonight?";
@@ -7978,7 +7971,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "So, you telling me you";
 	mes "don't know how this town";
@@ -8035,7 +8028,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Hmpf.";
 	mes "It has begun.";
@@ -8087,7 +8080,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Sir, our investigation has";
 	mes "turned something up. Every";
@@ -8124,7 +8117,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Wh-what's with";
 	mes "all of this noise?";
@@ -8197,7 +8190,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Jeez, what's going";
 	mes "on? Where the heck";
@@ -8915,7 +8908,7 @@ OnTouch:
 	mes ".........";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "...Isn't the moon";
 	mes "so beautiful tonight?";
@@ -8961,7 +8954,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "So, you telling me you";
 	mes "don't know how this town";
@@ -9018,7 +9011,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Hmpf.";
 	mes "It has begun.";
@@ -9070,7 +9063,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Sir, our investigation has";
 	mes "turned something up. Every";
@@ -9107,7 +9100,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Wh-what's with";
 	mes "all of this noise?";
@@ -9180,7 +9173,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Jeez, what's going";
 	mes "on? Where the heck";
@@ -10227,9 +10220,7 @@ que_job01,68,88,5	script	Simon#mao	881,{
 que_job01,70,84,1	duplicate(Simon#mao)	Kimmie	882,0,0
 
 sec_in02,38,162,0	script	Morroc Invasion Manager	882,{
-
-	if(getgmlevel() < 80) end;
-
+	callfunc "F_GM_NPC";
 	mes "A total of " + $maoattack + " users completed";
 	mes "the Satan Morroc: Lin Quest.";
 	mes "There are 2 requirements to";
diff --git a/npc/quests/doomed_swords.txt b/npc/quests/doomed_swords.txt
index 2c443076f..16b34331b 100644
--- a/npc/quests/doomed_swords.txt
+++ b/npc/quests/doomed_swords.txt
@@ -3,11 +3,9 @@
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.6
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.5
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Doomed Swords Quest:
 //= - Quest for Doomed Swords: Grimtooth, Mysteltain, Executioner.
 //=   Although this quest is enabled on iRO, the Mysteltainn
@@ -19,9 +17,8 @@
 //= 1.1 Fixed items count check. For all 3 swords... [Lupus]
 //= 1.3 Fixed exploit [Lupus]
 //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Moved all non-related NPCs to their repsective files.
+//=     Moved all non-related NPCs to their repsective files.
 //= 1.5 Added missing checkweight. [L0ne_W0lf]
-//= 1.6 Removed Nain [Streusel]
 //============================================================
 
 prt_in,162,11,2	script	Ghatu#magum	86,{
@@ -211,6 +208,50 @@ morocc,281,178,2	script	Cetsu#magum	97,{
 	close;
 }
 
+izlude_in,173,88,2	script	Nain#magum	102,{
+	if (dmdswrd_Q2 == 4) {
+		mes "[Nain]";
+		mes "It doesn't matter how";
+		mes "powerful the Executioner";
+		mes "is: if it were to end up in";
+		mes "my hands, I would get rid";
+		mes "of it right away. I'd never risk losing my mind to that curse...";
+		close;
+	}
+	mes "[Nain]";
+	mes "Long ago, one sword";
+	mes "was used to behead all";
+	mes "the criminals that had been";
+	mes "sentenced to death. That";
+	mes "accursed blade is known";
+	mes "as the Executioner.";
+	next;
+	mes "[Nain]";
+	mes "As the Executioner slayed";
+	mes "more criminals, the rage and";
+	mes "bloodlust of its victims began";
+	mes "to accumulate upon the blade.";
+	mes "Although the sword gained great^FFFFFF ^000000 strength, it was tainted by evil.";
+	next;
+	mes "[Nain]";
+	mes "The last person to wield";
+	mes "the Executioner almost lost";
+	mes "his mind to the sword. He saved^FFFFFF ^000000 himself by giving it to a talented";
+	mes "blacksmith who would destroy^FFFFFF ^000000 it for him, thus saving his soul.";
+	next;
+	mes "[Nain]";
+	mes "This mysterious blacksmith";
+	mes "was never seen again in the";
+	mes "city of Prontera, but rumor has";
+	mes "it that if you can find him, he";
+	mes "can forge that accursed";
+	mes "Executioner anew...";
+	if (event_magum == 1)
+		set event_magum,5;
+	set dmdswrd_Q2,dmdswrd_Q2 | 4;
+	close;
+}
+
 pay_fild08,218,283,2	script	Mysterious Man#magum	89,{
 	if (checkweight(1201,1) == 0) {
 		mes "[Mysterious Man]";
diff --git a/npc/quests/doomed_swords_quest.txt b/npc/quests/doomed_swords_quest.txt
index 6c723d8aa..172d90caa 100644
--- a/npc/quests/doomed_swords_quest.txt
+++ b/npc/quests/doomed_swords_quest.txt
@@ -4,10 +4,8 @@
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= - Creation of Doomed Swords: Grimtooth, Mysteltain, and
 //=   Executioner.
 //= - Continuation of the Comodo Quest
diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt
index 841e93734..3daf992fb 100644
--- a/npc/quests/eye_of_hellion.txt
+++ b/npc/quests/eye_of_hellion.txt
@@ -1,25 +1,26 @@
 //===== Hercules Script ======================================
-//= The Eye of Hellion Quest.
+//= The Eye of Hellion Quest
 //===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
-//= 1.9
+//= 2.1
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Quest for getting a Nile Rose
 //= There are two versions of this quest.
-//= Version 1 (Not implemented) was used on iRO as an event
-//= for it's anniversary, while version 2 (this version),
+//= Version 1 (not implemented) was used on iRO as an event
+//= for its anniversary, while version 2 (this version)
 //= is the one that remained active on main servers.
 //===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Tracking variable is not backwards compatable meaning
+//=     Tracking variable is not backwards compatable meaning
 //=     you can again repeat this quest from the start.
 //= 1.6 Fixed issue with #prt_key-1-1. [L0ne_W0lf]
-//= 1.7 Corrected reminants from aegis conversion. [L0en_w0lf]
+//= 1.7 Corrected remnants from Official Conversion. [L0ne_W0lf]
 //= 1.8 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.9 Removed duplicate text. [Kisuka]
-//= 2.0 Corrected EXP reward
+//= 2.0 Updated EXP rewards.
+//= 2.1 Updated RE/Pre-RE EXP. [Euphy]
 //============================================================
 
 morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
@@ -546,7 +547,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
 			set HELLIONQ,69;
 			getitem 2658,1; //Nile_Rose_
 			getitem 603,1; //Old_Blue_Box
-			getexp 1200000,0;
+			getexp (checkre(3))?120000:1200000,0;
 			next;
 			mes "[Sir Chilias'Tyus]";
 			mes "Thank you, kind";
@@ -613,7 +614,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
 			delitem 7332,1; //Slate
 			set HELLIONQ,70;
 			getitem 2658,1; //Nile_Rose_
-			getexp 1000000,0;
+			getexp (checkre(3))?100000:1000000,0;
 			next;
 			mes "[Sir Chilias'Tyus]";
 			mes "Thank you, kind";
@@ -1370,7 +1371,7 @@ payon,182,132,3	script	Grout'he Tuccok#hellion	48,{
 					mes "clean and pure Skirt of Virgin.";
 					mes "If you got any more questions,";
 					mes "I guess you can ask me later~";
-					set zeny,zeny-10000;
+					set Zeny, Zeny-10000;
 					set HELLIONQ,48;
 					getitem 953,1; //Stone_Heart
 					getitem 511,1; //Green_Herb
@@ -2436,12 +2437,12 @@ OnTouch:
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 First version [MasterOfMuppets]
 //= 1.1 a ',' that should be ';' [FlavioJS]
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.4 Moved Enoz from the wizard quest skill to here. [L0ne_W0lf]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index f53596cd0..3f845faaf 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -1,17 +1,15 @@
 //===== Hercules Script ======================================
 //= Acolyte Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.9
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
-//= Tutorial for Acolyte Class
-//===== Additional Comments: ================================= 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Acolyte training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
-//=	TODO: Test, Add correct misceffects numbers
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.3 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.4 Misc. updates. [L0ne_W0lf]
@@ -21,7 +19,7 @@
 //= 1.7 Fixed exp, texts, and requirements in pre-renewal [Daegaladh]
 //= 1.8 Updated to match the official script. [Euphy]
 //= 1.9 Added GM management function. [Euphy]
-//============================================================ 
+//============================================================
 
 // Priest Praupin
 //============================================================
@@ -1779,8 +1777,9 @@ prt_monk,223,123,3	script	Eavesdrop#tu	111,{
 		close;
 	}
 }
-/*
+
 sec_in02,17,156,3	script	1st Job Quest Reset	726,{
+	callfunc "F_GM_NPC";
 	mes "[1st Job Quest]";
 	mes "Which would you like to reset?";
 	next;
@@ -1808,4 +1807,3 @@ sec_in02,17,156,3	script	1st Job Quest Reset	726,{
 	mes "Completed.";
 	close;
 }
-*/
\ No newline at end of file
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 2f95cf11a..b965ae05d 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -1,19 +1,18 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Archer Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
-//= 1.9a
-//===== Compatible With: ===================================== 
-//= rAthena SVN (Testet in Trunk 88xx)
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 2.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Archer training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
-//= 1.1 optimized [Lupus] 1.2 fixed Weight check
-//=	TODO: Test, Add correct misceffects numbers
+//= 1.1 optimized [Lupus]
+//= 1.2 fixed Weight check
 //= 1.3 Moved Master Kavaruk (overlapped Phantasmic Arrow
-//=	Skill quest NPC) [Lupus]
+//=     Skill quest NPC) [Lupus]
 //= 1.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Fixed infinate loop. (bugreport:2393) [L0ne_W0lf]
@@ -21,7 +20,9 @@
 //= 1.8 Updated slightly, removed additional emotions from Reiden. [L0ne_W0lf]
 //= 1.9 Misc. updates. [L0ne_W0lf]
 //= 1.9a Added 'npcskill' command. [Euphy]
-//============================================================ 
+//= 2.0 Updated to match the official script. [Euphy]
+//=     Added Pre-Renewal support.
+//============================================================
 
 // Bard Jet
 //============================================================
@@ -278,7 +279,7 @@ payon_in02,54,13,3	script	Master Kavaruk	55,{
 				next;
 				mes "[Master Kavaruk]";
 				mes "I asked a member of Icarus to";
-				mes "wander about the Rune-Midgarts Kingdom and gather news and information about what has been going on recenty.";
+				mes "wander about the Rune-Midgarts Kingdom and gather news and information about what has been going on recently.";
 				next;
 				mes "[Master Kavaruk]";
 				mes "He has been sending me letters containing detailed information, but all of a sudden, I've lost contact with him. I'm concerned over what may have happened.";
@@ -305,7 +306,10 @@ payon_in02,54,13,3	script	Master Kavaruk	55,{
 				mes "for bringing me the news. As Arthail has said, I shall wait until he has more news for me.";
 				mes "You should also train and prepare for the future as well.";
 				set tu_archer02, 10;
-				getexp 200,100;
+				if (checkre(3))
+					getexp 1000,1000;
+				else
+					getexp 2000,1000;
 				close;
 			}
 		}
@@ -543,7 +547,10 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 					set tu_archer01, 6;
 					mes "Now, your first assignment";
 					mes "is to learn ^3131FFLevel 3 Owl's Eye^000000!";
-					mes "From Morroc, if you travel south, you can fight Condors for your training.";
+					if (checkre(0))
+						mes "From Morroc, if you travel south, you can fight Condors for your training.";
+					else
+						mes "From Prontera, if you travel south, south and then west, you can fight Condors for your training.";
 					next;
 					mes "[Reidin Corse]";
 					mes "You can head somewhere";
@@ -553,11 +560,20 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 					switch(select("I'll follow your advice, Chief!:I'll hunt somewhere else...")) {
 					case 1:
 						mes "[Reidin Corse]";
-						mes "I'll send you to";
-						mes "Morroc for now,";
-						mes "so don't forget the";
-						mes "directions I gave you.";
-						mes "Travel ^3131FFsouth^000000.";
+						if (checkre(0)) {
+							mes "I'll send you to";
+							mes "Morroc for now,";
+							mes "so don't forget the";
+							mes "directions I gave you.";
+							mes "Travel ^3131FFsouth^000000.";
+						} else {
+							mes "I'll send you to";
+							mes "Prontera for now,";
+							mes "so don't forget the";
+							mes "directions I gave you.";
+							mes "Travel ^3131FFsouth^000000, ^3131FFsouth^000000,";
+							mes "and then ^3131FFwest^000000.";
+						}
 						next;
 						switch(select("Leave right away~:W-wait, let me get ready!")) {
 						case 1:
@@ -573,9 +589,15 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 							mes "[Reidin Corse]";
 							mes "Okay...!";
 							mes "Off you go!";
-							mes "To Morroc!";
-							close2;
-							warp "morocc",156,46;
+							if (checkre(0)) {
+								mes "To Morroc!";
+								close2;
+								warp "morocc",156,46;
+							} else {
+								mes "To Prontera!";
+								close2;
+								warp "prontera",116,72;
+							}
 							end;
 						case 2:
 							mes "[Reidin Corse]";
@@ -601,7 +623,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 					emotion e_ag;
 					mes "Huh. So you already know a little about Owl's Eye already, huh? Well then, I guess I oughta talk about something you don't know about!";
 					set tu_archer01, 7;
-					getexp 50,0;
+					getexp 500,0;
 					close;
 				}
 				break;
@@ -628,7 +650,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 				mes "Here, this is a small, special reward for you.";
 				specialeffect2 EF_WIND;
 				set tu_archer01, 7;
-				getexp 50,0;
+				getexp 500,0;
 				next;
 				emotion e_pif;
 				mes "[Reidin Corse]";
@@ -709,7 +731,10 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 
 			set .@eagle, getskilllv("AC_VULTURE");
 			if(.@eagle < 3){
-				mes "Alright, Mandagora usually live around Geffen. I can send you to Geffen, so just travel north from there to find";
+				if (checkre(0))
+					mes "Alright, Mandagora usually live around Geffen. I can send you to Geffen, so just travel north from there to find";
+				else
+					mes "Alright, Mandagora usually live around Mt. Mjolnir. I can send you to Prontera, so just travel north, then east from there to find";
 				mes "some of them.";
 				next;
 				mes "[Reidin Corse]";
@@ -738,7 +763,10 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 					mes "Alright...!";
 					mes "Get a move on!";
 					close2;
-					warp "geffen",120,39;
+					if (checkre(0))
+						warp "geffen",120,39;
+					else
+						warp "prontera",116,72;
 					end;
 				case 2:
 					mes "[Reidin Corse]";
@@ -763,7 +791,10 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 		} else if(tu_archer01 == 8){
 			set .@eagle, getskilllv("AC_VULTURE");
 			if(.@eagle < 3){
-				mes "Mandagora lives in the area north of Geffen. Learn up to Level 3 Vulture's Eye and get acquainted with your attack range.";
+				if (checkre(0))
+					mes "Mandagora lives in the area north of Geffen. Learn up to Level 3 Vulture's Eye and get acquainted with your attack range.";
+				else
+					mes "Mandagora lives in the area north and east of Prontera. Learn up to Level 3 Vulture's Eye and get acquainted with your attack range.";
 				next;
 				mes "[Reidin Corse]";
 				mes "Okay...";
@@ -776,7 +807,10 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 					mes "Alright...!";
 					mes "Get a move on!";
 					close2;
-					warp "geffen",120,39;
+					if (checkre(0))
+						warp "geffen",120,39;
+					else
+						warp "prontera",116,72;
 					end;
 				case 2:
 					mes "[Reidin Corse]";
@@ -843,7 +877,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 				if(.@eagle == 0){
 					specialeffect2 EF_WIND;
 					set tu_archer01, 10;
-					getexp 0,50;
+					getexp 0,500;
 				}
 				emotion e_no1;
 				next;
@@ -857,48 +891,75 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 				close;
 			}
 		} else if(tu_archer01 == 10){
-			mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!";
-			emotion e_no1;
-			next;
-			mes "[Reidin Corse]";
-			mes "Rockers live just southwest of Prontera.";
-			next;
-			mes "[Reidin Corse]";
-			mes "Be aware that Rockers are earth element monsters!! ^3131FFSo they should be weak against fire^000000.";
-			next;
-			mes "[Reidin Corse]";
-			mes "Now go and bring ^3131FF10 Grasshopper's Leg^000000 from hunting Rockers.";
-			mes "Bring all of that and you pass~";
-			next;
-			mes "[Reidin Corse]";
-			mes "It's easier to find them if you pass by the southern gate of Prontera and then head west. Alright, off you go, " + strcharinfo(0) + "~";
+			if (checkre(0)) {
+				mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!";
+				emotion e_no1;
+				next;
+				mes "[Reidin Corse]";
+				mes "Rockers live just southwest of Prontera.";
+				next;
+				mes "[Reidin Corse]";
+				mes "Be aware that Rockers are earth element monsters!! ^3131FFSo they should be weak against fire^000000.";
+				next;
+				mes "[Reidin Corse]";
+				mes "Now go and bring ^3131FF10 Grasshopper's Leg^000000 from hunting Rockers.";
+				mes "Bring all of that and you pass~";
+				next;
+				mes "[Reidin Corse]";
+				mes "It's easier to find them if you pass by the southern gate of Prontera and then head west. Alright, off you go, " + strcharinfo(0) + "~";
+			} else {
+				mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!";
+				emotion e_no1;
+				next;
+				mes "[Reidin Corse]";
+				mes "There's a ship that";
+				mes "leads to Byalan Island in Izlude, Prontera's satellite city. Ride that ship to Byalan Island.";
+				next;
+				mes "[Reidin Corse]";
+				mes "In the center of that island is the entrance to a dungeon where a lot of Hydras live. Remember that it's a water dungeon, and that ^3131FFWater resists Fire^000000, ^3131FFbut is weak against Wind^000000.";
+				next;
+				mes "[Reidin Corse]";
+				mes "Now go and bring ^3131FF10 Tentacles^000000";
+				mes "from hunting Hydra and ^3131FF1 Crystal Blue^000000, which you can get from hunting the Mushrooms there.";
+				mes "Bring all of that and you pass~";
+				next;
+				mes "[Reidin Corse]";
+				mes "It's easier to find Izlude if you pass by Prontera, so head towards the fields near Prontera. Alright, off you go, " + strcharinfo(0) + "~";
+			}
 			set tu_archer01,11;
 			close;
 		} else if(tu_archer01 == 11){
-			if(countitem(940) > 9){
-				if(MaxWeight - Weight < 1000){
-					mes "Why are you carrying";
-					mes "so much stuff? You better put everything you don't need into Kafra Storage.";
-					close;
-				} else {
-					mes "Hey, you're back!";
-					mes "Let's see now...";
-					next;
-					emotion e_no1;
-					mes "[Reidin Corse]";
-					mes "Good! You pass.";
-					mes "Don't forget that you gotta keep training and improve your skills. Before you know it, you'll be an expert almost as good as me!";
-					specialeffect2 EF_WIND;
-					set tu_archer01, 12;
-					getexp 100,100;
-					getitem 1707,1; //Great_Bow
-					close;
-				}
-			} else {
+			if (checkre(0) && countitem(940) < 10) {
 				mes "Hey...";
 				mes "You gotta bring";
 				mes "^3131FF10 Grasshopper's Leg^000000 to pass my midterm! Go back to the southwest area of Prontera and get them!";
 				close;
+			} else if (!checkre(0) && (countitem(962) < 10 || countitem(991) == 0)) {
+				mes "Hey...";
+				mes "You gotta bring";
+				mes "^3131FF10 Tentacles^000000 and";
+				mes "^3131FF1 Crystal Blue^000000 to pass my midterm! Go back to the dungeon on Byalan Island and get them!";
+				close;
+			}
+			if(MaxWeight - Weight < 1000){
+				mes "Why are you carrying";
+				mes "so much stuff? You better put everything you don't need into Kafra Storage.";
+				close;
+			} else {
+				mes "Hey, you're back!";
+				mes "Let's see now...";
+				next;
+				emotion e_no1;
+				mes "[Reidin Corse]";
+				mes "Good! You pass.";
+				mes "Don't forget that you gotta keep training and improve your skills. Before you know it, you'll be an expert almost as good as me!";
+				specialeffect2 EF_WIND;
+				set tu_archer01, 12;
+				if (checkre(0))
+					delitem 940,10; //Grasshopper's_Leg
+				getexp 1000,1000;
+				getitem 1707,1; //Great_Bow
+				close;
 			}
 		} else if(tu_archer01 == 12){
 			mes "Alright, now there's only";
@@ -940,8 +1001,13 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 			mes "no need for you to fret.";
 			next;
 			mes "[Reidin Corse]";
-			mes "Now, go into the forest east of Payon and hunt Spores and Wormtails. Your test will be to bring back ^3131FF10 Mushroom Spores^000000 and";
-			mes "^3131FF10 Pointed Scales^000000.";
+			if (checkre(0)) {
+				mes "Now, go into the forest east of Payon and hunt Spores and Wormtails. Your test will be to bring back ^3131FF10 Mushroom Spores^000000 and";
+				mes "^3131FF10 Pointed Scales^000000.";
+			} else {
+				mes "Now, go to Mt. Mjolnir and hunt Floras. Your test will be to bring back ^3131FF5 Maneater Blossoms^000000 and";
+				mes "^3131FF20 Stems^000000.";
+			}
 			next;
 			mes "[Reidin Corse]";
 			mes "I know it's a little dangerous,";
@@ -968,49 +1034,81 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 				close;
 			}
 		} else if((tu_archer01 == 14) || (tu_archer01 == 15)){
-			if((countitem(906) > 9) && (countitem(921) > 9)){
-				mes "Ha-ha~!";
-				mes "You look more like";
-				mes "a veteran than a rookie";
-				mes "now! Yeap, I can see it";
-				mes "in your eyes.";
-				next;
-				mes "[Reidin Corse]";
-				mes "Right, did you get a chance to meet my Acolyte pal, Mafra? She's pretty shy, but I hope you two got along.";
-				next;
-				mes "[Reidin Corse]";
-				mes "I'm happy to tell";
-				mes "you that you've passed";
-				mes "my final exam! Here, take";
-				mes "this little reward!";
-				specialeffect2 EF_WIND;
-				set tu_archer01,16;
-				getexp 300,300;
-				getitem 1770,500; //Iron_Arrow
-				next;
-				mes "[Reidin Corse]";
-				mes "Well, it's like you're a full fledged Archer now. Honestly,";
-				mes "I've got nothing more to teach you. Well, about archery, anyway.";
-				emotion e_heh;
-				next;
-				mes "[Reidin Corse]";
-				mes "Well, if you talk to him, Master Kavaruk might have something for you to do. He happens to have me running around to doing errands";
-				mes "for him too. That creep!";
-				emotion e_pif;
-				next;
-				mes "[Reidin Corse]";
-				mes "Well, "+ strcharinfo(0) +",";
-				mes "It'd make me really happy if you get to the point where you develop a true love for the art of archery. I'll see you sometime, okay?";
-				emotion e_no1;
-				close;
-			} else {
+			if (checkre(0) && (countitem(906) < 10 || countitem(921) < 10)) {
 				mes "Remember, you";
 				mes "need to head into";
 				mes "the forest east of Payon and get me";
 				mes "^3131FF10 Mushroom Spores^000000";
 				mes "and ^3131FF10 Pointed Scales^000000.";
 				close;
+			} else if (!checkre(0) && (countitem(1032) < 5 || countitem(905) < 20)) {
+				mes "Remember, you";
+				mes "need to head over to";
+				mes "Mt. Mjolnir and get me";
+				mes "^3131FF5 Maneater Blossoms^000000";
+				mes "and ^3131FF20 Stems^000000.";
+				next;
+				mes "[Reidin Corse]";
+				mes "From Prontera, you'd get to Mt. Mjolnir by traveling ^3131FFnorth^000000, ^3131FFnorth^000000 and then ^3131FFeast^000000. But if you want,";
+				mes "I can just send you there.";
+				next;
+				switch(select("Go!:W-Wait!")) {
+				case 1:
+					mes "[Reidin Corse]";
+					mes "Alright!";
+					mes "Oh, and if you get";
+					mes "the chance, give a hello to my Acolyte pal over there for me~";
+					emotion e_heh;
+					close2;
+					warp "mjolnir_11",25,221;
+					end;
+				case 2:
+					mes "[Reidin Corse]";
+					mes "Huh?";
+					mes "Um, sure. But";
+					mes "there's no reason to";
+					mes "get so nervous, even if";
+					mes "this my final exam for you.";
+					close;
+				}
 			}
+			mes "Ha-ha~!";
+			mes "You look more like";
+			mes "a veteran than a rookie";
+			mes "now! Yeap, I can see it";
+			mes "in your eyes.";
+			next;
+			mes "[Reidin Corse]";
+			mes "Right, did you get a chance to meet my Acolyte pal, Mafra? She's pretty shy, but I hope you two got along.";
+			next;
+			mes "[Reidin Corse]";
+			mes "I'm happy to tell";
+			mes "you that you've passed";
+			mes "my final exam! Here, take";
+			mes "this little reward!";
+			specialeffect2 EF_WIND;
+			set tu_archer01,16;
+			if (checkre(3))
+				getexp 1000,1000;
+			else
+				getexp 3000,3000;
+			getitem 1770,500; //Iron_Arrow
+			next;
+			mes "[Reidin Corse]";
+			mes "Well, it's like you're a full fledged Archer now. Honestly,";
+			mes "I've got nothing more to teach you. Well, about archery, anyway.";
+			emotion e_heh;
+			next;
+			mes "[Reidin Corse]";
+			mes "Well, if you talk to him, Master Kavaruk might have something for you to do. He happens to have me running around to doing errands";
+			mes "for him too. That creep!";
+			emotion e_pif;
+			next;
+			mes "[Reidin Corse]";
+			mes "Well, "+ strcharinfo(0) +",";
+			mes "It'd make me really happy if you get to the point where you develop a true love for the art of archery. I'll see you sometime, okay?";
+			emotion e_no1;
+			close;
 		} else if(tu_archer01 == 16){
 			mes "I really like this town.";
 			mes "There's so much lush greenery";
@@ -1280,13 +1378,13 @@ pay_arche,84,139,3	script	Seisner	727,{
 		specialeffect2 EF_WIND;
 		set tu_archer01, 3;
 		if(JobLevel == 1){
-			getexp 0,5;
+			getexp 0,30;
 		} else if((JobLevel > 1) && (JobLevel < 11)){
-			getexp 0,10;
+			getexp 0,80;
 		} else if((JobLevel > 10) && (JobLevel < 21)){
-			getexp 0,25;
+			getexp 0,100;
 		} else {
-			getexp 0,50;
+			getexp 0,120;
 		}
 		end;
 	}
@@ -1295,11 +1393,11 @@ pay_arche,84,139,3	script	Seisner	727,{
 
 // Target
 //============================================================
-pay_arche,76,135,3	script	Target#Target	111,{ end; }	// empty NPC?? [Jukka]
+pay_arche,76,135,3	script	#Target	111,{ end; }
 
 // Acolyte
 //============================================================
-pay_fild08,40,83,5	script	Acolyte#tu	95,{
+-	script	::Acolyte_Tu	-1,{
 	mes "[Acolyte]";
 	if(tu_archer01 == 14){
 		if(gettime(3) >= 18 && gettime(3) < 22){
diff --git a/npc/quests/first_class/tu_ma_th01.txt b/npc/quests/first_class/tu_ma_th01.txt
index 72c1d4914..6bbe5c456 100644
--- a/npc/quests/first_class/tu_ma_th01.txt
+++ b/npc/quests/first_class/tu_ma_th01.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script ======================================= 
-//= Theif Mage Quest Story Mode
-//===== By: ================================================== 
+//===== Hercules Script ======================================
+//= Thief Mage Quest Story Mode
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN (Testet in Trunk 88xx)
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Battle Traces from Thief and Magician training quests.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
-//=	TODO: Test, Add correct misceffects numbers
 //= 1.2 Changed "battle_trace" to "Trace of Battle". [L0ne_W0lf]
 //= 1.3 Misc. updates. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 // Battle Traces 1
 //============================================================
@@ -32,7 +30,7 @@ moc_fild12,166,369,0	script	Trace of Battle#1	844,{
 			mes "of acute dizziness overcomes";
 			mes "you after examining the scene.^000000";
 			set tu_thief01, 6;
-			sc_start SC_Poison,60000,0;
+			sc_start SC_POISON,60000,0;
 			specialeffect EF_VENOMDUST2;
 			close;
 		} else if(tu_thief01 == 6){
@@ -40,7 +38,7 @@ moc_fild12,166,369,0	script	Trace of Battle#1	844,{
 			mes "used in a battle. A feeling";
 			mes "of acute dizziness overcomes";
 			mes "you after examining the scene.^000000";
-			sc_start SC_Poison,60000,0;
+			sc_start SC_POISON,60000,0;
 			specialeffect EF_VENOMDUST2;
 			close;
 		} else if(tu_thief01 == 7){
@@ -1003,7 +1001,7 @@ moc_fild18,109,197,0	script	Trace of Battle#15	844,{
 				mes "^3355FFBy sheer accident,";
 				mes "you set off one of";
 				mes "the traps in the area.^000000";
-				sc_start SC_Poison,60000,0;
+				sc_start SC_POISON,60000,0;
 				specialeffect EF_VENOMDUST2;
 				percentheal -30,0;
 				close;
@@ -1157,7 +1155,7 @@ moc_fild18,109,197,0	script	Trace of Battle#15	844,{
 				mes "^3355FFBy sheer accident,";
 				mes "you set off one of";
 				mes "the traps in the area.^000000";
-				sc_start SC_Poison,60000,0;
+				sc_start SC_POISON,60000,0;
 				specialeffect EF_VENOMDUST2;
 				percentheal -30,0;
 				close;
diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index 9beb55b5b..a616c2f0d 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -1,20 +1,19 @@
-//===== rAthena Script ======================================= 
-//= Magican Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== Hercules Script ======================================
+//= Magician Class Tutorial and Job Specific Quest
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN (Testet in Trunk 88xx)
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
+//= [Official Conversion]
+//= Magician training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
 //= 1.1 Optimized [Lupus]
-//=	TODO: Test, Add proper misceffects
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.3 Misc. updates. [L0ne_W0lf]
-//============================================================ 
+//= 1.4 Updated to match the official script. [Euphy]
+//============================================================
 
 // Sign
 //============================================================
@@ -45,9 +44,14 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		mes "anyone can do what you do~";
 		close;
 	}
-	if(eaclass()&(EAJL_UPPER|EAJL_2) && tu_magician01 < 7){
+	if(eaclass()&(EAJL_UPPER|EAJL_2|EAJL_THIRD) && tu_magician01 < 7){
 		mes "[Mana]";
-		mes "My training isn't very helpful to those that are already skilled in magic. I'm afraid you'll have to rely on yourself to improve your skills.";
+		mes "Although I offer magic";
+		mes "training, it's not very helpful";
+		mes "if you're already experienced";
+		mes "in the use of magic. I'm sorry,";
+		mes "but you'll have to rely on your";
+		mes "own self to hone your skills.";
 		close;
 	}
 	switch(tu_magician01){
@@ -128,7 +132,10 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		mes "time for a break. But we'll";
 		mes "continue this later, okay?";
 		set tu_magician01, 1;
-		getexp BaseLevel*3,BaseLevel*2;
+		if (checkre(3))
+			getexp BaseLevel*3,BaseLevel*2;
+		else
+			getexp BaseLevel*30,BaseLevel*15;
 		specialeffect2 EF_HIT5;
 		close;
 	case 1:
@@ -202,7 +209,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "only slightly injured and the";
 				mes "Fire Wall won't necessarily";
 				mes "block its approach. So beware!";
-				set tu_mana,tu_mana|1;
+				set .@eread_1,1;
 				next;
 				break;
 			case 2:
@@ -237,7 +244,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "afterwards, like Fire Bolt and";
 				mes "Fire Ball, to take advantage of";
 				mes "the monster's Earth property.";
-				set tu_mana,tu_mana|2;
+				set .@eread_2,1;
 				next;
 				break;
 			case 3:
@@ -275,8 +282,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "the ^93DB70Wind^000000 property skills";
 				mes "that we Mages can use are";
 				mes "Lighning Bolt and Thunder Storm.";
-				next;
-				set tu_mana,tu_mana|4;
+				set .@eread_3,1;
 				next;
 				break;
 			case 4:
@@ -313,7 +319,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "actually freeze monsters.";
 				mes "While monsters are frozen by";
 				mes "Frost Diver, they're considered Water monsters. Interesting, huh?";
-				set tu_mana,tu_mana|8;
+				set .@eread_4,1;
 				next;
 				break;
 			case 5:
@@ -346,7 +352,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "shield against long range";
 				mes "attacks or strong property";
 				mes "attacks, so be really careful!";
-				set tu_mana,tu_mana|16;
+				set .@eread_5,1;
 				next;
 				break;
 			case 6:
@@ -358,32 +364,18 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "ready, we'll cover some new";
 				mes "material for you to learn.";
 				next;
-				switch(select("W-wait, not yet!:I'm ready to go on.")) {
-				case 1:
-					break;
-				case 2:
+				if(select("W-wait, not yet!:I'm ready to go on.") == 2) {
 					mes "[Mana]";
 					mes "Alrighty, we'll";
 					mes "move on to the next";
 					mes "subject then. Ho ho ho~!";
 					set tu_magician01,2;
 					specialeffect2 EF_HIT5;
-					if(tu_mana&1){
-						getexp 15,7;
-					}
-					if(tu_mana&2){
-						getexp 15,7;
-					}
-					if(tu_mana&4){
-						getexp 15,7;
-					}
-					if(tu_mana&8){
-						getexp 15,7;
-					}
-					if(tu_mana&16){
-						getexp 15,7;
-					}
-					set tu_mana,0;
+					if(.@eread_1) getexp 150,70;
+					if(.@eread_2) getexp 150,70;
+					if(.@eread_3) getexp 150,70;
+					if(.@eread_4) getexp 150,70;
+					if(.@eread_5) getexp 150,70;
 				}
 				close;
 			}
@@ -465,7 +457,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		mes "10 Chrysalis from them.";
 		mes "Then bring them to me, okay?";
 		set tu_magician01, 3;
-		getexp 40,20;
+		getexp 400,200;
 		specialeffect2 EF_HIT5;
 		close;
 	case 3:
@@ -493,7 +485,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 			mes "used to using your skills, huh?";
 			mes "Anyway, let me know when you're ready for the next lesson, okay?";
 			set tu_magician01, 5;
-			getexp 40,20;
+			getexp 400,200;
 			specialeffect2 EF_HIT5;
 			close;
 		}
@@ -521,7 +513,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 			mes "used to using your skills, huh?";
 			mes "Anyway, let me know when you're ready for the next lesson, okay?";
 			set tu_magician01, 5;
-			getexp 40,20;
+			getexp 400,200;
 			specialeffect2 EF_HIT5;
 			close;
 		}
@@ -550,7 +542,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "of Soul Strike and increase";
 				mes "that skill's level, it will grow in strength and you'll be able";
 				mes "to cast it much more quickly.";
-				set tu_mana,tu_mana|1;
+				set .@skill_e1,1;
 				next;
 				break;
 			case 2:
@@ -570,7 +562,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "certain number of attacks,";
 				mes "depending on the level of the";
 				mes "Safety Wall skill that you use.";
-				set tu_mana,tu_mana|2;
+				set .@skill_e2,1;
 				next;
 				break;
 			case 3:
@@ -590,7 +582,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "good use of the destructive";
 				mes "power of the Fire Ball!";
 				next;
-				set tu_mana,tu_mana|4;
+				set .@skill_e3,1;
 				break;
 			case 4:
 				mes "[Mana]";
@@ -616,7 +608,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "skill, its damage and chance";
 				mes "of freezing monsters will also";
 				mes "increase. Pretty dangerous, eh? ^FFFFFFkamenriderblack^000000";
-				set tu_mana,tu_mana|8;
+				set .@skill_e4,1;
 				next;
 				break;
 			case 5:
@@ -635,7 +627,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "within a certain range.";
 				mes "It's an incredibly potent";
 				mes "ground targeting attack.";
-				set tu_mana,tu_mana|16;
+				set .@skill_e5,1;
 				next;
 				break;
 			case 6:
@@ -661,7 +653,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "Fire Well strategically";
 				mes "and effectively, it can";
 				mes "be a very powerful skill~";
-				set tu_mana,tu_mana|32;
+				set .@skill_e6,1;
 				next;
 				break;
 			case 7:
@@ -680,7 +672,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "learn Energy Coat, I'm";
 				mes "sure Blizardis will tell";
 				mes "you all you need to know.";
-				set tu_mana,tu_mana|64;
+				set .@skill_e7,1;
 				next;
 				break;
 			case 8:
@@ -701,28 +693,13 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				set tu_magician01, 6;
 				getitem 1604,1; //Wand
 				specialeffect2 EF_HIT5;
-				if(tu_mana&1){
-					getexp 30,10;
-				}
-				if(tu_mana&2){
-					getexp 30,10;
-				}
-				if(tu_mana&4){
-					getexp 30,10;
-				}
-				if(tu_mana&8){
-					getexp 30,10;
-				}
-				if(tu_mana&16){
-					getexp 30,10;
-				}
-				if(tu_mana&32){
-					getexp 30,10;
-				}
-				if(tu_mana&64){
-					getexp 30,10;
-				}
-				set tu_mana,0;
+				if(.@skill_e1) getexp 300,100;
+				if(.@skill_e2) getexp 300,100;
+				if(.@skill_e3) getexp 300,100;
+				if(.@skill_e4) getexp 300,100;
+				if(.@skill_e5) getexp 300,100;
+				if(.@skill_e6) getexp 300,100;
+				if(.@skill_e7) getexp 300,100;
 				close;
 			default: 
 				break;
@@ -810,7 +787,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		set tu_magician01, 28;
 		getitem 2321,1; //Silk_Robe
 		set Zeny, Zeny + 3000;
-		getexp 300,100;
+		getexp 3000,1000;
 		close;
 	default:
 		if(tu_magician01 < 27){
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index c947d0342..2e838e4da 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -1,20 +1,19 @@
 //===== Hercules Script ======================================
 //= Merchant Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
-//= Tutorial for Merchant Class 
-//===== Additional Comments: ================================= 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Merchant training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
-//= 1.1 Fixed bugs, optimized [Lupus] 1.2 fixed Weight check
-//=	TODO: Test, add missing misceffects
+//= 1.1 Fixed bugs, optimized [Lupus]
+//= 1.2 fixed Weight check
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.3 Misc. updates. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 // Guarnien
 //============================================================
diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt
index ee54103de..57e3fa447 100644
--- a/npc/quests/first_class/tu_sword.txt
+++ b/npc/quests/first_class/tu_sword.txt
@@ -1,22 +1,21 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Swordman Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN (Testet in Trunk 88xx)
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.6
+//===== Description: =========================================
+//= [Official Conversion]
+//= Swordman training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
-//=	TODO: Test, Add correct misceffects numbers
 //= 1.2 Fixed a typo on NPC name. [SinSloth]
 //= 1.3 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.4 Misc. updates. [L0ne_W0lf]
-//= 1.5 Warp New Izlude update
-//============================================================ 
+//= 1.5 Added Renewal Izlude coordinates.
+//= 1.6 Added Pre-Renewal support. [Euphy]
+//============================================================
 
 // Shurank
 //============================================================
@@ -42,7 +41,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "come back to me...";
 		close;
 	}
-	if(BaseClass == Job_Swordman && eaclass()&(EAJL_2|EAJL_UPPER)){
+	if(BaseClass == Job_Swordman && eaclass()&(EAJL_2|EAJL_UPPER|EAJL_THIRD)){
 		mes "From your raiment,";
 		mes "I see that you are";
 		if(Sex)
@@ -109,7 +108,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "your great efforts. But do not let your talents allow you to grow arrogant!";
 			set tu_swordman, 23;
 			completequest 8228;
-			getexp 186,0;
+			if (checkre(3))
+				getexp 186,0;
+			else
+				getexp 1860,0;
 			getitem 1113,1; //Scimiter
 			next;
 			mes "[Shurank]";
@@ -197,7 +199,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "your accomplishment.";
 			set tu_swordman, 22;
 			changequest 8227,8228;
-			getexp 186,0;
+			if (checkre(3))
+				getexp 186,0;
+			else
+				getexp 1860,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time, I will tell you more about the Magnum Break skill.";
@@ -224,7 +229,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			set tu_swordman, 13;
 			erasequest 8221;
 			setquest 8222;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
@@ -286,7 +294,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			set tu_swordman, 13;
 			erasequest 8221;
 			setquest 8222;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
@@ -363,7 +374,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			set tu_swordman, 13;
 			erasequest 8221;
 			setquest 8222;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
@@ -384,7 +398,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			set tu_swordman, 10;
-			getexp 112,0;
+			if (checkre(3))
+				getexp 112,0;
+			else
+				getexp 1120,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -398,7 +415,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "an outstanding Swordman.";
 			mes "Here is a small reward...";
 			set tu_swordman, 10;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -447,7 +467,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			set tu_swordman, 10;
-			getexp 112,0;
+			if (checkre(3))
+				getexp 112,0;
+			else
+				getexp 1120,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -461,7 +484,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "an outstanding Swordman.";
 			mes "Here is a small reward...";
 			set tu_swordman, 10;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
 			close;
@@ -543,7 +569,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			set tu_swordman, 10;
 			changequest 8219,8220;
-			getexp 112,0;
+			if (checkre(3))
+				getexp 112,0;
+			else
+				getexp 1120,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -561,7 +590,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			completequest 8219;
 			completequest 8220;
 			setquest 8221;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -650,7 +682,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Ah! That healthy glow!";
 			mes "I see that you've mastered this skill already. Let me give you a little reward for your hard training!";
 			set tu_swordman, 5;
-			getexp 112,0;
+			if (checkre(3))
+				getexp 112,0;
+			else
+				getexp 1120,0;
 			next;
 		} else {
 			mes "[Shurank]";
@@ -690,7 +725,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
-			getexp 97,0;
+			if (checkre(3))
+				getexp 97,0;
+			else
+				getexp 970,0;
 			getitem 2503,1; //Muffler
 			close;
 		} else {
@@ -725,7 +763,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a little reward for all of your hard work. I hope you realize the importance of using Bash as";
 			mes "you grow stronger.";
 			set tu_swordman, 3;
-			getexp 83,0;
+			if (checkre(3))
+				getexp 83,0;
+			else
+				getexp 830,0;
 			close;
 		} else if(.@chk_bash == 10){
 			mes "[Shurank]";
@@ -736,7 +777,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
-			getexp 97,0;
+			if (checkre(3))
+				getexp 97,0;
+			else
+				getexp 970,0;
 			getitem 2503,1; //Muffler
 			close;
 		} else {
@@ -771,7 +815,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 2;
-			getexp 58,0;
+			if (checkre(3))
+				getexp 58,0;
+			else
+				getexp 580,0;
 			close;
 		} else if((.@chk_bash > 4) && (.@chk_bash < 10)){
 			mes "[Shurank]";
@@ -801,7 +848,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "For your efforts and patience, I offer you this small reward. Please take it and grow even stronger...";
 			set tu_swordman, 3;
 			setquest 8211;
-			getexp 83,0;
+			if (checkre(3))
+				getexp 83,0;
+			else
+				getexp 830,0;
 			next;
 			mes "[Shurank]";
 			mes "I believe that every true Swordman should master the Bash skill. If you ever do master the skill as a Swordman, come back to me.";
@@ -815,7 +865,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
-			getexp 97,0;
+			if (checkre(3))
+				getexp 97,0;
+			else
+				getexp 970,0;
 			getitem 2503,1; //Muffler
 			close;
 		} else {
@@ -848,7 +901,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "Now, if you wish to become a true Swordman, you must learn the Bash skill. There's no question about it: You've got to know these basics! Take this, and learn to Bash!";
 			set tu_swordman, 1;
-			getexp 49,0;
+			if (checkre(3))
+				getexp 49,0;
+			else
+				getexp 490,0;
 			setquest 8211;
 			close;
 		} else if((.@chk_bash > 0) && (.@chk_bash < 5)){
@@ -873,7 +929,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 2;
 			changequest 8211,8212;
-			getexp 58,0;
+			if (checkre(3))
+				getexp 58,0;
+			else
+				getexp 580,0;
 			close;
 		} else if((.@chk_bash > 4) && (.@chk_bash < 10)){
 			mes "[Shurank]";
@@ -896,7 +955,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 3;
 			changequest 8212,8213;
-			getexp 83,0;
+			if (checkre(3))
+				getexp 83,0;
+			else
+				getexp 830,0;
 			next;
 			mes "[Shurank]";
 			mes "But if you wish to become an expert Swordman in my eyes, you must master Bash!";
@@ -914,7 +976,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			completequest 8212;
 			completequest 8213;
 			setquest 8214;
-			getexp 97,0;
+			if (checkre(3))
+				getexp 97,0;
+			else
+				getexp 970,0;
 			getitem 2503,1; //Muffler
 			close;
 		}
@@ -1067,7 +1132,10 @@ geffen,154,143,3	script	Dequ'ee	734,{
 			mes "Hurry over to Morroc and monitor Bankley in case he does anything desperate. If something happens, report to me right away!";
 			set tu_swordman, 19;
 			changequest 8224,8225;
-			getexp 162,0;
+			if (checkre(3))
+				getexp 162,0;
+			else
+				getexp 1620,0;
 			close2;
 			warp "moc_fild07",359,201;
 			end;
@@ -2113,7 +2181,10 @@ geffen,154,143,3	script	Dequ'ee	734,{
 					mes "Thank you for taking the trouble to come this far. Let me reward you with some experience points.";
 					set tu_swordman, 7;
 					changequest 8216,8217;
-					getexp 112,0;
+					if (checkre(3))
+						getexp 112,0;
+					else
+						getexp 1120,0;
 					next;
 					mes "[Dequ'ee]";
 					mes "Take care";
diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt
index fe0d52f87..fc86e52c0 100644
--- a/npc/quests/first_class/tu_thief01.txt
+++ b/npc/quests/first_class/tu_thief01.txt
@@ -1,21 +1,20 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Thief Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN (Testet in Trunk 88xx)
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
+//= Thief training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
-//=	TODO: Test, Add correct misceffects numbers
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.3 Fixed a few minor mistakes [Playtester]
 //= 1.4 Misc. updates. [L0ne_W0lf]
-//============================================================ 
+//= 1.5 Added Pre-Renewal support. [Euphy]
+//============================================================
 
 // Thief Trainer
 //============================================================
@@ -88,7 +87,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "[Yierhan]";
 				mes "So if you're feeling like the damage you're making is pretty weak, you might want more stat points in ^2F4F2FSTR^000000. How high your raise your own STR is really up to you.";
 				set tu_thief01, 1;
-				getexp 20,10;
+				getexp 200,100;
 				specialeffect2 EF_HIT5;
 				close;
 			case 2:
@@ -104,7 +103,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "Sure, ^23238EDEX^000000 and LUK can";
 				mes "also increase your attack damage, but they're insignificant compared to STR. I repeat: ^660000insignificant^000000.";
 				set tu_thief01, 1;
-				getexp 40,20;
+				getexp 400,200;
 				specialeffect2 EF_HIT5;
 				close;
 			case 3:
@@ -119,7 +118,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "[Yierhan]";
 				mes "So if you're feeling like the damage you're making is pretty weak, you might want more stat points in ^2F4F2FSTR^000000. How high your raise your own STR is really up to you.";
 				set tu_thief01, 1;
-				getexp 20,10;
+				getexp 200,100;
 				specialeffect2 EF_HIT5;
 				close;
 			}
@@ -229,7 +228,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 			mes "about any other skills,";
 			mes "I can explain real quick.";
 			set tu_thief01, 3;
-			getexp BaseLevel*3,BaseLevel*2;
+			getexp BaseLevel*30,BaseLevel*15;
 			specialeffect2 EF_HIT5;
 			close;
 		} else if(tu_thief01 == 3){
@@ -328,24 +327,12 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 					mes "Now that you're such an expert on skills, I want you to level up your skills and come back, got it?";
 					set tu_thief01, 4;
 					specialeffect2 EF_HIT5;
-					if(.@read_d){
-						getexp 30,10;
-					}
-					if(.@read_f){
-						getexp 30,10;
-					}
-					if(.@read_s){
-						getexp 30,10;
-					}
-					if(.@read_p){
-						getexp 30,10;
-					}
-					if(.@read_h){
-						getexp 30,10;
-					}
-					if(.@read_r){
-						getexp 30,10;
-					}
+					if(.@read_d) getexp 300,100;
+					if(.@read_f) getexp 300,100;
+					if(.@read_s) getexp 300,100;
+					if(.@read_p) getexp 300,100;
+					if(.@read_h) getexp 300,100;
+					if(.@read_r) getexp 300,100;
 					close;
 				}
 			}
@@ -362,7 +349,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 			set tu_thief01, 5;
 			savepoint "moc_ruins",80,164;
 			getitem 602,1; //Wing_Of_Butterfly
-			getexp 10,5;
+			getexp 100,50;
 			specialeffect2 EF_HIT5;
 			close2;
 			warp "moc_fild12",158,373;
@@ -420,7 +407,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "is pretty strong!";
 						set tu_thief01, 8;
 						getitem 1207,1; //Main_Gauche
-						getexp 100,50;
+						getexp 1000,500;
 						specialeffect2 EF_HIT5;
 						close;
 					case 2:
@@ -430,7 +417,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "Alright, you better get stronger the next time I see you. Oh, and you can have this stuff. You know, since you're so gangster and all.";
 						set tu_thief01, 7;
 						getitem 1207,1; //Main_Gauche
-						getexp 50,20;
+						getexp 500,200;
 						specialeffect2 EF_HIT5;
 						close;
 					}
@@ -447,22 +434,19 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "you so much, kid,";
 						mes "you can have this.";
 						mes "Take it, it's yours!";
-						set tu_thief01, 7;
-						getitem 1207,1; //Main_Gauche
-						getexp 50,20;
-						specialeffect2 EF_HIT5;
-						close;
+						break;
 					case 2:
 						mes "[Yierhan]";
 						mes "Good!";
 						mes "Less work for me!";
 						mes "Alright, you better get stronger the next time I see you. Oh, and you can have this stuff. You know, since you're so gangster and all.";
-						set tu_thief01, 7;
-						getitem 1207,1; //Main_Gauche
-						getexp 50,20;
-						specialeffect2 EF_HIT5;
-						close;
+						break;
 					}
+					set tu_thief01, 7;
+					getitem 1207,1; //Main_Gauche
+					getexp 500,200;
+					specialeffect2 EF_HIT5;
+					close;
 				}
 			}
 		} else if(tu_thief01 == 7){
@@ -503,7 +487,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 			mes "out, be real careful";
 			mes "other there, okay?";
 			set tu_thief01, 8;
-			getexp 20,10;
+			getexp 200,100;
 			specialeffect2 EF_HIT5;
 			close;
 		} else if(tu_thief01 == 8){
@@ -587,7 +571,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				set tu_thief01, 27;
 				getitem 2307,1; //Mantle
 				set Zeny, Zeny + 5000;
-				getexp 800,300;
+				getexp 8000,3000;
 				close;
 			}
 		} else {
@@ -668,7 +652,6 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "[Yierhan]";
 				mes "Ah, gotcha. Well, that's understandable. I mean, these things take time, you know?";
 				close;
-				break;
 			case 2:
 				mes "[Yierhan]";
 				mes "Yeah...?";
@@ -676,7 +659,6 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "I guess these kinds of things require patience. And thinking.";
 				mes "You know, things I'm horrible at.";
 				close;
-				break;
 			case 3:
 				mes "[Yierhan]";
 				mes "Alright...!";
@@ -712,7 +694,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "Hey, this stuff is yours. Think of it as a reward for helping us out. Right, and I'll let Mana know you did a great job. Take care of yourself now~";
 				set tu_magician01, 27;
 				set Zeny, Zeny + 5000;
-				getexp 500,200;
+				getexp 5000,2000;
 				close;
 			}
 		} else {
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index 4e9713b1c..8c741719c 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -1,20 +1,20 @@
 //===== Hercules Script ======================================
 //= Guild Relay Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Guild Relay Quest.
 //= Quest designed for multiple users at once.
 //= Variable in use: guildrelay_q (Max: ??)
 //= Variable in use: guildtime (Max: ??)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Fixed errors reported by NoHealing (Bugreport:3934) [L0ne_W0lf]
 //= NPCs now duplicate from FLOATING npcs instead of Luina 1 npcs.
-//============================================================ 
+//============================================================
 
 // Floating NPCs to duplicate from.
 //============================================================
diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt
index f51dc225c..8f57ea9f1 100644
--- a/npc/quests/gunslinger_quests.txt
+++ b/npc/quests/gunslinger_quests.txt
@@ -3,9 +3,7 @@
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
-//= 1.6c
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.7
 //===== Description: =========================================
 //= Gunslinger guns and bullet quests
 //===== Additional Comments: =================================
@@ -21,6 +19,7 @@
 //= 1.6a Removed .GATs [Lupus]
 //= 1.6b Changed item names to item IDs on some scripts. [Samuray22]
 //= 1.6c Corrected a bad delitem. (bugreport:763) [Samuray22]
+//= 1.7 Removed all 'menu' and 'goto'. [Euphy]
 //============================================================
 
 que_ng,182,85,3	script	Garrison	109,{
@@ -1095,7 +1094,7 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "My name is 'Lab Director'.";
 		mes "Do you need something?";
 		next;
-		menu "I need a Special Metal Rod.",-;
+		select("I need a Special Metal Rod.");
 		mes "[N. A]";
 		mes "Huh...? Hey, weren't you that guy";
 		mes "who walked out of here with a";
@@ -1111,7 +1110,7 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "You betrayed my faith in you!";
 		mes "You traitor! Traitor!! TRAITOR!!!!";
 		next;
-		menu "Explain everything.",-;
+		select("Explain everything.");
 		mes "[N. A]";
 		mes "...... Whew.";
 		mes "So it was Mr. F. Harrison who";
@@ -1131,11 +1130,11 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "Elemental Spheres to keep going";
 		mes "with my research...";
 		next;
-		menu "Make him an offer.",-;
+		select("Make him an offer.");
 		mes "[N. A]";
 		mes "An offer? Like what?";
 		next;
-		menu "We find things for each other.",-;
+		select("We find things for each other.");
 		mes "[N. A]";
 		mes "Hmm... That sounds good.";
 		mes "Well, according to the offer,";
@@ -1159,51 +1158,50 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "Find me 30 of each Element.";
 		mes "Did you find them?";
 		next;
-
 		switch(select("Nope.:I found 30 Poison Spheres.:I found 30 Flare Spheres.:I found 30 Lightning Spheres.:I found 30 Blind Spheres.:I found 30 Freezing Spheres.")){
-
 		case 1:
 			mes "[N. A]";
 			mes "Just bring me whatever type";
 			mes "you could find.";
 			close;
-			break;
 		case 2:
 			if(countitem(13205) >= 30){
 				delitem 13205,30;
 				set gun_na,103;
 			}
-			else goto L_MORE;
 			break;
 		case 3:
 			if(countitem(13203) >= 30){
 				delitem 13203,30;
 				set gun_na,103;
 			}
-			else goto L_MORE;
 			break;
 		case 4:
 			if(countitem(13204) >= 30){
 				delitem 13204,30;
 				set gun_na,103;
 			}
-			else goto L_MORE;
 			break;
 		case 5:
 			if(countitem(13206) >= 30){
 				delitem 13206,30;
 				set gun_na,103;
 			}
-			else goto L_MORE;
 			break;
 		case 6:
 			if(countitem(13207) >= 30){
 				delitem 13207,30;
 				set gun_na,103;
 			}
-			else goto L_MORE;
 			break;
 		}
+		if (gun_na != 103) {
+			mes "[N. A]";
+			mes "Eh? What? Am I the only";
+			mes "person who can't see them?";
+			mes "Bring me more!";
+			close;
+		}
 		mes "[N. A]";
 		mes "Wow, you found them all for me!";
 		mes "I had to turn Lady Celena's lab";
@@ -1237,7 +1235,7 @@ que_ng,149,178,4	script	Lab Director	744,{
 	mes "Do you need something?";
 	next;
 	if (BaseJob != Job_Gunslinger){
-		menu "Talk to him.",-;
+		select("Talk to him.");
 		mes "[N. A]";
 		mes "If you see Gunslingers around,";
 		mes "please tell them that I have";
@@ -1246,14 +1244,8 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "here. Heheheheh...";
 		close;
 	}
-	if (BaseLevel > 67){
-		menu "Ask about 'Butcher'.",L_BUTCHER,"Ask about the 'Drifter'.",L_DRIFTER,"Cancel",L_CANCEL;
-	}
-	else if(BaseLevel > 54){
-		menu "Ask about the 'Drifter'.",L_DRIFTER,"Cancel",L_CANCEL;
-	}
-	else{
-		menu "Talk.",-;
+	if (BaseLevel < 55) {
+		select("Talk.");
 		mes "[N. A]";
 		mes "... Destruction... Madness...";
 		mes "Hmm... Attack speed over 180...";
@@ -1264,137 +1256,129 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "disturb me.";
 		close;
 	}
-
-L_CANCEL:
-	mes "[N. A]";
-	mes "I have news on the latest";
-	mes "weapons but... I guess you're";
-	mes "too busy to hear them.";
-	mes "Maybe next time I guess.";
-	close;
-
-L_BUTCHER:
-	mes "[N. A]";
-	mes "Ah, you heard the news";
-	mes "shortly after the end";
-	mes "of the development eh?";
-	next;
-	mes "[N. A]";
-	mes "^ff0000Butcher^000000 is the newest development";
-	mes "by us, the Einbroch Firearm Lab.";
-	mes "It is the newest type of Gatling";
-	mes "we have developed. While";
-	mes "^ff0000Drifter^000000 is a good weapon";
-	mes "as well, the ^ff0000Butcher^000000 definitely has";
-	mes "a much stronger firepower!";
-	next;
-	mes "[N. A]";
-	mes "Due to its strong firepower,";
-	mes "the Butcher was also dubbed";
-	mes "as the 'Murderer'.";
-	next;
-	mes "[N. A]";
-	mes "However, even Gunslingers could";
-	mes "have troubles controlling such";
-	mes "a powerful weapon.";
-	next;
-	mes "[N. A]";
-	mes "Do you think you can handle it?";
-	next;
-	if(select("I'm not sure...:Of course I can!!") == 1){
+	switch(select(((BaseLevel > 67)?"Ask about 'Butcher'.":"")+":Ask about the 'Drifter'.:Cancel")) {
+	case 1:
 		mes "[N. A]";
-		mes "The ^ff0000Butcher^000000 is a weapon that you";
-		mes "can't handle without a strong";
-		mes "will. I'll see you again when";
-		mes "you have enough confidence to";
-		mes "handle this monster.";
-		close;
-	}else{
+		mes "Ah, you heard the news";
+		mes "shortly after the end";
+		mes "of the development eh?";
+		next;
 		mes "[N. A]";
-		mes "Aha, how self-confident you";
-		mes "are! However, I see people with";
-		mes "such self-confidence everywhere.";
-		mes "You'll need to prove it...";
-		mes "But how... Hmm...";
+		mes "^ff0000Butcher^000000 is the newest development";
+		mes "by us, the Einbroch Firearm Lab.";
+		mes "It is the newest type of Gatling";
+		mes "we have developed. While";
+		mes "^ff0000Drifter^000000 is a good weapon";
+		mes "as well, the ^ff0000Butcher^000000 definitely has";
+		mes "a much stronger firepower!";
 		next;
 		mes "[N. A]";
-		mes "Hmmm......";
+		mes "Due to its strong firepower,";
+		mes "the Butcher was also dubbed";
+		mes "as the 'Murderer'.";
 		next;
 		mes "[N. A]";
-		mes "Aha! I got it!";
+		mes "However, even Gunslingers could";
+		mes "have troubles controlling such";
+		mes "a powerful weapon.";
 		next;
 		mes "[N. A]";
-		mes "Here, bring me ^ff00001000 Orc Claws^000000 and ^ff00001000 Skel Bone^000000.";
-		mes "If you can bring me these items,";
-		mes "I'll let you use the Butcher.";
+		mes "Do you think you can handle it?";
 		next;
+		if(select("I'm not sure...:Of course I can!!") == 1){
+			mes "[N. A]";
+			mes "The ^ff0000Butcher^000000 is a weapon that you";
+			mes "can't handle without a strong";
+			mes "will. I'll see you again when";
+			mes "you have enough confidence to";
+			mes "handle this monster.";
+			close;
+		}else{
+			mes "[N. A]";
+			mes "Aha, how self-confident you";
+			mes "are! However, I see people with";
+			mes "such self-confidence everywhere.";
+			mes "You'll need to prove it...";
+			mes "But how... Hmm...";
+			next;
+			mes "[N. A]";
+			mes "Hmmm......";
+			next;
+			mes "[N. A]";
+			mes "Aha! I got it!";
+			next;
+			mes "[N. A]";
+			mes "Here, bring me ^ff00001000 Orc Claws^000000 and ^ff00001000 Skel Bone^000000.";
+			mes "If you can bring me these items,";
+			mes "I'll let you use the Butcher.";
+			next;
+			mes "[N. A]";
+			mes "Easy, ain't it? Go and prove";
+			mes "your ability then! Heheheh...";
+			set gun_na,1;
+			close;
+		}
+	case 2:
 		mes "[N. A]";
-		mes "Easy, ain't it? Go and prove";
-		mes "your ability then! Heheheh...";
-		set gun_na,1;
-		close;
-	}
-
-L_DRIFTER:
-	mes "[N. A]";
-	mes "Ah, you're here to learn about";
-	mes "the ^ff0000Drifter^000000 eh?";
-	next;
-	mes "[N. A]";
-	mes "The ^ff0000Drifter^000000 is one of the many";
-	mes "highest-classed weapons developed";
-	mes "by Lady Celena. It's an automatic";
-	mes "Gatling which boasts very high";
-	mes "rate of fire, which is the highest";
-	mes "among all Gunslinger weapons.";
-	next;
-	mes "[N. A]";
-	mes "Of course, you will need the Skill";
-	mes "to allow you to control Gatlings,";
-	mes "but he who contorls Gatlings well";
-	mes "will receive full aid from the";
-	mes "^ff0000Drifter^000000.";
-	next;
-	mes "[N. A]";
-	mes "Do you want to try using the ^ff0000Drifter^000000?";
-	next;
-	if(select("Um, no.:Yeah!") == 1){
+		mes "Ah, you're here to learn about";
+		mes "the ^ff0000Drifter^000000 eh?";
+		next;
 		mes "[N. A]";
-		mes "If you want to try it out";
-		mes "some time, come back here.";
-		close;
-	}else{
-		set gun_na,10;
+		mes "The ^ff0000Drifter^000000 is one of the many";
+		mes "highest-classed weapons developed";
+		mes "by Lady Celena. It's an automatic";
+		mes "Gatling which boasts very high";
+		mes "rate of fire, which is the highest";
+		mes "among all Gunslinger weapons.";
+		next;
 		mes "[N. A]";
-		mes "Since it's really hard to find";
-		mes "the materials for constructing";
-		mes "the ^ff0000Drifter^000000, we only make them";
-		mes "on requests, and we require those";
-		mes "who want to use the ^ff0000Drifter^000000 to bring";
-		mes "us the materials.";
+		mes "Of course, you will need the Skill";
+		mes "to allow you to control Gatlings,";
+		mes "but he who contorls Gatlings well";
+		mes "will receive full aid from the";
+		mes "^ff0000Drifter^000000.";
 		next;
 		mes "[N. A]";
-		mes "I'll tell you the materials";
-		mes "needed, just bring them and";
-		mes "we'll construct it for you.";
+		mes "Do you want to try using the ^ff0000Drifter^000000?";
 		next;
+		if(select("Um, no.:Yeah!") == 1){
+			mes "[N. A]";
+			mes "If you want to try it out";
+			mes "some time, come back here.";
+			close;
+		}else{
+			set gun_na,10;
+			mes "[N. A]";
+			mes "Since it's really hard to find";
+			mes "the materials for constructing";
+			mes "the ^ff0000Drifter^000000, we only make them";
+			mes "on requests, and we require those";
+			mes "who want to use the ^ff0000Drifter^000000 to bring";
+			mes "us the materials.";
+			next;
+			mes "[N. A]";
+			mes "I'll tell you the materials";
+			mes "needed, just bring them and";
+			mes "we'll construct it for you.";
+			next;
+			mes "[N. A]";
+			mes "To make a Drifter, we need";
+			mes "70 Steel, 5 Eluniums, 3";
+			mes "Oridecons, 70 Coal, 50 Rusty";
+			mes "Screws, and a fee of";
+			mes "50,000 zeny.";
+			mes "Come back after you found";
+			mes "them all.";
+			close;
+		}
+	case 3:
 		mes "[N. A]";
-		mes "To make a Drifter, we need";
-		mes "70 Steel, 5 Eluniums, 3";
-		mes "Oridecons, 70 Coal, 50 Rusty";
-		mes "Screws, and a fee of";
-		mes "50,000 zeny.";
-		mes "Come back after you found";
-		mes "them all.";
+		mes "I have news on the latest";
+		mes "weapons but... I guess you're";
+		mes "too busy to hear them.";
+		mes "Maybe next time I guess.";
 		close;
 	}
-
-L_MORE:
-	mes "[N. A]";
-	mes "Eh? What? Am I the only";
-	mes "person who can't see them?";
-	mes "Bring me more!";
-	close;
 }
 
 lighthalzen,205,284,6	script	F. Harrison	85,{
@@ -1415,7 +1399,7 @@ lighthalzen,205,284,6	script	F. Harrison	85,{
 		mes "[F. Harrison]";
 		mes "Heheh... Hmm... Huh...?";
 		next;
-		menu "May I have my Butcher back now?",-;
+		select("May I have my Butcher back now?");
 		mes "[F. Harrison]";
 		mes "Uh? Oh, umm... Heheh...";
 		next;
@@ -1555,7 +1539,17 @@ lighthalzen,205,284,6	script	F. Harrison	85,{
 		close;
 	}
 	else if(gun_na == 0){
-		if(BaseJob != Job_Gunslinger) goto L_BORED;
+		if(BaseJob != Job_Gunslinger) {
+			mes "[F. Harrison]";
+			mes "Man, I'm so bored...";
+			mes "I wonder if there's anything";
+			mes "interesting...";
+			next;
+			mes "[F. Harrison]";
+			mes "Oh well... I'll just play with my";
+			mes "beautiful 'Crimson Bolt'.";
+			close;
+		}
 		if(BaseLevel > 67 && countitem(13158) > 0){
 			mes "[F. Harrison]";
 			mes "Man, I'm so bored...";
@@ -1599,15 +1593,4 @@ lighthalzen,205,284,6	script	F. Harrison	85,{
 			close;
 		}
 	}
-
-L_BORED:
-	mes "[F. Harrison]";
-	mes "Man, I'm so bored...";
-	mes "I wonder if there's anything";
-	mes "interesting...";
-	next;
-	mes "[F. Harrison]";
-	mes "Oh well... I'll just play with my";
-	mes "beautiful 'Crimson Bolt'.";
-	close;
 }
diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt
index 5f92a4829..058d3070a 100644
--- a/npc/quests/juice_maker.txt
+++ b/npc/quests/juice_maker.txt
@@ -4,16 +4,14 @@
 //= kobra_k88
 //===== Current Version: =====================================
 //= 2.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Learn where to turn apples, bananas, carrots, and grapes
 //= into juice.
 //= Condition if done: (MISC_QUEST & 1)
 //===== Additional Comments: =================================
 //= 1.9 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Added tracking variables in, which are unset when complete.
+//=     Added tracking variables in, which are unset when complete.
 //= 2.0 Added missing checkweight. [L0ne_W0lf]
 //= 2.1 Fixed dialog for if your missing the needed items (He always said the dialog for grape juice). [Kisuka]
 //============================================================
@@ -271,7 +269,7 @@ payon_in03,188,146,5	script	Marx Hansen#juice	86,{
 			}
 			delitem .@fruit,.@make;
 			delitem 713,.@make;
-			set zeny,zeny-.@total_zeny;
+			set Zeny, Zeny-.@total_zeny;
 			getitem .@juice,.@make;
 
 			mes "[Merchant Marx Hansen]";
@@ -336,17 +334,17 @@ payon_in03,188,146,5	script	Marx Hansen#juice	86,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 fixed input number check [Lupus]
 //= 1.2 fixed misplaced Grape<->Carrot juices [Lupus]
 //= 1.3 added a loopless menu 'as many as possible' [Lupus]
 //= 1.3a Turned the juice making part of the Juicer npc into a
-//= subfunc.  Changed fruit amount needed to 1.[kobra_k88]
-//= Fixed exploits [Lupus]
+//=     subfunc.  Changed fruit amount needed to 1.[kobra_k88]
+//=     Fixed exploits [Lupus]
 //= 1.6 fixed typo (where did @ipnut came from?) [Lance]
 //= 1.8 got rid of vars: 'MEAT',"MARIANNE","MORRISON"
-//= 	From now, all common quests start using bits of the
-//=	same variable MISC_QUEST [Lupus]
-//============================================================ 
+//=     From now, all common quests start using bits of the
+//=     same variable MISC_QUEST [Lupus]
+//============================================================
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt
index 2940951fe..32db582b8 100644
--- a/npc/quests/kiel_hyre_quest.txt
+++ b/npc/quests/kiel_hyre_quest.txt
@@ -3,12 +3,10 @@
 //===== By: ==================================================
 //= L0ne_W0lf (Script), DZeroX (Timer)
 //===== Current Version: =====================================
-//= 4.6
-//===== Compatible With: =====================================
-//= Hercules
+//= 4.7
 //===== Description: =========================================
 //= Quest for opening Robot Factory first and second floors.
-//===== Comments: ============================================
+//===== Additional Comments: =================================
 //= 4.0 A whole bunch-a-updates to various npcs. [L0ne_W0lf]
 //=     Corrected condition checks throughout the quest.
 //=     Npcs no longer make use of the goto command.
@@ -31,7 +29,8 @@
 //= 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]
 //= 4.6 Fixed impossible condition for security guard. [L0ne_W0lf]
-//============================================================ 
+//= 4.7 Updated RE/Pre-RE EXP. [Euphy]
+//============================================================
 
 //============================================================================
 // Kiel Hyre Quest/Robotic Lab Dungeon
@@ -413,7 +412,7 @@ yuno_in01,35,179,4	script	Pub Master#kh	46,5,5,{
 			mes "Thank you so much";
 			mes "for helping me out~";
 			getitem 7487,1; //Tavern_Wine
-			set zeny,zeny+1000;
+			set Zeny, Zeny+1000;
 			close;
 		}
 		else {
@@ -977,7 +976,7 @@ kh_school,179,39,0	script	Cute Student#kh	895,{
 				mes "Thank you! Thanks so much!";
 				next;
 				break;
-			Case 2:
+			case 2:
 				mes "[Elly]";
 				mes "Wait, you don't go";
 				mes "to this school, don't";
@@ -1959,8 +1958,6 @@ yuno_fild08,71,170,0	script	Grave#kh	111,{
 }
 
 //============================================================================
-
-//============================================================================
 //Kiel Hyre Cottage NPCs
 //============================================================================
 
@@ -2125,10 +2122,6 @@ kh_vila,191,14,0	script	Wall#kh	139,1,1,{
 			close;
 		}
 	}
-
-OnOpenDoor:
-	misceffect 316;
-	end;
 }
 
 //----------------------------------------------------------------------------
@@ -2149,8 +2142,8 @@ kh_vila,184,20,0	script	Book#kh1::BookKHQ1	111,{
 			mes "pull it towards you, the";
 			mes "wall slides opens open";
 			mes "to reveal a secret path.^000000";
-			donpcevent "Wall#kh::OnOpenDoor";
 			set KielHyreQuest,28;
+			specialeffect EF_READYPORTAL2,AREA,"Wall#kh";
 			close;
 		}
 		else {
@@ -2163,11 +2156,8 @@ kh_vila,184,20,0	script	Book#kh1::BookKHQ1	111,{
 	}
 
 }
-
 kh_vila,181,20,0	duplicate(BookKHQ1)	Book#kh2	111
-
 kh_vila,178,20,0	duplicate(BookKHQ1)	Book#kh3	111
-
 kh_vila,175,19,0	duplicate(BookKHQ1)	Book#kh4	111
 
 //----------------------------------------------------------------------------
@@ -2216,7 +2206,7 @@ kh_vila,16,175,0	script	Box#khp1	111,{
 	next;
 	switch(select("Buy!:Cancel")) {
 	case 1:
-		if (zeny < 1100) {
+		if (Zeny < 1100) {
 			mes "^3355FFUnfortunately, you";
 			mes "don't have enough";
 			mes "zeny to insert into";
@@ -2236,7 +2226,7 @@ kh_vila,16,175,0	script	Box#khp1	111,{
 			mes "special about it";
 			mes "at all! It's just";
 			mes "normal Pet Food!";
-			set zeny,zeny-1100;
+			set Zeny, Zeny-1100;
 			getitem 537,1;	//Pet_Food
 			close;
 		}
@@ -3254,8 +3244,6 @@ kh_vila,185,68,0	script	Test Tube::TestTubeKHQ2	111,{
 }
 
 //============================================================================
-
-//============================================================================
 // Robot Factory NPCs
 //============================================================================
 
@@ -3816,8 +3804,6 @@ kh_dun01,44,203,0	script	Entrance Device#khd2::KHAccess	111,{
 kh_dun01,36,195,0	duplicate(KHAccess)	Entrance Device#khd1	111
 
 //============================================================================
-
-//============================================================================
 // Kiel Hyre Mansion NPCs, and Kiehl's Room NPCs
 //============================================================================
 
@@ -4054,7 +4040,7 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		mes "a little reward for";
 		mes "saving my life.";
 		getitem 12105,1; //Taming_Gift_Set
-		getexp 70000,0;
+		getexp (checkre(3))?70000:700000,0;
 		set KielHyreQuest,50;
 	}
 	else if ((KielHyreQuest >= 50) && (KielHyreQuest < 64)) {
@@ -4667,7 +4653,7 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		getitem 7509,1; //Fancy_Key_Card
 		set KielHyreQuest,108;
 		next;
-		if (sex == 0) {
+		if (Sex == 0) {
 			if (getpartnerid() == 0) set .@KHTitle$,"Miss";
 			else set .@KHSTitle$,"Mrs";
 		}
@@ -4679,9 +4665,9 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		mes "and here, please take this";
 		mes "with my thanks for all of";
 		mes "your help, "+.@KHTitle$+" "+strcharinfo(0)+".";
-		getitem 616,1;  //Old card Album
+		getitem 616,1;  //Old Card Album
 		delitem 7508,1; //Elysia_Ring
-		getexp 100000,0;
+		getexp (checkre(3))?100000:1000000,0;
 	}
 	else if (KielHyreQuest >= 108) {
 		mes "[Kiel Hyre]";
@@ -5177,12 +5163,12 @@ OnTouch:
 
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Kiehl_Room_Warp";
 	end;
 
@@ -5192,8 +5178,6 @@ OnInit:
 }
 
 //============================================================================
-
-//============================================================================
 // Rosimier NPCs and other Related NPCs
 //============================================================================
 
@@ -6088,7 +6072,7 @@ kh_kiehl01,44,33,0	script	Big Door#BigDoorKHQ1	111,{
 kh_kiehl01,43,33,0	script	Big_Door_1_Warp	45,1,1,{
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnInit:
@@ -6097,7 +6081,7 @@ OnInit:
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Big_Door_1_Warp";
 	set getvariableofnpc(.KHDoor1Opened,"Big Door#BigDoorKHQ1"),0;
 	end;
@@ -6148,7 +6132,7 @@ kh_kiehl01,174,40,0	script	Big Door#BigDoorKHQ2	111,{
 kh_kiehl01,174,39,0	script	Big_Door_2_Warp	45,1,1,{
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnInit:
@@ -6157,7 +6141,7 @@ OnInit:
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Big_Door_2_Warp";
 	set getvariableofnpc(.KHDoor2Opened,"Big Door#BigDoorKHQ2"),0;
 	end;
@@ -6208,7 +6192,7 @@ kh_kiehl01,77,108,0	script	Big Door#BigDoorKHQ3	111,{
 kh_kiehl01,78,108,0	script	Big_Door_3_Warp	45,1,1,{
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnInit:
@@ -6217,7 +6201,7 @@ OnInit:
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Big_Door_3_Warp";
 	set getvariableofnpc(.KHDoor3Opened,"Big Door#BigDoorKHQ3"),0;
 	end;
@@ -6268,7 +6252,7 @@ kh_kiehl01,42,177,0	script	Big Door#BigDoorKHQ4	111,{
 kh_kiehl01,41,177,0	script	Big_Door_4_Warp	45,1,1,{
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnInit:
@@ -6277,7 +6261,7 @@ OnInit:
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Big_Door_4_Warp";
 	set getvariableofnpc(.KHDoor4Opened,"Big Door#BigDoorKHQ4"),0;
 	end;
@@ -6479,12 +6463,12 @@ kh_kiehl01,166,186,0	script	Big_Door_5_Warp	45,1,1,{
 
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Big_Door_5_Warp";
 	set getvariableofnpc(.KHDoor5Opened,"Big Door#BigDoorKHQ5"),0;
 	end;
@@ -6712,9 +6696,13 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "jobs--sort of like robots-- but";
 		mes "don't worry, they won't be hurt.";
 		next;
-		donpcevent "::OnKHSpiderWeb";
 		mes "[Mitchell]";
 		mes "Nooooo!";
+		specialeffect PF_FOGWALL,AREA,"Mitchell#KiehlRoom";
+		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent1";
+		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent2";
+		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent3";
+		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent4";
 		next;
 		cutin "kh_kiel03",2;
 		mes "[Kiehl]";
@@ -7078,63 +7066,18 @@ OnReset:
 }
 
 //----------------------------------------------------------------------------
-// Kiehl's Room; Mitchell and Agents. (Floating NPC + Duplicates)
+// Kiehl's Room; Mitchell and Agents.
 //----------------------------------------------------------------------------
 kh_kiehl02,49,55,6	script	Mitchell#KiehlRoom	727,{
 	end;
 OnInit:
-	hideonnpc "Mitchell#KiehlRoom";
-	end;
-
-OnKHSpiderWeb:
-	misceffect 404;
+	hideonnpc strnpcinfo(0);
 	end;
 }
-
-kh_kiehl02,53,52,4	script	Agent#KHAgent1	880,{
-	end;
-OnInit:
-	hideonnpc "Agent#KHAgent1";
-	end;
-
-OnKHSpiderWeb:
-	misceffect 404;
-	end;
-}
-
-kh_kiehl02,51,49,1	script	Agent#KHAgent2	880,{
-	end;
-OnInit:
-	hideonnpc "Agent#KHAgent2";
-	end;
-
-OnKHSpiderWeb:
-	misceffect 404;
-	end;
-}
-
-kh_kiehl02,47,50,0	script	Agent#KHAgent3	880,{
-	end;
-OnInit:
-	hideonnpc "Agent#KHAgent3";
-	end;
-
-OnKHSpiderWeb:
-	misceffect 404;
-	end;
-}
-
-kh_kiehl02,46,53,6	script	Agent#KHAgent4	880,{
-	end;
-OnInit:
-	hideonnpc "Agent#KHAgent4";
-	end;
-
-OnKHSpiderWeb:
-	misceffect 404;
-	end;
-}
-
+kh_kiehl02,53,52,4	duplicate(Mitchell#KiehlRoom)	Agent#KHAgent1	880
+kh_kiehl02,51,49,1	duplicate(Mitchell#KiehlRoom)	Agent#KHAgent2	880
+kh_kiehl02,47,50,0	duplicate(Mitchell#KiehlRoom)	Agent#KHAgent3	880
+kh_kiehl02,46,53,6	duplicate(Mitchell#KiehlRoom)	Agent#KHAgent4	880
 
 //----------------------------------------------------------------------------
 // Kiehl's Room; Copy of Kiehl.
@@ -7158,7 +7101,7 @@ OnTouch:
 	end;
 
 OnEnable:
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnInit:
@@ -7166,59 +7109,60 @@ OnInit:
 	end;
 }
 
-//============================================================================
-//===== Additional Comments: ============================================
+//============================================================
+// Old changelog
+//============================================================
 //= 1.0 First version, needs testing [Playtester]
 //= 1.1 Copied over some changes made by -Tsuyuki- [L0ne_W0lf]
-//=	Reworked variables slightly so that the permenents ones aside from the 
-//=	main tracking variable, are deleted when no longer needed. Renamed
-//=	several variables that handle strings to @KHInput$. [L0ne_W0lf]
+//=     Reworked variables slightly so that the permenents ones aside from the 
+//=     main tracking variable, are deleted when no longer needed. Renamed
+//=     several variables that handle strings to @KHInput$. [L0ne_W0lf]
 //= 1.2 Removed duplicate NPCs. [Toms]
 //= 1.3 More Bug fixes, fixed typo. Updated Additional comments. [L0ne_W0lf]
 //= 1.4 Fixed doors not resetting in kh_kiehl01 after 30 second timer is up. [L0ne_W0lf]
 //= 1.5 Another bug fixed (&& instead of ||). [L0ne_W0lf]
 //= 1.6 More squashed bugs with if checking. [L0ne_W0lf]
 //= 1.7 Corrected some spelling mistakes. [Balish]
-//	Corrected Exploit with the pub man, giving infinite wine and money.
-//	Corrected pool and map not showing text for some states of the quest.
-//	Corrected Elly showing cutin but not text for some states of the quest (causing players to log off to continue).
-//	Let fisherman talk to you when you have 10 fishes OR MORE.
-//	Corrected not letting you enter the tombstone after finishing the quest.
+//=     Corrected Exploit with the pub man, giving infinite wine and money.
+//=     Corrected pool and map not showing text for some states of the quest.
+//=     Corrected Elly showing cutin but not text for some states of the quest (causing players to log off to continue).
+//=     Let fisherman talk to you when you have 10 fishes OR MORE.
+//=     Corrected not letting you enter the tombstone after finishing the quest.
 //= 1.8 Elly now deletes the Iron_Box, and Kiel Hyre deletes the Pin. [L0ne_W0lf]
-//= 	More security on the 5th Big Door, now makes sure no one outside of who-
-//=	acticated it initially can use it. Resets after 10 minutes to make it.
-//=	Made it so that you need to be at least step 84 to activate the final door.
-//=	Corrected not deleting Allysia's Ring from inventory.
+//=     More security on the 5th Big Door, now makes sure no one outside of who-
+//=     acticated it initially can use it. Resets after 10 minutes to make it.
+//=     Made it so that you need to be at least step 84 to activate the final door.
+//=     Corrected not deleting Allysia's Ring from inventory.
 //= 1.9 Exit will now enable if you are just retrieving the Ring, keeps you from getting stuck. [L0ne_W0lf]
-//=	Corrected "KH_Kielh02", was setting off a debug, invalid map index. Should have been "kh_Kiehl02"
-//=	Made .KHQuestBusy$ into a temp global variable. $@KHQuestBusy$. 
+//=     Corrected "KH_Kielh02", was setting off a debug, invalid map index. Should have been "kh_Kiehl02"
+//=     Made .KHQuestBusy$ into a temp global variable. $@KHQuestBusy$. 
 //= 2.0 Changed the labels on the "Big Doors" to "Identifier Names" to prevent an error with using getvariableofnpc [L0ne_W0lf]
 //= 2.1 Fifth door now checks for a variable HIGHER or EQUAL to 74 not 84, as pointed out by Stollen. [L0ne_W0lf]
 //= 2.2 Another fix for Elly, no longer RESETS to 26 when you talk to her. [L0ne_W0lf]
 //= 2.3 Should NOT have been setting .KHQuestBusy at all. It's not used or accessed anymore. Removed. [L0ne_W0lf]
 //= 2.4 Lots of fixes (4ish) from Valandi. [L0ne_W0lf]
-//=	Added a getmapuser check to the mapwarp in KHTimerEnd so it's not trying to warp out 0 users. [L0ne_W0lf]
+//=     Added a getmapuser check to the mapwarp in KHTimerEnd so it's not trying to warp out 0 users. [L0ne_W0lf]
 //= 2.5 Fixed several small issues (and large one) such as typos in cutins, typos in dialog, etc. [L0ne_W0lf]
-//=	Added some of the missing dialogs for several NPCs, and fixed a few NPC locations.
-//=	ALL books can now trigger the wall.
-//=	Allysia will now summon 4 (was 2) G_CONSTANTS instead of REGULAR constants.
-//=	Fixed where Golden_Key and Kiel_Button are deleted.
-//=	Removed KHTimerEnd, and instead use OnReset.
-//=	Fixed typo in the second NPC that gives Black Keycards.
-//=	Added Monster Warps. (Keeps monsters from being in dungeon quest area.) [Non-functional]
+//=     Added some of the missing dialogs for several NPCs, and fixed a few NPC locations.
+//=     ALL books can now trigger the wall.
+//=     Allysia will now summon 4 (was 2) G_CONSTANTS instead of REGULAR constants.
+//=     Fixed where Golden_Key and Kiel_Button are deleted.
+//=     Removed KHTimerEnd, and instead use OnReset.
+//=     Fixed typo in the second NPC that gives Black Keycards.
+//=     Added Monster Warps. (Keeps monsters from being in dungeon quest area.) [Non-functional]
 //= 2.6 Stupid mistake, accidentally had 4 copies of the same script in 1... [L0ne_W0lf the bonehead]
 //= 2.7 Fixed the wrong name being displayed for Kiel Hyre in one dialog. 
-//=	Removed $@KH_DoorInvoker entirely. The quest is now working like it should according to iRO.
-//=	Fixed up a few more NPC headers. Facing direction fixes mostly this time.
-//=	More progression changes to Kiehl Hyre. He no longer stops dialog after the agents appear.
+//=     Removed $@KH_DoorInvoker entirely. The quest is now working like it should according to iRO.
+//=     Fixed up a few more NPC headers. Facing direction fixes mostly this time.
+//=     More progression changes to Kiehl Hyre. He no longer stops dialog after the agents appear.
 //= 2.8 Fixed the weight checking in Vandt, and added official dialog. [L0ne_W0lf]
-//=	Added weight checks for all NPCs that give items. Semi-official dialog.
-//=	Got the missing portion of dialog for Mills'.
-//=	Will add further proper dialogs as I get to them on the second runthrough of the quest.
+//=     Added weight checks for all NPCs that give items. Semi-official dialog.
+//=     Got the missing portion of dialog for Mills'.
+//=     Will add further proper dialogs as I get to them on the second runthrough of the quest.
 //= 2.8a minor optimization with extra goto, else or empty switch [Lupus]
 //= 2.9 Fixed the "enablenpc" problem with the missing spaces. No idea how it happened. [L0ne_W0lf]
 //= 3.0 Fixed a typo in Elly, in her room. (was <= should have been <) [L0ne_W0lf]
-//=	Added an 'end;' to the cookie basket. Kiel Hyre's final dialog will now delete all quest-related items.
+//=     Added an 'end;' to the cookie basket. Kiel Hyre's final dialog will now delete all quest-related items.
 //= 3.1 Moved the "delitem" for all related quest items to the proper NPC. [L0ne_W0lf]
 //= 3.2 Fixed error with Allysia teling you to "Go away." maybe. [L0ne_W0lf]
 //= 3.2b Fixed some typos and grammar mistakes. [SinSloth]
@@ -7228,7 +7172,8 @@ OnInit:
 //=     for items, should be used bitwise methods in a single variable. So let's fix the rest possible bugs (if they exist) and then optimize ^_-
 //= 3.5 Changed the way the Black Keycard distibuting NPCs work slighty. [L0ne_W0lf]
 //= 3.6 Keil Hyre removes ALL outstanding quest items when he is talked [L0ne_W0lf]
-//=	to after finishing the quest.
+//=     to after finishing the quest.
 //= 3.7 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 3.8 Corrected some delitems. (bugreport:690) [Samuray22]
 //= 3.9 Fixed a cutin not being erased. (bugreport:1539) [L0ne_W0lf]
+//============================================================
diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt
index cfb7e50ac..d08c251e9 100644
--- a/npc/quests/lvl4_weapon_quest.txt
+++ b/npc/quests/lvl4_weapon_quest.txt
@@ -4,15 +4,13 @@
 //= Vicious_Pucca, Reddozen & MasterOfMuppets
 //===== Current Version: =====================================
 //= 1.6
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Grade A and Grade S weapon quests
 //===== Additional Comments: =================================
 //= 1.0 First Version, Credits goes to Vicious_Pucca for converting [MasterOfMuppets]
 //=     the quest from aegis format to eA format. Also thanks to 
-//=	reddozen for fixing bugs.
+//=     reddozen for fixing bugs.
 //= 1.1 Many fixes to spelling, grammar, and sentence order. [Silent]
 //= 1.2 A small fix, thanks to vicious_pucca [MasterOfMuppets]
 //= 1.21 Fixing MoM's typos (Citrin -> Citrine) [erKURITA]
@@ -2139,8 +2137,7 @@ niflheim,240,193,3	script	Kayron#lv4	794,{
 }
 
 niflheim,99,268,5	script	Reyghema#lv4	794,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 3000) {
+	if (MaxWeight - Weight < 3000) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
 	}
diff --git a/npc/quests/mage_solution.txt b/npc/quests/mage_solution.txt
index 0eb3b101a..401372a67 100644
--- a/npc/quests/mage_solution.txt
+++ b/npc/quests/mage_solution.txt
@@ -1,42 +1,55 @@
-moc_ruins,91,150,0	script	Ponka-Hontas	93,{
+//===== Hercules Script ======================================
+//= Mage Solutions
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Traders for Morroc Solution and Payon Solution, used in
+//= the Sage skill quests and the Pre-Renewal Mage job quest.
+//===== Additional Comments: =================================
+//= 1.0 Split from Pre-Renewal Mage job quest. [Zopokx]
+//============================================================
+
+pay_arche,122,100,0	script	Dollshoi	88,{
 	mes "[Mage Guildsman]";
-	mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Testtube.";
+	mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube.";
 	next;
 	if (select("Alright, Deal.:Nah, forget it.") == 1) {
 		mes "[Mage Guildsman]";
-		if (zeny < 50) {
-			mes "I'm sorry, but you don't have enough money to cover the 50 Zeny fee.";
+		if (Zeny < 50) {
+			mes "Hey! You don't have enough money to cover my 50 Zeny charge.";
 			close;
 		}
 		if (countitem(1092) == 0) {
-			mes "You can't carry liquids without using a bottle. Bring an Empty Test Tube the next time you see me.";
+			mes "You can't carry solutions without a bottle! Bring me an Empty Test Tube.";
 			close;
 		}
 		delitem 1092,1; //Empty_Cylinder
-		set zeny,zeny-50;
-		getitem 1088,1; //Morocc_Potion
+		set Zeny, Zeny-50;
+		getitem 1089,1; //Payon_Potion
 	}
 	close;
 }
 
-
-pay_arche,122,100,0	script	Dollshoi	88,{
+moc_ruins,91,150,0	script	Ponka-Hontas	93,{
 	mes "[Mage Guildsman]";
-	mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube.";
+	mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Test Tube.";
 	next;
 	if (select("Alright, Deal.:Nah, forget it.") == 1) {
 		mes "[Mage Guildsman]";
 		if (Zeny < 50) {
-			mes "Hey! You don't have enough money to cover my 50 Zeny charge.";
+			mes "I'm sorry, but you don't have enough money to cover the 50 Zeny fee.";
 			close;
 		}
 		if (countitem(1092) == 0) {
-			mes "You can't carry solutions without a bottle! Bring me an Empty Test Tube.";
+			mes "You can't carry liquids without using a bottle. Bring an Empty Test Tube the next time you see me.";
 			close;
 		}
 		delitem 1092,1; //Empty_Cylinder
-		set zeny,zeny-50;
-		getitem 1089,1; //Payon_Potion
+		set Zeny, Zeny-50;
+		getitem 1088,1; //Morocc_Potion
 	}
 	close;
 }
diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt
index b5fa9a8a9..b48953301 100644
--- a/npc/quests/monstertamers.txt
+++ b/npc/quests/monstertamers.txt
@@ -4,8 +4,6 @@
 //= kobra_k88, Darkchild, x[tsk]
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Cute pet quest items
 //===== Additional Comments: =================================
@@ -16,7 +14,7 @@
 //= 1.4 Updated Monster taming item quests. [L0ne_W0lf]
 //= 1.4a FIXED item requirement for stellar hairpin. [L0ne_W0lf]
 //= 1.4b Fixed the delitem assosiated with the last uptate. [L0ne_W0lf]
-//= 1.5 Renamed Izlude Monster Tamer to function with Renewal [Streusel]
+//= 1.5 Moved Izlude NPC to pre-re/re paths.
 //============================================================
 
 alberta_in,173,76,4	script	Monster Tamer#alb	125,{
@@ -465,7 +463,7 @@ aldeba_in,168,175,4	script	Monster Tamer#alde	125,{
 	}
 }
 
--	script	::Monster_Tamer#izu	-1,{
+-	script	::MonsterTamer_izlude	-1,{
 	mes "[Shogo]";
 	mes "Are you pre-occupied with";
 	mes "gathering items for monsters";
diff --git a/npc/quests/mrsmile.txt b/npc/quests/mrsmile.txt
index 8f5d94117..4baf22093 100644
--- a/npc/quests/mrsmile.txt
+++ b/npc/quests/mrsmile.txt
@@ -1,18 +1,16 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Mr. Smile Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88, Akaru
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4a
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Trade Clover, Fluff and Jellopy for a Mr. Smile mask.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.4a Fixed a little Typo error in duplicates. (bugreport:749) [Samuray22]
-//============================================================ 
+//============================================================
 
 -	script	Smile Assistance::SmileHelper	92,{
 	mes "[Smile Girl]";
@@ -102,10 +100,10 @@ moc_ruins,59,154,3	duplicate(SmileHelper)	Smile Assistance#moc	92
 payon,186,104,5	duplicate(SmileHelper)	Smile Assistance#pay	92
 prontera,157,187,4	duplicate(SmileHelper)	Smile Assistance#prt	92
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Fully working. 1.1 Optimized
 //= 1.2 updated Payon coords [Lupus]
 //= 1.3 fixed exploit [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index 71c33e6aa..2516a189c 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -1,13 +1,11 @@
 //===== Hercules Script ======================================
 //= 2004 Headgear Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Dj-Yhn
-//===== Current Version: ===================================== 
-//= 1.6a
-//===== Compatible With: ===================================== 
-//= Hercules Git
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.6b
+//===== Description: =========================================
+//= [Official Conversion]
 //= 2004 New Headgears. Official Quests
 //= 1) Black Cat Ears (payon 115 131)
 //= 2) X Hairpin, Band Aid, Flower Hairpin (geffen 129 148)
@@ -21,12 +19,12 @@
 //= 10) Model Training Hat (payon_in03 8 193)
 //= 11) Tulip Haipin (geffen 83 189)
 //= 12) Party Hat, Straw Hat, Cowboy Hat, (xmas_in 35 30)
-//=	Sombrero, Beanie 
+//=     Sombrero, Beanie 
 //= 13) Decorative Golden Bell, (yuno_in03 20 18)
-//=	Crown of Ancient Queen, Crown of Mistress
+//=     Crown of Ancient Queen, Crown of Mistress
 //= 14) Alarm Mask (alde_alche 88 180)
 //= 15) Drooping Cat, Smokie Leaf, Lazy Smokie, (morocc 273 79)
-//	Blue Fish
+//=     Blue Fish
 //= 16) Kitsune Mask (pay_dun03 48 84)
 //= 17) Orc Hero Helm (in_orcs01 31 93 & 162 33)
 //===== Additional Comments: =================================
@@ -34,11 +32,13 @@
 //= 1.5 Vito'd function call for checkweight. [L0ne_W0lf]
 //= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.6a Added 'disable_items' command. [Euphy]
+//= 1.6b Added more 'disable_items' commands. [Euphy]
 //============================================================
 
 // Black Cat Ears
 //============================================================
 payon,115,131,3	script	Neko Neko#1	725,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -68,7 +68,7 @@ payon,115,131,3	script	Neko Neko#1	725,{
 		delitem 2213,1; //Cat_Hairband
 		delitem 983,1; //Black_Dyestuffs
 		delitem 914,200; //Fluff
-		set zeny,zeny-10000;
+		set Zeny, Zeny-10000;
 		getitem 5057,1; //Ear_Of_Black_Cat
 		next;
 		mes "[Neko Neko]";
@@ -106,6 +106,7 @@ payon,115,131,3	script	Neko Neko#1	725,{
 // X Hairpin, Band Aid, Flower Hairpin
 //============================================================
 geffen,129,148,3	script	Argen#1	779,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "[Argen]";
 		mes "Hey~ why are you carrying so many items?";
@@ -249,7 +250,7 @@ geffen,129,148,3	script	Argen#1	779,{
 			mes "Hey, that looks pretty smooth! Oh, and uh, you can keep this leftover Stem.";
 			delitem 2269,1; //Centimental_Flower
 			delitem 999,10; //Steel
-			set zeny,zeny-20000;
+			set Zeny, Zeny-20000;
 			getitem 5061,1; //Flower_Hairpin
 			getitem 905,1; //Stem
 			next;
@@ -295,6 +296,7 @@ geffen,129,148,3	script	Argen#1	779,{
 // Hot-blooded Headband
 //============================================================
 yuno,300,188,5	script	Zhenbolt#1	753,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -390,6 +392,7 @@ yuno,300,188,5	script	Zhenbolt#1	753,{
 // Red Ribbon
 //============================================================
 prontera,165,232,3	script	Nephia#1	744,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -521,7 +524,7 @@ comodo,237,217,5	script	Meruntei#1	732,{
 		delitem 5010,1; //Indian_Hair_Piece
 		delitem 5049,1; //Stripe_Band
 		delitem 7101,10; //Peco_Wing_Feather
-		set zeny,zeny-10000;
+		set Zeny, Zeny-10000;
 		getitem 5071,1; //Indian_Headband
 		next;
 		mes "[Meruntei]";
@@ -686,8 +689,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item.^000000 I can't mess up my artwork because of some mistake you might make.";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch...!";
 					mes "Why are you carrying so many items with you? Leave all your extra baggage somewhere else and come back.";
@@ -706,7 +708,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "'Angel Wing Ears!'";
 						delitem 2254,1; //Angelic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						set Zeny, Zeny-20000;
 						getitem 5074,1; //Ear_Of_Angel's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -745,8 +747,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item.^000000 I can't mess up my artwork because of some mistake you might make.";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch...!";
 					mes "Why are you carrying so many items with you? Leave all your extra baggage somewhere else and come back.";
@@ -762,7 +763,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "There you go, buddy. I am proud to say this is my masterpiece. I call it... 'Devil Wing Ears!'";
 						delitem 2255,1; //Satanic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						set Zeny, Zeny-20000;
 						getitem 5068,1; //Ear_Of_Devil's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -813,8 +814,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item. I can't mess up my artwork because of some mistake you might make. ^000000";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch, why are you carrying";
 					mes "so many items with you?";
@@ -833,7 +833,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "I am proud to say this is my masterpiece. Please take this item. I call it... 'Devil Wing Ears!'";
 						delitem 2255,1; //Satanic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						set Zeny, Zeny-20000;
 						getitem 5068,1; //Ear_Of_Devil's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -869,8 +869,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item.^000000 I can't mess up my artwork because of some mistake you might make.";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch, why are you carrying";
 					mes "so many items with you?";
@@ -888,7 +887,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "I am proud to say this is my masterpiece. Please take this item. I call it... 'Angel Wing Ears!'";
 						delitem 2254,1; //Angelic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						set Zeny, Zeny-20000;
 						getitem 5074,1; //Ear_Of_Angel's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -963,6 +962,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 // Sea-Otter Hat
 //============================================================
 xmas,183,267,3	script	Pretty Lindsay#1	793,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -971,8 +971,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 		mes "- you put some items into Kafra Storage. -";
 		close;
 	}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (MaxWeight-Weight < 2000) {
 		mes "[Pretty Lindsay]";
 		mes "I know you brought everything you need for me to make you a hat, but you're carrying too much stuff. Why don't you put some of your things in Kafra Storage?";
 		close;
@@ -1078,6 +1077,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 // Teddybear Hat
 //============================================================
 xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -1165,6 +1165,7 @@ xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
 // Model Training Hat
 //============================================================
 payon_in03,8,193,4	script	Nanhyang#1	77,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -1325,6 +1326,7 @@ payon_in03,8,193,4	script	Nanhyang#1	77,{
 // Tulip Hairpin
 //============================================================
 geffen,83,189,5	script	Seth#1	716,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes " [Seth]";
 		mes "Whoa, why are you carrying so many items with you?";
@@ -1378,7 +1380,7 @@ geffen,83,189,5	script	Seth#1	716,{
 			mes "I'm done!";
 			mes "I did a good job, didn't I?";
 			next;
-			if (BaseJob == Job_Novice && Upper != 1) {
+			if (BaseJob == Job_Novice || BaseJob == Job_SuperNovice) {
 				mes "[Seth]";
 				mes "Oh, here's the leftovers. Mommy says that we should always save things. Heh heh~";
 				getitem 935,1; //Shell
@@ -1443,6 +1445,7 @@ geffen,83,189,5	script	Seth#1	716,{
 // Party Hat, Straw Hat, Cowboy Hat, Sombrero, Beanie
 //============================================================
 xmas_in,35,30,3	script	Hat Merchant#zero	797,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -1733,6 +1736,7 @@ xmas_in,35,30,3	script	Hat Merchant#zero	797,{
 // Decorative Golden Bell, Crown of Ancient Queen, Crown of Mistress
 //============================================================
 yuno_in03,20,18,6	script	Nehris#1	726,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -1774,7 +1778,7 @@ yuno_in03,20,18,6	script	Nehris#1	726,{
 			delitem 10016,1; //Golden_Bell
 			delitem 714,1; //Emperium
 			delitem 969,3; //Gold
-			set zeny,zeny-20000;
+			set Zeny, Zeny-20000;
 			getitem 5091,1; //Big_Golden_Bell
 			mes "[Nehris]";
 			mes "Yoohoo~";
@@ -1812,7 +1816,7 @@ yuno_in03,20,18,6	script	Nehris#1	726,{
 			delitem 10006,1; //Queen's_Hair_Ornament
 			delitem 714,1; //Emperium
 			delitem 969,3; //Gold
-			set zeny,zeny-20000;
+			set Zeny, Zeny-20000;
 			getitem 5080,1; //Headgear_Of_Queen
 			mes "[Nehris]";
 			mes "Tah dah!";
@@ -1862,7 +1866,7 @@ yuno_in03,20,18,6	script	Nehris#1	726,{
 				delitem 2249,1; //Coronet
 				delitem 714,1; //Emperium
 				delitem 969,3; //Gold
-				set zeny,zeny-40000;
+				set Zeny, Zeny-40000;
 				getitem 5081,1; //Mistress_Crown
 				mes "[Nehris]";
 				mes "Yay! You've got a great looking crown!";
@@ -2070,6 +2074,7 @@ OnInit:
 // Drooping Cat, Smokie Leaf, Lazy Smokie, Blue Fish
 //============================================================
 morocc,273,79,4	script	Educated Traveller	99,{
+	disable_items;
 	if ((MaxWeight-Weight) < 5000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're over weight -";
@@ -2506,6 +2511,7 @@ OnTouch:
 }
 
 pay_dun03,48,84,4	script	Nine Tails#Kitsune Man	762,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you are carrying -";
@@ -2627,6 +2633,7 @@ OnMyMobDead2:
 //============================================================
 in_orcs01,31,93,1	script	Orc Warrior#1	1023,2,2,{
 OnTouch:
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -3625,14 +3632,14 @@ OnTouch:
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.01 Fixed items names iRO->kRO, fixed some bugs [Qwadrat]
-//=	Fixed possible item exploits, fixed Straw Hat
-//= 	Added missing checks [Lupus]
-//= 1.1	Fixed a bug in Giant-band-aid that didn't counting rotten bandages
-//=	Fixed a bug in Fur Hat that didn't count yarn [Evera]
+//=     Fixed possible item exploits, fixed Straw Hat
+//=     Added missing checks [Lupus]
+//= 1.1 Fixed a bug in Giant-band-aid that didn't counting rotten bandages
+//=     Fixed a bug in Fur Hat that didn't count yarn [Evera]
 //= 1.2 Syntax fixes for parenthesis, reformatting [KarLaeda]
 //= 1.3 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //============================================================
diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt
index e60169ab0..003019be9 100644
--- a/npc/quests/newgears/2005_headgears.txt
+++ b/npc/quests/newgears/2005_headgears.txt
@@ -1,13 +1,11 @@
 //===== Hercules Script ======================================
 //= 2005 Headgear Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= MasterOfMuppets
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3a
-//===== Compatible With: ===================================== 
-//= Hercules Git
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= 2005 Headgears Official Quest.
 //===== Additional Comments: =================================
 //= 1.0 First version, converted from the official aegis script. [MasterOfMuppets]
@@ -16,7 +14,7 @@
 //= 1.3 Fixed item check bugs, added missing airport NPC,
 //      and took out unneeded breaks [Xantara] [Muad_Dib]
 //= 1.3a Added 'disable_items' command. [Euphy]
-//============================================================ 
+//============================================================
 
 yuno,222,116,3	script	Kasis#LhzHat	851,{
 	if(countitem(519) > 49 && countitem(7031) > 49 && countitem(548) > 49 && countitem(539) > 49)
@@ -750,7 +748,7 @@ lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
 
 lighthalzen,360,313,3	script	Kid#LhzHat	706,{
 	mes "[Kid]";
-	if(sex)
+	if(Sex)
 		mes "Hello, mister!";
 	else
 		mes "Hello, ma'am!";
diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt
index 2b62662ce..ef754e122 100644
--- a/npc/quests/newgears/2006_headgears.txt
+++ b/npc/quests/newgears/2006_headgears.txt
@@ -5,24 +5,25 @@
 //===== Current Version: =====================================
 //= 1.4
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Censor Bar, Feather Beret, Valk. Helm, Hahoe Mask,
 //= Mythical Lion Mask, Bride Mask, Magistrate Hat and Ayam
 //===== Additional Comments: =================================
 //= NPC id's and dialog are custom, please replace
 //= 1.0a fixed typos, added missing names, more cleaned and
-//= standartized stuff a bit [Lupus]
+//=     standartized stuff a bit [Lupus]
 //= 1.0b fixed Helm of Valkyries ingredients
 //= 1.0c corrected item names according to item_db [Lupus]
 //= 1.1 Full update. EuRO (?) dialogs, and positions. [L0ne_W0lf]
 //= 1.2 Fixed bugs in the Hahoe/Lion/Bride Mask NPC. [L0ne_W0lf]
-//=	Fixed some of the names to iRO.
+//=     Fixed some of the names to iRO.
 //= 1.3 Fixed some color code bugs in Ghenirhemin. Thanks to yyCC. [L0ne_W0lf]
 //= 1.3a Fixed wrong item names (due to copy/paste) [Lupus]
 //= 1.4 Chungwolmang now checks if the last item set should be deleted. (bugreport:4719) [L0ne_W0lf]
 //============================================================
 
-//===================== Censor Bar =====================================================
+// Censor Bar
+//============================================================
 rachel,91,273,8	script	?	930,{
 	if (countitem(983) > 0 && countitem(7111) > 99 && countitem(938) > 98 && Zeny > 99999) {
 		mes "[?]";
@@ -89,7 +90,8 @@ rachel,91,273,8	script	?	930,{
 	close;
 }
 
-//======================== Feather Beret ================================================
+// Feather Beret
+//============================================================
 rachel,152,131,3	script	Sakjul	928,{
 	if (countitem(5172) > 0 && countitem(7063) > 99 && countitem(982) > 0) {
 		mes "[Sakjul]";
@@ -204,12 +206,13 @@ rachel,152,131,3	script	Sakjul	928,{
 	close;
 }
 
-//============================ Valkyrie Helm =====================================================
+// Valkyrie Helm
+//============================================================
 hugel,147,103,3	script	Ghenirhemin	897,{
 	if (moza_valkylie == 5) {
 		set .@val2,rand(1,10);
 		if (.@val2 == 3) {
-			misceffect 348; //EF_LIGHTSPHERE
+			specialeffect EF_LIGHTSPHERE;
 			mes "[Ghenirhemin]";
 			mes "The materials are still being fused.";
 			next;
@@ -217,7 +220,7 @@ hugel,147,103,3	script	Ghenirhemin	897,{
 			mes "Umm?! Oh...oh?! Isn't this...";
 			mes "Isn't this...?!";
 			next;
-			misceffect 322; //EF_FORESTLIGHT2
+			specialeffect EF_FORESTLIGHT2;
 			mes "[Ghenirhemin]";
 			mes "Ah...ahahaha, we've made it! We've made it!";
 			mes "Valkyre's Helm...We've recreated Valkyre's Helm,";
@@ -249,7 +252,7 @@ hugel,147,103,3	script	Ghenirhemin	897,{
 			mes "who is now heading toward the new history.";
 			close;
 		}
-		misceffect 348; //EF_LIGHTSPHERE
+		specialeffect EF_LIGHTSPHERE;
 		mes "[Ghenirhemin]";
 		mes "The materials are still being fused.";
 		close;
@@ -260,7 +263,7 @@ hugel,147,103,3	script	Ghenirhemin	897,{
 			mes "[Ghenirhemin]";
 			mes "............";
 			next;
-			misceffect 348; //EF_LIGHTSPHERE
+			specialeffect EF_LIGHTSPHERE;
 			mes "[Ghenirhemin]";
 			mes "Oh...oh? They....they just have started being fused!";
 			mes "Look at this shining light!";
@@ -560,7 +563,8 @@ hugel,147,103,3	script	Ghenirhemin	897,{
 	mes "when you show me your money. Hahahaha!";
 	close;
 }
-//======================= Hahoe Mask / Mythical Lion Mask / Bride Mask ===============================
+// Hahoe Mask / Mythical Lion Mask / Bride Mask
+//============================================================
 payon,135,320,3	script	Chungwolmang	97,{
 	if (moza_tal == 2) {
 		if (countitem(7015) > 19 && countitem(952) > 99 && countitem(1028) > 99) {
@@ -802,7 +806,8 @@ S_MakeMask:
 }
 
 
-//====================== Magistrate Hat / Ayam =============================================
+// Magistrate Hat / Ayam
+//============================================================
 payon_in03,139,124,3	script	Han Garam	88,{
 	if (moza_korea == 2 && countitem(954) > 299 && countitem(733) > 4 && countitem(975) > 0 && countitem(7166) > 49) {
 		mes "[Han Garam]";
@@ -967,7 +972,7 @@ payon_in03,139,124,3	script	Han Garam	88,{
 		mes "He is waving his tail, and showing me future!";
 		mes "Aaaaaahhhhhhh!";
 		next;
-		misceffect 90; //EF_LORD;
+		specialeffect EF_LORD;
 		mes "[Han Garam]";
 		mes "Waaaahhhh!";
 		next;
@@ -999,7 +1004,7 @@ payon_in03,139,124,3	script	Han Garam	88,{
 		mes "Anyone who brings these, I will create hat for him!";
 		mes "Ahhh~ Dragon God!";
 		next;
-		misceffect 7; //EF_EXIT;
+		specialeffect EF_EXIT;
 		mes "[Han Garam]";
 		mes ".............";
 		next;
diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt
index 62e2aaac3..5de069de8 100644
--- a/npc/quests/newgears/2008_headgears.txt
+++ b/npc/quests/newgears/2008_headgears.txt
@@ -6,7 +6,7 @@
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Cats Footprint, Cute Ribbon Dyer and Brides Corolla.
 //===== Additional Comments: =================================
 //= 1.0 First Version. [Masao]
@@ -15,7 +15,7 @@
 gef_fild05,80,149,3	script	Myu#08_hat	877,{
 	mes "[Myu]";
 	mes "Meow...";
-	emotion 23;
+	emotion e_omg;
 	next;
 	if(hatcat2008 == 0) {
 		mes "[Myu]";
@@ -23,7 +23,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	877,{
 		mes "What brings you here? Ho, you are not here to harm Wild Roses, are you?";
 		mes "(Meow!)";
 		next;
-		menu "Meow..?",-;
+		select("Meow..?");
 		mes "[Myu]";
 		mes "Ah, Never mind that.";
 		mes "This place is the village of Deserted people.";
@@ -65,7 +65,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	877,{
 			mes " ";
 			mes "(Meow!)";
 			next;
-			menu "Meow again?!",-;
+			select("Meow again?!");
 			mes "[Myu]";
 			mes "Hmm Hmm I told you to never mind that.";
 			mes "So as I was saying...";
@@ -75,7 +75,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	877,{
 			mes "Exactly 1,000 times no more, no less.";
 			mes "Give them 1,000 warnings and they will back off.";
 			next;
-			menu "What do you mean by 1,000 warnings...?",-;
+			select("What do you mean by 1,000 warnings...?");
 			mes "[Myu]";
 			mes "Hu~Do I have to spell it out for you?";
 			next;
@@ -131,7 +131,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	877,{
 			mes "This is the Seal of our 'Brave Kitty Cats'.";
 			mes "This is soooo valuable, so don't lose it.";
 			next;
-			menu "This is it?",-;
+			select("This is it?");
 			mes "[Myu]";
 			mes "What more did you expect?";
 			mes "That Pow is really a valuable thing!";
@@ -780,7 +780,7 @@ OnTouch:
 			mes "Weaving the flower...with a ribbon..";
 			mes "Brides...wear...Corollas..";
 			next;
-			menu "Would you make one for me?",-;
+			select("Would you make one for me?");
 			if((countitem(10007) > 0) && (countitem(1032) > 999)) {
 				mes "[Aite]";
 				mes ".. Materials..you..have..";
diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt
index 1c6d4b57d..4a2971eea 100644
--- a/npc/quests/ninja_quests.txt
+++ b/npc/quests/ninja_quests.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Ninja quests
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
 //= 1.2a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Ninja quests
 //===== Additional Comments: =================================
diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt
index 097d7f78b..5796bd8f6 100644
--- a/npc/quests/obb_quest.txt
+++ b/npc/quests/obb_quest.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Old Blue Box Quest
 //===== By ===================================================
 //= Celesta, Lupus
 //===== Version ==============================================
 //= 2.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-// [Aegis Conversion]
+//===== Description: =========================================
+// [Official Conversion]
 //= Old Blue Box quest (?)
 //= Officially this quest gave an OBB in exhange for a the
 //= required items unlimitedly, however this was changed by
@@ -15,12 +13,12 @@
 //= The exact purpose of this quest is undetermined, but
 //= Gravity claimed that another quest would eventually
 //= branch from this one.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.8 Added missing checkweights. [L0ne_W0lf]
 //= 1.9 Moved Morroc NPCs to Morroc Ruins. [L0ne_W0lf]
 //= 2.0 Removed unused "name" variable. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 alberta,43,244,0	script	Tourist#thai	99,{
 	if (checkweight(1201,1) == 0) {
@@ -457,8 +455,7 @@ alberta,43,244,0	script	Tourist#thai	99,{
 			next;
 			mes "[Tourist]";
 			mes "Hopefully, it'll be useful.";
-			set .@now_weight,MaxWeight-Weight;
-			if (.@now_weight < 500) {
+			if (MaxWeight - Weight < 500) {
 				mes "Umm...it seems you're carrying too much stuff with you.";
 				mes "Doncha want me to help you?";
 				close;
@@ -1939,10 +1936,10 @@ moc_ruins,107,62,0	script	Tommy#thai	716,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Official OBB Quest. You can pass it any times you want.
 //= 1.6 Updated, fixed, optimized and translated into English [Lupus]
 //= 1.6a Halved the required items to make an obb, thanks to marquis007 [MasterOfMuppets]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt
index a2a84f868..f5821d3dd 100644
--- a/npc/quests/okolnir.txt
+++ b/npc/quests/okolnir.txt
@@ -1,16 +1,17 @@
 //===== Hercules Script ======================================
 //= Falicious Okolnir (Valfreja & Nidhoggr)
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Joseph
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
 //= [Official Conversion]
 //= God Item SE Creation script (Asprika & Brynhild)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 0.x Previous author: L0ne_W0lf
 //= 1.0 Merged Okolnir. [Joseph]
-//============================================================ 
+//= 1.1 Some bug fixes. [Toshiro90/Euphy]
+//============================================================
 
 function	script	F_Okolnir	{
 	if (compare(strnpcinfo(0),"main")) end;
@@ -143,16 +144,16 @@ OnInit:
 	end;
 }
 
-arug_cas01,161,371,3	duplicate(Guide#gq_main)	Guide#gq_aru01	899,
-arug_cas02,349,347,3	duplicate(Guide#gq_main)	Guide#gq_aru02	899,
-arug_cas03,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru03	899,
-arug_cas04,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru04	899,
-arug_cas05,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru05	899,
-schg_cas01,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch01	899,
-schg_cas02,181,335,3	duplicate(Guide#gq_main)	Guide#gq_sch02	899,
-schg_cas03,84,101,3	duplicate(Guide#gq_main)	Guide#gq_sch03	899,
-schg_cas04,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch04	899,
-schg_cas05,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch05	899,
+arug_cas01,161,371,3	duplicate(Guide#gq_main)	Guide#gq_aru01	899
+arug_cas02,349,347,3	duplicate(Guide#gq_main)	Guide#gq_aru02	899
+arug_cas03,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru03	899
+arug_cas04,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru04	899
+arug_cas05,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru05	899
+schg_cas01,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch01	899
+schg_cas02,181,335,3	duplicate(Guide#gq_main)	Guide#gq_sch02	899
+schg_cas03,84,101,3	duplicate(Guide#gq_main)	Guide#gq_sch03	899
+schg_cas04,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch04	899
+schg_cas05,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch05	899
 
 que_qaru01,345,23,0	warp	Gate02#gq_aru01	1,1,arug_cas01,157,369
 que_qaru02,345,23,0	warp	Gate02#gq_aru02	1,1,arug_cas02,349,355
@@ -182,9 +183,9 @@ que_qsch05,345,23,0	warp	Gate02#gq_sch05	1,1,schg_cas05,369,306
 			} else {
 				setarray .@n, 7830,1,7831,1,7832,1,7833,1,7834,1,2357,1,7510,100,969,10,985,20;
 			}
-			for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 1) {
+			for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2) {
 				if (countitem(.@n[.@i]) >= .@n[.@i+1])
-				set .@check, .@check + 1;
+					set .@check, .@check + 1;
 			}
 			if (.@check >= 9) {
 				cutin "wish_maiden11",1;
@@ -352,16 +353,16 @@ OnInit:
 	end;
 }
 
-que_qaru01,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru01	403,
-que_qaru02,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru02	403,
-que_qaru03,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru03	403,
-que_qaru04,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru04	403,
-que_qaru05,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru05	403,
-que_qsch01,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch01	403,
-que_qsch02,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch02	403,
-que_qsch03,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch03	403,
-que_qsch04,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch04	403,
-que_qsch05,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch05	403,
+que_qaru01,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru01	403
+que_qaru02,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru02	403
+que_qaru03,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru03	403
+que_qaru04,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru04	403
+que_qaru05,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru05	403
+que_qsch01,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch01	403
+que_qsch02,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch02	403
+que_qsch03,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch03	403
+que_qsch04,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch04	403
+que_qsch05,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch05	403
 
 -	script	Gate01#gq_main	-1,{
 	function	SMonster;
@@ -374,41 +375,41 @@ OnTouch:
 		if (getd("$@gqse_"+.@sub$+"_miro") == getd("$@gqse_"+.@sub$+"_pcc")) {
 			set .@point,rand(1,5);
 			switch (.@point) {
-				Case 1: warp "que_q"+.@sub$,72,271; break;
-				Case 2: warp "que_q"+.@sub$,45,243; break;
-				Case 3: warp "que_q"+.@sub$,102,248; break;
-				Case 4: warp "que_q"+.@sub$,102,300; break;
-				Case 5: warp "que_q"+.@sub$,46,300; break;
+				case 1: warp "que_q"+.@sub$,72,271; break;
+				case 2: warp "que_q"+.@sub$,45,243; break;
+				case 3: warp "que_q"+.@sub$,102,248; break;
+				case 4: warp "que_q"+.@sub$,102,300; break;
+				case 5: warp "que_q"+.@sub$,46,300; break;
 			}
 			end;
 	
 		}
 		switch (getd("$@gqse_"+.@sub$+"_miro")) {
-			Case 0: setarray .@n, 77,271,72,271,1; break;
-			Case 1: setarray .@n, 63,278,63,282,2; break;
-			Case 2: setarray .@n, 63,294,59,294,3; break;
-			Case 3: setarray .@n, 50,300,46,300,4; break;
-			Case 4: setarray .@n, 51,280,51,285,5; break;
-			Case 5: setarray .@n, 51,258,51,262,6; break;
-			Case 6: setarray .@n, 49,243,45,243,7; break;
-			Case 7: setarray .@n, 86,249,82,249,8; break;
-			Case 8: setarray .@n, 102,243,102,248,9; break;
-			Case 9: setarray .@n, 90,256,90,260,10; break;
-			Case 10: setarray .@n, 90,283,90,280,11; break;
-			Case 11: setarray .@n, 102,295,102,300,12; break;
-			Case 12: setarray .@n, 96,285,96,290,13; break;
-			Case 13: setarray .@n, 63,278,63,282,14; break;
-			Case 14: setarray .@n, 65,243,61,243,15; break;
-			Case 15: setarray .@n, 73,249,70,249,16; break;
-			Case 16: setarray .@n, 102,275,102,282,17; break;
-			Case 17: setarray .@n, 70,300,66,300,18; break;
-			Case 18: setarray .@n, 57,255,57,258,19; break;
-			Case 19: setarray .@n, 84,277,84,280,20; break;
+			case 0: setarray .@n, 77,271,72,271,1; break;
+			case 1: setarray .@n, 63,278,63,282,2; break;
+			case 2: setarray .@n, 63,294,59,294,3; break;
+			case 3: setarray .@n, 50,300,46,300,4; break;
+			case 4: setarray .@n, 51,280,51,285,5; break;
+			case 5: setarray .@n, 51,258,51,262,6; break;
+			case 6: setarray .@n, 49,243,45,243,7; break;
+			case 7: setarray .@n, 86,249,82,249,8; break;
+			case 8: setarray .@n, 102,243,102,248,9; break;
+			case 9: setarray .@n, 90,256,90,260,10; break;
+			case 10: setarray .@n, 90,283,90,280,11; break;
+			case 11: setarray .@n, 102,295,102,300,12; break;
+			case 12: setarray .@n, 96,285,96,290,13; break;
+			case 13: setarray .@n, 63,278,63,282,14; break;
+			case 14: setarray .@n, 65,243,61,243,15; break;
+			case 15: setarray .@n, 73,249,70,249,16; break;
+			case 16: setarray .@n, 102,275,102,282,17; break;
+			case 17: setarray .@n, 70,300,66,300,18; break;
+			case 18: setarray .@n, 57,255,57,258,19; break;
+			case 19: setarray .@n, 84,277,84,280,20; break;
 		}
-			SMonster(.@sub$,.@n[0],.@n[1]);
-			setd "$@gqse_"+.@sub$+"_miro",.@n[4];
-			warp "que_q"+.@sub$,.@n[2],.@n[3];
-			end;
+		SMonster(.@sub$,.@n[0],.@n[1]);
+		setd "$@gqse_"+.@sub$+"_miro",.@n[4];
+		warp "que_q"+.@sub$,.@n[2],.@n[3];
+		end;
 	}
 	else {
 		mes "There are too many people, you can't enter.";
@@ -418,12 +419,12 @@ OnTouch:
 	function	SMonster	{
 	
 		switch (BaseClass) {
-			Case 1: set .@m, 1652; break;
-			Case 2: set .@m, 1663; break;
-			Case 3: set .@m, 1662; break;
-			Case 4: set .@m, 1661; break;
-			Case 5: set .@m, 1660; break;
-			Case 6: set .@m, 1659; break;
+			case 1: set .@m, 1652; break;
+			case 2: set .@m, 1663; break;
+			case 3: set .@m, 1662; break;
+			case 4: set .@m, 1661; break;
+			case 5: set .@m, 1660; break;
+			case 6: set .@m, 1659; break;
 			Default: set .@m, 1652; break;
 		}
 		monster "que_q"+getarg(0),getarg(1),getarg(2),strcharinfo(0),.@m,1,"#Gate_manager_"+getarg(0)+"::OnMyMobDead";
@@ -449,16 +450,16 @@ OnInit:
 	end;
 }
 
-que_qaru01,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru01	45,1,1,
-que_qaru02,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru02	45,1,1,
-que_qaru03,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru03	45,1,1,
-que_qaru04,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru04	45,1,1,
-que_qaru05,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru05	45,1,1,
-que_qsch01,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch01	45,1,1,
-que_qsch02,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch02	45,1,1,
-que_qsch03,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch03	45,1,1,
-que_qsch04,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch04	45,1,1,
-que_qsch05,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch05	45,1,1,
+que_qaru01,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru01	45,1,1
+que_qaru02,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru02	45,1,1
+que_qaru03,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru03	45,1,1
+que_qaru04,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru04	45,1,1
+que_qaru05,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru05	45,1,1
+que_qsch01,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch01	45,1,1
+que_qsch02,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch02	45,1,1
+que_qsch03,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch03	45,1,1
+que_qsch04,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch04	45,1,1
+que_qsch05,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch05	45,1,1
 
 -	script	#Gate_manager_main	-1,{
 	end;
@@ -472,16 +473,16 @@ OnMyMobDead:
 	}
 	end;
 }
-que_qaru01,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru01	844,
-que_qaru02,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru02	844,
-que_qaru03,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru03	844,
-que_qaru04,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru04	844,
-que_qaru05,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru05	844,
-que_qsch01,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch01	844,
-que_qsch02,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch02	844,
-que_qsch03,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch03	844,
-que_qsch04,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch04	844,
-que_qsch05,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch05	844,
+que_qaru01,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru01	844
+que_qaru02,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru02	844
+que_qaru03,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru03	844
+que_qaru04,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru04	844
+que_qaru05,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru05	844
+que_qsch01,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch01	844
+que_qsch02,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch02	844
+que_qsch03,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch03	844
+que_qsch04,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch04	844
+que_qsch05,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch05	844
 
 -	script	#gq_miromob2_main	-1,{
 	end;
@@ -510,7 +511,7 @@ OnTimer6000:
 	stopnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#gq_miromob2_"+.@sub$+"::OnMyMobDead";
 	stopnpctimer;
@@ -526,16 +527,16 @@ OnMyMobDead:
 	}
 	end;
 }
-que_qaru01,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru01	844,
-que_qaru02,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru02	844,
-que_qaru03,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru03	844,
-que_qaru04,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru04	844,
-que_qaru05,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru05	844,
-que_qsch01,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch01	844,
-que_qsch02,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch02	844,
-que_qsch03,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch03	844,
-que_qsch04,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch04	844,
-que_qsch05,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch05	844,
+que_qaru01,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru01	844
+que_qaru02,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru02	844
+que_qaru03,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru03	844
+que_qaru04,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru04	844
+que_qaru05,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru05	844
+que_qsch01,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch01	844
+que_qsch02,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch02	844
+que_qsch03,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch03	844
+que_qsch04,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch04	844
+que_qsch05,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch05	844
 
 -	script	#okolnir_main	-1,{
 	end;
@@ -562,14 +563,14 @@ OnEnable:
 OnDisable:
 	set .@sub$,callfunc("F_Okolnir");
 	disablenpc "Wish Maiden#gq_"+.@sub$;
-	donpcevent "#gq_miromob2_"+.@sub$+"::Onreset";
+	donpcevent "#gq_miromob2_"+.@sub$+"::OnReset";
 	disablenpc "Piamette#"+.@sub$;
-	donpcevent "#gdtimer01_"+.@sub$+"::Onstop";
-	donpcevent "#gdtimer02_"+.@sub$+"::Onstop";
-	donpcevent "#piamette_"+.@sub$+"::Onreset";
+	donpcevent "#gdtimer01_"+.@sub$+"::OnStop";
+	donpcevent "#gdtimer02_"+.@sub$+"::OnStop";
+	donpcevent "#piamette_"+.@sub$+"::OnReset";
 	donpcevent "Wish Maiden#"+.@sub$+"_boss::OnDisable";
 	donpcevent "Wish Maiden#"+.@sub$+"_gift::OnDisable";
-	donpcevent "#gd_"+.@sub$+"_mobctrl::Onreset";
+	donpcevent "#gd_"+.@sub$+"_mobctrl::OnReset";
 	donpcevent "Gate01#gq_"+.@sub$+"::OnDisable";
 	donpcevent "#Maze_Manager_"+.@sub$+"::OnDisable";
 	donpcevent "#event_start01_"+.@sub$+"::OnDisable";
@@ -588,9 +589,9 @@ OnDisable:
 	donpcevent "Temple Keeper#"+.@sub$+"_ac01::OnDisable";
 	donpcevent "Temple Keeper#"+.@sub$+"_ac02::OnDisable";
 	disablenpc "#to_agit_"+.@sub$+"_gate";
-	donpcevent "#"+.@sub$+"_stone01::Onreset";
-	donpcevent "#"+.@sub$+"_stone02::Onreset";
-	donpcevent "#"+.@sub$+"_stone03::Onreset";
+	donpcevent "#"+.@sub$+"_stone01::OnReset";
+	donpcevent "#"+.@sub$+"_stone02::OnReset";
+	donpcevent "#"+.@sub$+"_stone03::OnReset";
 	disablenpc "#"+.@sub$+"_cage01";
 	disablenpc "#"+.@sub$+"_cage02";
 	disablenpc "#"+.@sub$+"_cage03";
@@ -606,7 +607,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -659,14 +660,14 @@ OnTimer3600000:
 	set .@sub$,callfunc("F_Okolnir");
 	mapannounce "que_q"+.@sub$,"Okolnir has begun to disappear.",bc_map,"0x4d4dff";
 	disablenpc "Wish Maiden#gq_"+.@sub$;
-	donpcevent "#gq_miromob2_"+.@sub$+"::Onreset";
+	donpcevent "#gq_miromob2_"+.@sub$+"::OnReset";
 	disablenpc "Piamette#"+.@sub$;
-	donpcevent "#gdtimer01_"+.@sub$+"::Onstop";
-	donpcevent "#gdtimer02_"+.@sub$+"::Onstop";
-	donpcevent "#piamette_"+.@sub$+"::Onreset";
-	donpcevent "Wish Maiden#"+.@sub$+"_boss::onDisable";
+	donpcevent "#gdtimer01_"+.@sub$+"::OnStop";
+	donpcevent "#gdtimer02_"+.@sub$+"::OnStop";
+	donpcevent "#piamette_"+.@sub$+"::OnReset";
+	donpcevent "Wish Maiden#"+.@sub$+"_boss::OnDisable";
 	donpcevent "Wish Maiden#"+.@sub$+"_gift::OnDisable";
-	donpcevent "#gd_"+.@sub$+"_mobctrl::Onreset";
+	donpcevent "#gd_"+.@sub$+"_mobctrl::OnReset";
 	donpcevent "Gate01#gq_"+.@sub$+"::OnDisable";
 	donpcevent "#Maze_Manager_"+.@sub$+"::OnDisable";
 	donpcevent "#event_start01_"+.@sub$+"::OnDisable";
@@ -685,9 +686,9 @@ OnTimer3600000:
 	donpcevent "Temple Keeper#"+.@sub$+"_ac01::OnDisable";
 	donpcevent "Temple Keeper#"+.@sub$+"_ac02::OnDisable";
 	disablenpc "#to_agit_"+.@sub$+"_gate";
-	donpcevent "#"+.@sub$+"_stone01::Onreset";
-	donpcevent "#"+.@sub$+"_stone02::Onreset";
-	donpcevent "#"+.@sub$+"_stone03::Onreset";
+	donpcevent "#"+.@sub$+"_stone01::OnReset";
+	donpcevent "#"+.@sub$+"_stone02::OnReset";
+	donpcevent "#"+.@sub$+"_stone03::OnReset";
 	disablenpc "#"+.@sub$+"_cage01";
 	disablenpc "#"+.@sub$+"_cage02";
 	disablenpc "#"+.@sub$+"_cage03";
@@ -723,16 +724,16 @@ OnTimer3611000:
 	stopnpctimer;
 	end;
 }
-que_qaru01,1,1,0	duplicate(#okolnir_main)	#okolnir_aru01	844,
-que_qaru02,1,1,0	duplicate(#okolnir_main)	#okolnir_aru02	844,
-que_qaru03,1,1,0	duplicate(#okolnir_main)	#okolnir_aru03	844,
-que_qaru04,1,1,0	duplicate(#okolnir_main)	#okolnir_aru04	844,
-que_qaru05,1,1,0	duplicate(#okolnir_main)	#okolnir_aru05	844,
-que_qsch01,1,1,0	duplicate(#okolnir_main)	#okolnir_sch01	844,
-que_qsch02,1,1,0	duplicate(#okolnir_main)	#okolnir_sch02	844,
-que_qsch03,1,1,0	duplicate(#okolnir_main)	#okolnir_sch03	844,
-que_qsch04,1,1,0	duplicate(#okolnir_main)	#okolnir_sch04	844,
-que_qsch05,1,1,0	duplicate(#okolnir_main)	#okolnir_sch05	844,
+que_qaru01,1,1,0	duplicate(#okolnir_main)	#okolnir_aru01	844
+que_qaru02,1,1,0	duplicate(#okolnir_main)	#okolnir_aru02	844
+que_qaru03,1,1,0	duplicate(#okolnir_main)	#okolnir_aru03	844
+que_qaru04,1,1,0	duplicate(#okolnir_main)	#okolnir_aru04	844
+que_qaru05,1,1,0	duplicate(#okolnir_main)	#okolnir_aru05	844
+que_qsch01,1,1,0	duplicate(#okolnir_main)	#okolnir_sch01	844
+que_qsch02,1,1,0	duplicate(#okolnir_main)	#okolnir_sch02	844
+que_qsch03,1,1,0	duplicate(#okolnir_main)	#okolnir_sch03	844
+que_qsch04,1,1,0	duplicate(#okolnir_main)	#okolnir_sch04	844
+que_qsch05,1,1,0	duplicate(#okolnir_main)	#okolnir_sch05	844
 
 -	script	#Maze_Manager_main	-1,{
 	end;
@@ -807,16 +808,16 @@ OnInit:
 	donpcevent "#miro_yf_"+.@sub$+"::OnDisable";
 	end;
 }
-que_qaru01,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru01	844,
-que_qaru02,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru02	844,
-que_qaru03,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru03	844,
-que_qaru04,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru04	844,
-que_qaru05,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru05	844,
-que_qsch01,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch01	844,
-que_qsch02,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch02	844,
-que_qsch03,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch03	844,
-que_qsch04,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch04	844,
-que_qsch05,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch05	844,
+que_qaru01,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru01	844
+que_qaru02,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru02	844
+que_qaru03,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru03	844
+que_qaru04,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru04	844
+que_qaru05,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru05	844
+que_qsch01,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch01	844
+que_qsch02,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch02	844
+que_qsch03,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch03	844
+que_qsch04,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch04	844
+que_qsch05,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch05	844
 
 -	script	#miro_bf_main	-1,{
 	function	Cell;
@@ -844,16 +845,16 @@ OnDisable:
 OnMyMobDead:
 	end;
 }
-que_qaru01,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru01	844,
-que_qaru02,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru02	844,
-que_qaru03,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru03	844,
-que_qaru04,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru04	844,
-que_qaru05,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru05	844,
-que_qsch01,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch01	844,
-que_qsch02,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch02	844,
-que_qsch03,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch03	844,
-que_qsch04,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch04	844,
-que_qsch05,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch05	844,
+que_qaru01,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru01	844
+que_qaru02,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru02	844
+que_qaru03,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru03	844
+que_qaru04,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru04	844
+que_qaru05,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru05	844
+que_qsch01,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch01	844
+que_qsch02,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch02	844
+que_qsch03,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch03	844
+que_qsch04,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch04	844
+que_qsch05,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch05	844
 
 -	script	#miro_rf_main	-1,{
 	function	Cell;
@@ -882,16 +883,16 @@ OnMyMobDead:
 		}
 	}
 }
-que_qaru01,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru01	844,
-que_qaru02,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru02	844,
-que_qaru03,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru03	844,
-que_qaru04,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru04	844,
-que_qaru05,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru05	844,
-que_qsch01,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch01	844,
-que_qsch02,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch02	844,
-que_qsch03,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch03	844,
-que_qsch04,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch04	844,
-que_qsch05,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch05	844,
+que_qaru01,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru01	844
+que_qaru02,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru02	844
+que_qaru03,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru03	844
+que_qaru04,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru04	844
+que_qaru05,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru05	844
+que_qsch01,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch01	844
+que_qsch02,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch02	844
+que_qsch03,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch03	844
+que_qsch04,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch04	844
+que_qsch05,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch05	844
 
 -	script	#miro_yf_main	-1,{
 	function	Cell;
@@ -920,16 +921,16 @@ OnMyMobDead:
 		}
 	}
 }
-que_qaru01,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru01	844,
-que_qaru02,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru02	844,
-que_qaru03,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru03	844,
-que_qaru04,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru04	844,
-que_qaru05,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru05	844,
-que_qsch01,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch01	844,
-que_qsch02,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch02	844,
-que_qsch03,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch03	844,
-que_qsch04,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch04	844,
-que_qsch05,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch05	844,
+que_qaru01,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru01	844
+que_qaru02,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru02	844
+que_qaru03,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru03	844
+que_qaru04,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru04	844
+que_qaru05,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru05	844
+que_qsch01,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch01	844
+que_qsch02,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch02	844
+que_qsch03,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch03	844
+que_qsch04,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch04	844
+que_qsch05,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch05	844
 
 -	script	windpath01_main	-1,{
 	end;
@@ -946,16 +947,16 @@ OnTouch:
 	mes "You need the Crystal Key to activate the Warp Gate.";
 	close;
 }
-que_qaru01,132,172,0	duplicate(windpath01_main)	windpath01_aru01	45,1,1,
-que_qaru02,132,172,0	duplicate(windpath01_main)	windpath01_aru02	45,1,1,
-que_qaru03,132,172,0	duplicate(windpath01_main)	windpath01_aru03	45,1,1,
-que_qaru04,132,172,0	duplicate(windpath01_main)	windpath01_aru04	45,1,1,
-que_qaru05,132,172,0	duplicate(windpath01_main)	windpath01_aru05	45,1,1,
-que_qsch01,132,172,0	duplicate(windpath01_main)	windpath01_sch01	45,1,1,
-que_qsch02,132,172,0	duplicate(windpath01_main)	windpath01_sch02	45,1,1,
-que_qsch03,132,172,0	duplicate(windpath01_main)	windpath01_sch03	45,1,1,
-que_qsch04,132,172,0	duplicate(windpath01_main)	windpath01_sch04	45,1,1,
-que_qsch05,132,172,0	duplicate(windpath01_main)	windpath01_sch05	45,1,1,
+que_qaru01,132,172,0	duplicate(windpath01_main)	windpath01_aru01	45,1,1
+que_qaru02,132,172,0	duplicate(windpath01_main)	windpath01_aru02	45,1,1
+que_qaru03,132,172,0	duplicate(windpath01_main)	windpath01_aru03	45,1,1
+que_qaru04,132,172,0	duplicate(windpath01_main)	windpath01_aru04	45,1,1
+que_qaru05,132,172,0	duplicate(windpath01_main)	windpath01_aru05	45,1,1
+que_qsch01,132,172,0	duplicate(windpath01_main)	windpath01_sch01	45,1,1
+que_qsch02,132,172,0	duplicate(windpath01_main)	windpath01_sch02	45,1,1
+que_qsch03,132,172,0	duplicate(windpath01_main)	windpath01_sch03	45,1,1
+que_qsch04,132,172,0	duplicate(windpath01_main)	windpath01_sch04	45,1,1
+que_qsch05,132,172,0	duplicate(windpath01_main)	windpath01_sch05	45,1,1
 
 que_qaru01,113,165,0	warp	windpath02_aru01	1,1,que_qaru01,139,172
 que_qaru02,113,165,0	warp	windpath02_aru02	1,1,que_qaru02,139,172
@@ -977,16 +978,16 @@ OnInit:
 	end;
 }
 
-que_qaru01,131,136,3	duplicate(Piamette#main)	Piamette#aru01	1930,
-que_qaru02,131,136,3	duplicate(Piamette#main)	Piamette#aru02	1930,
-que_qaru03,131,136,3	duplicate(Piamette#main)	Piamette#aru03	1930,
-que_qaru04,131,136,3	duplicate(Piamette#main)	Piamette#aru04	1930,
-que_qaru05,131,136,3	duplicate(Piamette#main)	Piamette#aru05	1930,
-que_qsch01,131,136,3	duplicate(Piamette#main)	Piamette#sch01	1930,
-que_qsch02,131,136,3	duplicate(Piamette#main)	Piamette#sch02	1930,
-que_qsch03,131,136,3	duplicate(Piamette#main)	Piamette#sch03	1930,
-que_qsch04,131,136,3	duplicate(Piamette#main)	Piamette#sch04	1930,
-que_qsch05,131,136,3	duplicate(Piamette#main)	Piamette#sch05	1930,
+que_qaru01,131,136,3	duplicate(Piamette#main)	Piamette#aru01	1930
+que_qaru02,131,136,3	duplicate(Piamette#main)	Piamette#aru02	1930
+que_qaru03,131,136,3	duplicate(Piamette#main)	Piamette#aru03	1930
+que_qaru04,131,136,3	duplicate(Piamette#main)	Piamette#aru04	1930
+que_qaru05,131,136,3	duplicate(Piamette#main)	Piamette#aru05	1930
+que_qsch01,131,136,3	duplicate(Piamette#main)	Piamette#sch01	1930
+que_qsch02,131,136,3	duplicate(Piamette#main)	Piamette#sch02	1930
+que_qsch03,131,136,3	duplicate(Piamette#main)	Piamette#sch03	1930
+que_qsch04,131,136,3	duplicate(Piamette#main)	Piamette#sch04	1930
+que_qsch05,131,136,3	duplicate(Piamette#main)	Piamette#sch05	1930
 
 -	script	#event_start01_main	-1,{
 	end;
@@ -1035,16 +1036,16 @@ OnInit:
 	disablenpc "#event_start01_"+.@sub$;
 	end;
 }
-que_qaru01,114,158,0	duplicate(#event_start01_main)	#event_start01_aru01	-1,1,1,
-que_qaru02,114,158,0	duplicate(#event_start01_main)	#event_start01_aru02	-1,1,1,
-que_qaru03,114,158,0	duplicate(#event_start01_main)	#event_start01_aru03	-1,1,1,
-que_qaru04,114,158,0	duplicate(#event_start01_main)	#event_start01_aru04	-1,1,1,
-que_qaru05,114,158,0	duplicate(#event_start01_main)	#event_start01_aru05	-1,1,1,
-que_qsch01,114,158,0	duplicate(#event_start01_main)	#event_start01_sch01	-1,1,1,
-que_qsch02,114,158,0	duplicate(#event_start01_main)	#event_start01_sch02	-1,1,1,
-que_qsch03,114,158,0	duplicate(#event_start01_main)	#event_start01_sch03	-1,1,1,
-que_qsch04,114,158,0	duplicate(#event_start01_main)	#event_start01_sch04	-1,1,1,
-que_qsch05,114,158,0	duplicate(#event_start01_main)	#event_start01_sch05	-1,1,1,
+que_qaru01,114,158,0	duplicate(#event_start01_main)	#event_start01_aru01	-1,1,1
+que_qaru02,114,158,0	duplicate(#event_start01_main)	#event_start01_aru02	-1,1,1
+que_qaru03,114,158,0	duplicate(#event_start01_main)	#event_start01_aru03	-1,1,1
+que_qaru04,114,158,0	duplicate(#event_start01_main)	#event_start01_aru04	-1,1,1
+que_qaru05,114,158,0	duplicate(#event_start01_main)	#event_start01_aru05	-1,1,1
+que_qsch01,114,158,0	duplicate(#event_start01_main)	#event_start01_sch01	-1,1,1
+que_qsch02,114,158,0	duplicate(#event_start01_main)	#event_start01_sch02	-1,1,1
+que_qsch03,114,158,0	duplicate(#event_start01_main)	#event_start01_sch03	-1,1,1
+que_qsch04,114,158,0	duplicate(#event_start01_main)	#event_start01_sch04	-1,1,1
+que_qsch05,114,158,0	duplicate(#event_start01_main)	#event_start01_sch05	-1,1,1
 
 -	script	#gdtimer01_main	-1,{
 	end;
@@ -1053,7 +1054,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	set .@sub$,callfunc("F_Okolnir");
 	for (set .@i, 1; .@i <= 8; set .@i, .@i + 1)
 		donpcevent "#getspell0"+.@i+"_"+.@sub$+"::OnDisable";
@@ -1129,16 +1130,16 @@ OnTimer80000:
 	donpcevent "#gdtimer01_"+.@sub$+"::OnEnable";
 	end;
 }
-que_qaru01,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru01	844,
-que_qaru02,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru02	844,
-que_qaru03,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru03	844,
-que_qaru04,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru04	844,
-que_qaru05,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru05	844,
-que_qsch01,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch01	844,
-que_qsch02,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch02	844,
-que_qsch03,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch03	844,
-que_qsch04,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch04	844,
-que_qsch05,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch05	844,
+que_qaru01,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru01	844
+que_qaru02,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru02	844
+que_qaru03,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru03	844
+que_qaru04,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru04	844
+que_qaru05,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru05	844
+que_qsch01,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch01	844
+que_qsch02,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch02	844
+que_qsch03,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch03	844
+que_qsch04,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch04	844
+que_qsch05,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch05	844
 
 -	script	#gdtimer02_main	-1,{
 	end;
@@ -1147,7 +1148,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#gdtimer02_"+.@sub$+"::OnMyMobDead";
@@ -1188,7 +1189,7 @@ OnTimer113000:
 	stopnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#gdtimer02_"+.@sub$+"::OnMyMobDead";
 	end;
@@ -1203,23 +1204,23 @@ OnMyMobDead:
 	}
 	end;
 }
-que_qaru01,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru01	844,
-que_qaru02,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru02	844,
-que_qaru03,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru03	844,
-que_qaru04,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru04	844,
-que_qaru05,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru05	844,
-que_qsch01,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch01	844,
-que_qsch02,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch02	844,
-que_qsch03,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch03	844,
-que_qsch04,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch04	844,
-que_qsch05,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch05	844,
+que_qaru01,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru01	844
+que_qaru02,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru02	844
+que_qaru03,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru03	844
+que_qaru04,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru04	844
+que_qaru05,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru05	844
+que_qsch01,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch01	844
+que_qsch02,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch02	844
+que_qsch03,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch03	844
+que_qsch04,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch04	844
+que_qsch05,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch05	844
 
 -	script	#piamette_main	-1,{
 OnEnable:
 	initnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#piamette_"+.@sub$+"::OnMyMobDead";
 	stopnpctimer;
@@ -1246,16 +1247,16 @@ OnMyMobDead:
 	donpcevent "#nm_switch_"+.@sub$+"::OnEnable";
 	end;
 }
-que_qaru01,1,4,0	duplicate(#piamette_main)	#piamette_aru01	844,
-que_qaru02,1,4,0	duplicate(#piamette_main)	#piamette_aru02	844,
-que_qaru03,1,4,0	duplicate(#piamette_main)	#piamette_aru03	844,
-que_qaru04,1,4,0	duplicate(#piamette_main)	#piamette_aru04	844,
-que_qaru05,1,4,0	duplicate(#piamette_main)	#piamette_aru05	844,
-que_qsch01,1,4,0	duplicate(#piamette_main)	#piamette_sch01	844,
-que_qsch02,1,4,0	duplicate(#piamette_main)	#piamette_sch02	844,
-que_qsch03,1,4,0	duplicate(#piamette_main)	#piamette_sch03	844,
-que_qsch04,1,4,0	duplicate(#piamette_main)	#piamette_sch04	844,
-que_qsch05,1,4,0	duplicate(#piamette_main)	#piamette_sch05	844,
+que_qaru01,1,4,0	duplicate(#piamette_main)	#piamette_aru01	844
+que_qaru02,1,4,0	duplicate(#piamette_main)	#piamette_aru02	844
+que_qaru03,1,4,0	duplicate(#piamette_main)	#piamette_aru03	844
+que_qaru04,1,4,0	duplicate(#piamette_main)	#piamette_aru04	844
+que_qaru05,1,4,0	duplicate(#piamette_main)	#piamette_aru05	844
+que_qsch01,1,4,0	duplicate(#piamette_main)	#piamette_sch01	844
+que_qsch02,1,4,0	duplicate(#piamette_main)	#piamette_sch02	844
+que_qsch03,1,4,0	duplicate(#piamette_main)	#piamette_sch03	844
+que_qsch04,1,4,0	duplicate(#piamette_main)	#piamette_sch04	844
+que_qsch05,1,4,0	duplicate(#piamette_main)	#piamette_sch05	844
 
 -	script	#getspells_main	-1,{
 	end;
@@ -1275,17 +1276,17 @@ OnDisable:
 
 OnTouch:
 	set .@sub$,callfunc("F_Okolnir");
-	sc_start2 SC_Stone,300000,0,10000;
+	sc_start SC_STONE,300000,0,10000;
 	switch (getd("$@gqse_"+.@sub$+"_gd")) {
-		Case 0: setarray .@n$, "103","153","1","Piamette : One white bird has dropped with its wing pierced by an arrow."; break;
-		Case 1: setarray .@n$, "102","135","2","Piamette : One bird is caught in a snare, and dropped into a lake."; break;
-		Case 2: setarray .@n$, "113","111","3","Piamette : One bird has died trapped in it's cage."; break;
-		Case 3: setarray .@n$, "161","105","4","Piamette : One bird was poisoned to death."; break;
-		Case 4: setarray .@n$, "168","135","5","Piamette : One bird vomited blood while singing seven days and seven nights."; break;
-		Case 5: 
+		case 0: setarray .@n$, "103","153","1","Piamette : One white bird has dropped with its wing pierced by an arrow."; break;
+		case 1: setarray .@n$, "102","135","2","Piamette : One bird is caught in a snare, and dropped into a lake."; break;
+		case 2: setarray .@n$, "113","111","3","Piamette : One bird has died trapped in it's cage."; break;
+		case 3: setarray .@n$, "161","105","4","Piamette : One bird was poisoned to death."; break;
+		case 4: setarray .@n$, "168","135","5","Piamette : One bird vomited blood while singing seven days and seven nights."; break;
+		case 5: 
 			setarray .@n$, "150","159","6","Piamette : The last one broke her neck wriggling to get out of from it's eggshell!"; 
 			donpcevent "#gdtimer02_"+.@sub$+"::OnEnable";
-			donpcevent "#gdtimer01_"+.@sub$+"::Onstop";
+			donpcevent "#gdtimer01_"+.@sub$+"::OnStop";
 			break;
 	}
 	disablenpc "#getspell01_"+.@sub$;
@@ -1300,93 +1301,93 @@ OnInit:
 		disablenpc "#getspell0"+.@i+"_"+.@sub$;
 	end;
 }
-que_qaru01,113,135,0	duplicate(#getspells_main)	#getspell01_aru01	-1,1,1,
-que_qaru02,113,135,0	duplicate(#getspells_main)	#getspell01_aru02	-1,1,1,
-que_qaru03,113,135,0	duplicate(#getspells_main)	#getspell01_aru03	-1,1,1,
-que_qaru04,113,135,0	duplicate(#getspells_main)	#getspell01_aru04	-1,1,1,
-que_qaru05,113,135,0	duplicate(#getspells_main)	#getspell01_aru05	-1,1,1,
-que_qsch01,113,135,0	duplicate(#getspells_main)	#getspell01_sch01	-1,1,1,
-que_qsch02,113,135,0	duplicate(#getspells_main)	#getspell01_sch02	-1,1,1,
-que_qsch03,113,135,0	duplicate(#getspells_main)	#getspell01_sch03	-1,1,1,
-que_qsch04,113,135,0	duplicate(#getspells_main)	#getspell01_sch04	-1,1,1,
-que_qsch05,113,135,0	duplicate(#getspells_main)	#getspell01_sch05	-1,1,1,
-que_qaru01,146,150,0	duplicate(#getspells_main)	#getspell02_aru01	-1,1,1,
-que_qaru02,146,150,0	duplicate(#getspells_main)	#getspell02_aru02	-1,1,1,
-que_qaru03,146,150,0	duplicate(#getspells_main)	#getspell02_aru03	-1,1,1,
-que_qaru04,146,150,0	duplicate(#getspells_main)	#getspell02_aru04	-1,1,1,
-que_qaru05,146,150,0	duplicate(#getspells_main)	#getspell02_aru05	-1,1,1,
-que_qsch01,146,150,0	duplicate(#getspells_main)	#getspell02_sch01	-1,1,1,
-que_qsch02,146,150,0	duplicate(#getspells_main)	#getspell02_sch02	-1,1,1,
-que_qsch03,146,150,0	duplicate(#getspells_main)	#getspell02_sch03	-1,1,1,
-que_qsch04,146,150,0	duplicate(#getspells_main)	#getspell02_sch04	-1,1,1,
-que_qsch05,146,150,0	duplicate(#getspells_main)	#getspell02_sch05	-1,1,1,
-que_qaru01,131,117,0	duplicate(#getspells_main)	#getspell03_aru01	-1,1,1,
-que_qaru02,131,117,0	duplicate(#getspells_main)	#getspell03_aru02	-1,1,1,
-que_qaru03,131,117,0	duplicate(#getspells_main)	#getspell03_aru03	-1,1,1,
-que_qaru04,131,117,0	duplicate(#getspells_main)	#getspell03_aru04	-1,1,1,
-que_qaru05,131,117,0	duplicate(#getspells_main)	#getspell03_aru05	-1,1,1,
-que_qsch01,131,117,0	duplicate(#getspells_main)	#getspell03_sch01	-1,1,1,
-que_qsch02,131,117,0	duplicate(#getspells_main)	#getspell03_sch02	-1,1,1,
-que_qsch03,131,117,0	duplicate(#getspells_main)	#getspell03_sch03	-1,1,1,
-que_qsch04,131,117,0	duplicate(#getspells_main)	#getspell03_sch04	-1,1,1,
-que_qsch05,131,117,0	duplicate(#getspells_main)	#getspell03_sch05	-1,1,1,
-que_qaru01,117,150,0	duplicate(#getspells_main)	#getspell04_aru01	-1,1,1,
-que_qaru02,117,150,0	duplicate(#getspells_main)	#getspell04_aru02	-1,1,1,
-que_qaru03,117,150,0	duplicate(#getspells_main)	#getspell04_aru03	-1,1,1,
-que_qaru04,117,150,0	duplicate(#getspells_main)	#getspell04_aru04	-1,1,1,
-que_qaru05,117,150,0	duplicate(#getspells_main)	#getspell04_aru05	-1,1,1,
-que_qsch01,117,150,0	duplicate(#getspells_main)	#getspell04_sch01	-1,1,1,
-que_qsch02,117,150,0	duplicate(#getspells_main)	#getspell04_sch02	-1,1,1,
-que_qsch03,117,150,0	duplicate(#getspells_main)	#getspell04_sch03	-1,1,1,
-que_qsch04,117,150,0	duplicate(#getspells_main)	#getspell04_sch04	-1,1,1,
-que_qsch05,117,150,0	duplicate(#getspells_main)	#getspell04_sch05	-1,1,1,
-que_qaru01,150,135,0	duplicate(#getspells_main)	#getspell05_aru01	-1,1,1,
-que_qaru02,150,135,0	duplicate(#getspells_main)	#getspell05_aru02	-1,1,1,
-que_qaru03,150,135,0	duplicate(#getspells_main)	#getspell05_aru03	-1,1,1,
-que_qaru04,150,135,0	duplicate(#getspells_main)	#getspell05_aru04	-1,1,1,
-que_qaru05,150,135,0	duplicate(#getspells_main)	#getspell05_aru05	-1,1,1,
-que_qsch01,150,135,0	duplicate(#getspells_main)	#getspell05_sch01	-1,1,1,
-que_qsch02,150,135,0	duplicate(#getspells_main)	#getspell05_sch02	-1,1,1,
-que_qsch03,150,135,0	duplicate(#getspells_main)	#getspell05_sch03	-1,1,1,
-que_qsch04,150,135,0	duplicate(#getspells_main)	#getspell05_sch04	-1,1,1,
-que_qsch05,150,135,0	duplicate(#getspells_main)	#getspell05_sch05	-1,1,1,
-que_qaru01,117,121,0	duplicate(#getspells_main)	#getspell06_aru01	-1,1,1,
-que_qaru02,117,121,0	duplicate(#getspells_main)	#getspell06_aru02	-1,1,1,
-que_qaru03,117,121,0	duplicate(#getspells_main)	#getspell06_aru03	-1,1,1,
-que_qaru04,117,121,0	duplicate(#getspells_main)	#getspell06_aru04	-1,1,1,
-que_qaru05,117,121,0	duplicate(#getspells_main)	#getspell06_aru05	-1,1,1,
-que_qsch01,117,121,0	duplicate(#getspells_main)	#getspell06_sch01	-1,1,1,
-que_qsch02,117,121,0	duplicate(#getspells_main)	#getspell06_sch02	-1,1,1,
-que_qsch03,117,121,0	duplicate(#getspells_main)	#getspell06_sch03	-1,1,1,
-que_qsch04,117,121,0	duplicate(#getspells_main)	#getspell06_sch04	-1,1,1,
-que_qsch05,117,121,0	duplicate(#getspells_main)	#getspell06_sch05	-1,1,1,
-que_qaru01,131,154,0	duplicate(#getspells_main)	#getspell07_aru01	-1,1,1,
-que_qaru02,131,154,0	duplicate(#getspells_main)	#getspell07_aru02	-1,1,1,
-que_qaru03,131,154,0	duplicate(#getspells_main)	#getspell07_aru03	-1,1,1,
-que_qaru04,131,154,0	duplicate(#getspells_main)	#getspell07_aru04	-1,1,1,
-que_qaru05,131,154,0	duplicate(#getspells_main)	#getspell07_aru05	-1,1,1,
-que_qsch01,131,154,0	duplicate(#getspells_main)	#getspell07_sch01	-1,1,1,
-que_qsch02,131,154,0	duplicate(#getspells_main)	#getspell07_sch02	-1,1,1,
-que_qsch03,131,154,0	duplicate(#getspells_main)	#getspell07_sch03	-1,1,1,
-que_qsch04,131,154,0	duplicate(#getspells_main)	#getspell07_sch04	-1,1,1,
-que_qsch05,131,154,0	duplicate(#getspells_main)	#getspell07_sch05	-1,1,1,
-que_qaru01,146,121,0	duplicate(#getspells_main)	#getspell08_aru01	-1,1,1,
-que_qaru02,146,121,0	duplicate(#getspells_main)	#getspell08_aru02	-1,1,1,
-que_qaru03,146,121,0	duplicate(#getspells_main)	#getspell08_aru03	-1,1,1,
-que_qaru04,146,121,0	duplicate(#getspells_main)	#getspell08_aru04	-1,1,1,
-que_qaru05,146,121,0	duplicate(#getspells_main)	#getspell08_aru05	-1,1,1,
-que_qsch01,146,121,0	duplicate(#getspells_main)	#getspell08_sch01	-1,1,1,
-que_qsch02,146,121,0	duplicate(#getspells_main)	#getspell08_sch02	-1,1,1,
-que_qsch03,146,121,0	duplicate(#getspells_main)	#getspell08_sch03	-1,1,1,
-que_qsch04,146,121,0	duplicate(#getspells_main)	#getspell08_sch04	-1,1,1,
-que_qsch05,146,121,0	duplicate(#getspells_main)	#getspell08_sch05	-1,1,1,
+que_qaru01,113,135,0	duplicate(#getspells_main)	#getspell01_aru01	-1,1,1
+que_qaru02,113,135,0	duplicate(#getspells_main)	#getspell01_aru02	-1,1,1
+que_qaru03,113,135,0	duplicate(#getspells_main)	#getspell01_aru03	-1,1,1
+que_qaru04,113,135,0	duplicate(#getspells_main)	#getspell01_aru04	-1,1,1
+que_qaru05,113,135,0	duplicate(#getspells_main)	#getspell01_aru05	-1,1,1
+que_qsch01,113,135,0	duplicate(#getspells_main)	#getspell01_sch01	-1,1,1
+que_qsch02,113,135,0	duplicate(#getspells_main)	#getspell01_sch02	-1,1,1
+que_qsch03,113,135,0	duplicate(#getspells_main)	#getspell01_sch03	-1,1,1
+que_qsch04,113,135,0	duplicate(#getspells_main)	#getspell01_sch04	-1,1,1
+que_qsch05,113,135,0	duplicate(#getspells_main)	#getspell01_sch05	-1,1,1
+que_qaru01,146,150,0	duplicate(#getspells_main)	#getspell02_aru01	-1,1,1
+que_qaru02,146,150,0	duplicate(#getspells_main)	#getspell02_aru02	-1,1,1
+que_qaru03,146,150,0	duplicate(#getspells_main)	#getspell02_aru03	-1,1,1
+que_qaru04,146,150,0	duplicate(#getspells_main)	#getspell02_aru04	-1,1,1
+que_qaru05,146,150,0	duplicate(#getspells_main)	#getspell02_aru05	-1,1,1
+que_qsch01,146,150,0	duplicate(#getspells_main)	#getspell02_sch01	-1,1,1
+que_qsch02,146,150,0	duplicate(#getspells_main)	#getspell02_sch02	-1,1,1
+que_qsch03,146,150,0	duplicate(#getspells_main)	#getspell02_sch03	-1,1,1
+que_qsch04,146,150,0	duplicate(#getspells_main)	#getspell02_sch04	-1,1,1
+que_qsch05,146,150,0	duplicate(#getspells_main)	#getspell02_sch05	-1,1,1
+que_qaru01,131,117,0	duplicate(#getspells_main)	#getspell03_aru01	-1,1,1
+que_qaru02,131,117,0	duplicate(#getspells_main)	#getspell03_aru02	-1,1,1
+que_qaru03,131,117,0	duplicate(#getspells_main)	#getspell03_aru03	-1,1,1
+que_qaru04,131,117,0	duplicate(#getspells_main)	#getspell03_aru04	-1,1,1
+que_qaru05,131,117,0	duplicate(#getspells_main)	#getspell03_aru05	-1,1,1
+que_qsch01,131,117,0	duplicate(#getspells_main)	#getspell03_sch01	-1,1,1
+que_qsch02,131,117,0	duplicate(#getspells_main)	#getspell03_sch02	-1,1,1
+que_qsch03,131,117,0	duplicate(#getspells_main)	#getspell03_sch03	-1,1,1
+que_qsch04,131,117,0	duplicate(#getspells_main)	#getspell03_sch04	-1,1,1
+que_qsch05,131,117,0	duplicate(#getspells_main)	#getspell03_sch05	-1,1,1
+que_qaru01,117,150,0	duplicate(#getspells_main)	#getspell04_aru01	-1,1,1
+que_qaru02,117,150,0	duplicate(#getspells_main)	#getspell04_aru02	-1,1,1
+que_qaru03,117,150,0	duplicate(#getspells_main)	#getspell04_aru03	-1,1,1
+que_qaru04,117,150,0	duplicate(#getspells_main)	#getspell04_aru04	-1,1,1
+que_qaru05,117,150,0	duplicate(#getspells_main)	#getspell04_aru05	-1,1,1
+que_qsch01,117,150,0	duplicate(#getspells_main)	#getspell04_sch01	-1,1,1
+que_qsch02,117,150,0	duplicate(#getspells_main)	#getspell04_sch02	-1,1,1
+que_qsch03,117,150,0	duplicate(#getspells_main)	#getspell04_sch03	-1,1,1
+que_qsch04,117,150,0	duplicate(#getspells_main)	#getspell04_sch04	-1,1,1
+que_qsch05,117,150,0	duplicate(#getspells_main)	#getspell04_sch05	-1,1,1
+que_qaru01,150,135,0	duplicate(#getspells_main)	#getspell05_aru01	-1,1,1
+que_qaru02,150,135,0	duplicate(#getspells_main)	#getspell05_aru02	-1,1,1
+que_qaru03,150,135,0	duplicate(#getspells_main)	#getspell05_aru03	-1,1,1
+que_qaru04,150,135,0	duplicate(#getspells_main)	#getspell05_aru04	-1,1,1
+que_qaru05,150,135,0	duplicate(#getspells_main)	#getspell05_aru05	-1,1,1
+que_qsch01,150,135,0	duplicate(#getspells_main)	#getspell05_sch01	-1,1,1
+que_qsch02,150,135,0	duplicate(#getspells_main)	#getspell05_sch02	-1,1,1
+que_qsch03,150,135,0	duplicate(#getspells_main)	#getspell05_sch03	-1,1,1
+que_qsch04,150,135,0	duplicate(#getspells_main)	#getspell05_sch04	-1,1,1
+que_qsch05,150,135,0	duplicate(#getspells_main)	#getspell05_sch05	-1,1,1
+que_qaru01,117,121,0	duplicate(#getspells_main)	#getspell06_aru01	-1,1,1
+que_qaru02,117,121,0	duplicate(#getspells_main)	#getspell06_aru02	-1,1,1
+que_qaru03,117,121,0	duplicate(#getspells_main)	#getspell06_aru03	-1,1,1
+que_qaru04,117,121,0	duplicate(#getspells_main)	#getspell06_aru04	-1,1,1
+que_qaru05,117,121,0	duplicate(#getspells_main)	#getspell06_aru05	-1,1,1
+que_qsch01,117,121,0	duplicate(#getspells_main)	#getspell06_sch01	-1,1,1
+que_qsch02,117,121,0	duplicate(#getspells_main)	#getspell06_sch02	-1,1,1
+que_qsch03,117,121,0	duplicate(#getspells_main)	#getspell06_sch03	-1,1,1
+que_qsch04,117,121,0	duplicate(#getspells_main)	#getspell06_sch04	-1,1,1
+que_qsch05,117,121,0	duplicate(#getspells_main)	#getspell06_sch05	-1,1,1
+que_qaru01,131,154,0	duplicate(#getspells_main)	#getspell07_aru01	-1,1,1
+que_qaru02,131,154,0	duplicate(#getspells_main)	#getspell07_aru02	-1,1,1
+que_qaru03,131,154,0	duplicate(#getspells_main)	#getspell07_aru03	-1,1,1
+que_qaru04,131,154,0	duplicate(#getspells_main)	#getspell07_aru04	-1,1,1
+que_qaru05,131,154,0	duplicate(#getspells_main)	#getspell07_aru05	-1,1,1
+que_qsch01,131,154,0	duplicate(#getspells_main)	#getspell07_sch01	-1,1,1
+que_qsch02,131,154,0	duplicate(#getspells_main)	#getspell07_sch02	-1,1,1
+que_qsch03,131,154,0	duplicate(#getspells_main)	#getspell07_sch03	-1,1,1
+que_qsch04,131,154,0	duplicate(#getspells_main)	#getspell07_sch04	-1,1,1
+que_qsch05,131,154,0	duplicate(#getspells_main)	#getspell07_sch05	-1,1,1
+que_qaru01,146,121,0	duplicate(#getspells_main)	#getspell08_aru01	-1,1,1
+que_qaru02,146,121,0	duplicate(#getspells_main)	#getspell08_aru02	-1,1,1
+que_qaru03,146,121,0	duplicate(#getspells_main)	#getspell08_aru03	-1,1,1
+que_qaru04,146,121,0	duplicate(#getspells_main)	#getspell08_aru04	-1,1,1
+que_qaru05,146,121,0	duplicate(#getspells_main)	#getspell08_aru05	-1,1,1
+que_qsch01,146,121,0	duplicate(#getspells_main)	#getspell08_sch01	-1,1,1
+que_qsch02,146,121,0	duplicate(#getspells_main)	#getspell08_sch02	-1,1,1
+que_qsch03,146,121,0	duplicate(#getspells_main)	#getspell08_sch03	-1,1,1
+que_qsch04,146,121,0	duplicate(#getspells_main)	#getspell08_sch04	-1,1,1
+que_qsch05,146,121,0	duplicate(#getspells_main)	#getspell08_sch05	-1,1,1
 
 -	script	#main_cages	-1,{
 	end;
 	
 OnTouch:
 	set .@sub$,callfunc("F_Okolnir");
-	sc_end SC_Stone;
+	sc_end SC_STONE;
 	setarray .@n, 108,151,107,135,113,114,158,106,163,133,150,154;
 	for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 		warp "que_q"+.@sub$,.@n[.@i],.@n[.@i+1];
@@ -1400,66 +1401,66 @@ OnInit:
 		disablenpc "#"+.@sub$+"_cage0"+.@i;
 	end;
 }
-que_qaru01,103,153,0	duplicate(#main_cages)	#aru01_cage01	-1,1,1,
-que_qaru02,103,153,0	duplicate(#main_cages)	#aru02_cage01	-1,1,1,
-que_qaru03,103,153,0	duplicate(#main_cages)	#aru03_cage01	-1,1,1,
-que_qaru04,103,153,0	duplicate(#main_cages)	#aru04_cage01	-1,1,1,
-que_qaru05,103,153,0	duplicate(#main_cages)	#aru05_cage01	-1,1,1,
-que_qsch01,103,153,0	duplicate(#main_cages)	#sch01_cage01	-1,1,1,
-que_qsch02,103,153,0	duplicate(#main_cages)	#sch02_cage01	-1,1,1,
-que_qsch03,103,153,0	duplicate(#main_cages)	#sch03_cage01	-1,1,1,
-que_qsch04,103,153,0	duplicate(#main_cages)	#sch04_cage01	-1,1,1,
-que_qsch05,103,153,0	duplicate(#main_cages)	#sch05_cage01	-1,1,1,
-que_qaru01,102,135,0	duplicate(#main_cages)	#aru01_cage02	-1,1,1,
-que_qaru02,102,135,0	duplicate(#main_cages)	#aru02_cage02	-1,1,1,
-que_qaru03,102,135,0	duplicate(#main_cages)	#aru03_cage02	-1,1,1,
-que_qaru04,102,135,0	duplicate(#main_cages)	#aru04_cage02	-1,1,1,
-que_qaru05,102,135,0	duplicate(#main_cages)	#aru05_cage02	-1,1,1,
-que_qsch01,102,135,0	duplicate(#main_cages)	#sch01_cage02	-1,1,1,
-que_qsch02,102,135,0	duplicate(#main_cages)	#sch02_cage02	-1,1,1,
-que_qsch03,102,135,0	duplicate(#main_cages)	#sch03_cage02	-1,1,1,
-que_qsch04,102,135,0	duplicate(#main_cages)	#sch04_cage02	-1,1,1,
-que_qsch05,102,135,0	duplicate(#main_cages)	#sch05_cage02	-1,1,1,
-que_qaru01,113,111,0	duplicate(#main_cages)	#aru01_cage03	-1,1,1,
-que_qaru02,113,111,0	duplicate(#main_cages)	#aru02_cage03	-1,1,1,
-que_qaru03,113,111,0	duplicate(#main_cages)	#aru03_cage03	-1,1,1,
-que_qaru04,113,111,0	duplicate(#main_cages)	#aru04_cage03	-1,1,1,
-que_qaru05,113,111,0	duplicate(#main_cages)	#aru05_cage03	-1,1,1,
-que_qsch01,113,111,0	duplicate(#main_cages)	#sch01_cage03	-1,1,1,
-que_qsch02,113,111,0	duplicate(#main_cages)	#sch02_cage03	-1,1,1,
-que_qsch03,113,111,0	duplicate(#main_cages)	#sch03_cage03	-1,1,1,
-que_qsch04,113,111,0	duplicate(#main_cages)	#sch04_cage03	-1,1,1,
-que_qsch05,113,111,0	duplicate(#main_cages)	#sch05_cage03	-1,1,1,
-que_qaru01,161,105,0	duplicate(#main_cages)	#aru01_cage04	-1,1,1,
-que_qaru02,161,105,0	duplicate(#main_cages)	#aru02_cage04	-1,1,1,
-que_qaru03,161,105,0	duplicate(#main_cages)	#aru03_cage04	-1,1,1,
-que_qaru04,161,105,0	duplicate(#main_cages)	#aru04_cage04	-1,1,1,
-que_qaru05,161,105,0	duplicate(#main_cages)	#aru05_cage04	-1,1,1,
-que_qsch01,161,105,0	duplicate(#main_cages)	#sch01_cage04	-1,1,1,
-que_qsch02,161,105,0	duplicate(#main_cages)	#sch02_cage04	-1,1,1,
-que_qsch03,161,105,0	duplicate(#main_cages)	#sch03_cage04	-1,1,1,
-que_qsch04,161,105,0	duplicate(#main_cages)	#sch04_cage04	-1,1,1,
-que_qsch05,161,105,0	duplicate(#main_cages)	#sch05_cage04	-1,1,1,
-que_qaru01,168,135,0	duplicate(#main_cages)	#aru01_cage05	-1,1,1,
-que_qaru02,168,135,0	duplicate(#main_cages)	#aru02_cage05	-1,1,1,
-que_qaru03,168,135,0	duplicate(#main_cages)	#aru03_cage05	-1,1,1,
-que_qaru04,168,135,0	duplicate(#main_cages)	#aru04_cage05	-1,1,1,
-que_qaru05,168,135,0	duplicate(#main_cages)	#aru05_cage05	-1,1,1,
-que_qsch01,168,135,0	duplicate(#main_cages)	#sch01_cage05	-1,1,1,
-que_qsch02,168,135,0	duplicate(#main_cages)	#sch02_cage05	-1,1,1,
-que_qsch03,168,135,0	duplicate(#main_cages)	#sch03_cage05	-1,1,1,
-que_qsch04,168,135,0	duplicate(#main_cages)	#sch04_cage05	-1,1,1,
-que_qsch05,168,135,0	duplicate(#main_cages)	#sch05_cage05	-1,1,1,
-que_qaru01,150,159,0	duplicate(#main_cages)	#aru01_cage06	-1,1,1,
-que_qaru02,150,159,0	duplicate(#main_cages)	#aru02_cage06	-1,1,1,
-que_qaru03,150,159,0	duplicate(#main_cages)	#aru03_cage06	-1,1,1,
-que_qaru04,150,159,0	duplicate(#main_cages)	#aru04_cage06	-1,1,1,
-que_qaru05,150,159,0	duplicate(#main_cages)	#aru05_cage06	-1,1,1,
-que_qsch01,150,159,0	duplicate(#main_cages)	#sch01_cage06	-1,1,1,
-que_qsch02,150,159,0	duplicate(#main_cages)	#sch02_cage06	-1,1,1,
-que_qsch03,150,159,0	duplicate(#main_cages)	#sch03_cage06	-1,1,1,
-que_qsch04,150,159,0	duplicate(#main_cages)	#sch04_cage06	-1,1,1,
-que_qsch05,150,159,0	duplicate(#main_cages)	#sch05_cage06	-1,1,1,
+que_qaru01,103,153,0	duplicate(#main_cages)	#aru01_cage01	-1,1,1
+que_qaru02,103,153,0	duplicate(#main_cages)	#aru02_cage01	-1,1,1
+que_qaru03,103,153,0	duplicate(#main_cages)	#aru03_cage01	-1,1,1
+que_qaru04,103,153,0	duplicate(#main_cages)	#aru04_cage01	-1,1,1
+que_qaru05,103,153,0	duplicate(#main_cages)	#aru05_cage01	-1,1,1
+que_qsch01,103,153,0	duplicate(#main_cages)	#sch01_cage01	-1,1,1
+que_qsch02,103,153,0	duplicate(#main_cages)	#sch02_cage01	-1,1,1
+que_qsch03,103,153,0	duplicate(#main_cages)	#sch03_cage01	-1,1,1
+que_qsch04,103,153,0	duplicate(#main_cages)	#sch04_cage01	-1,1,1
+que_qsch05,103,153,0	duplicate(#main_cages)	#sch05_cage01	-1,1,1
+que_qaru01,102,135,0	duplicate(#main_cages)	#aru01_cage02	-1,1,1
+que_qaru02,102,135,0	duplicate(#main_cages)	#aru02_cage02	-1,1,1
+que_qaru03,102,135,0	duplicate(#main_cages)	#aru03_cage02	-1,1,1
+que_qaru04,102,135,0	duplicate(#main_cages)	#aru04_cage02	-1,1,1
+que_qaru05,102,135,0	duplicate(#main_cages)	#aru05_cage02	-1,1,1
+que_qsch01,102,135,0	duplicate(#main_cages)	#sch01_cage02	-1,1,1
+que_qsch02,102,135,0	duplicate(#main_cages)	#sch02_cage02	-1,1,1
+que_qsch03,102,135,0	duplicate(#main_cages)	#sch03_cage02	-1,1,1
+que_qsch04,102,135,0	duplicate(#main_cages)	#sch04_cage02	-1,1,1
+que_qsch05,102,135,0	duplicate(#main_cages)	#sch05_cage02	-1,1,1
+que_qaru01,113,111,0	duplicate(#main_cages)	#aru01_cage03	-1,1,1
+que_qaru02,113,111,0	duplicate(#main_cages)	#aru02_cage03	-1,1,1
+que_qaru03,113,111,0	duplicate(#main_cages)	#aru03_cage03	-1,1,1
+que_qaru04,113,111,0	duplicate(#main_cages)	#aru04_cage03	-1,1,1
+que_qaru05,113,111,0	duplicate(#main_cages)	#aru05_cage03	-1,1,1
+que_qsch01,113,111,0	duplicate(#main_cages)	#sch01_cage03	-1,1,1
+que_qsch02,113,111,0	duplicate(#main_cages)	#sch02_cage03	-1,1,1
+que_qsch03,113,111,0	duplicate(#main_cages)	#sch03_cage03	-1,1,1
+que_qsch04,113,111,0	duplicate(#main_cages)	#sch04_cage03	-1,1,1
+que_qsch05,113,111,0	duplicate(#main_cages)	#sch05_cage03	-1,1,1
+que_qaru01,161,105,0	duplicate(#main_cages)	#aru01_cage04	-1,1,1
+que_qaru02,161,105,0	duplicate(#main_cages)	#aru02_cage04	-1,1,1
+que_qaru03,161,105,0	duplicate(#main_cages)	#aru03_cage04	-1,1,1
+que_qaru04,161,105,0	duplicate(#main_cages)	#aru04_cage04	-1,1,1
+que_qaru05,161,105,0	duplicate(#main_cages)	#aru05_cage04	-1,1,1
+que_qsch01,161,105,0	duplicate(#main_cages)	#sch01_cage04	-1,1,1
+que_qsch02,161,105,0	duplicate(#main_cages)	#sch02_cage04	-1,1,1
+que_qsch03,161,105,0	duplicate(#main_cages)	#sch03_cage04	-1,1,1
+que_qsch04,161,105,0	duplicate(#main_cages)	#sch04_cage04	-1,1,1
+que_qsch05,161,105,0	duplicate(#main_cages)	#sch05_cage04	-1,1,1
+que_qaru01,168,135,0	duplicate(#main_cages)	#aru01_cage05	-1,1,1
+que_qaru02,168,135,0	duplicate(#main_cages)	#aru02_cage05	-1,1,1
+que_qaru03,168,135,0	duplicate(#main_cages)	#aru03_cage05	-1,1,1
+que_qaru04,168,135,0	duplicate(#main_cages)	#aru04_cage05	-1,1,1
+que_qaru05,168,135,0	duplicate(#main_cages)	#aru05_cage05	-1,1,1
+que_qsch01,168,135,0	duplicate(#main_cages)	#sch01_cage05	-1,1,1
+que_qsch02,168,135,0	duplicate(#main_cages)	#sch02_cage05	-1,1,1
+que_qsch03,168,135,0	duplicate(#main_cages)	#sch03_cage05	-1,1,1
+que_qsch04,168,135,0	duplicate(#main_cages)	#sch04_cage05	-1,1,1
+que_qsch05,168,135,0	duplicate(#main_cages)	#sch05_cage05	-1,1,1
+que_qaru01,150,159,0	duplicate(#main_cages)	#aru01_cage06	-1,1,1
+que_qaru02,150,159,0	duplicate(#main_cages)	#aru02_cage06	-1,1,1
+que_qaru03,150,159,0	duplicate(#main_cages)	#aru03_cage06	-1,1,1
+que_qaru04,150,159,0	duplicate(#main_cages)	#aru04_cage06	-1,1,1
+que_qaru05,150,159,0	duplicate(#main_cages)	#aru05_cage06	-1,1,1
+que_qsch01,150,159,0	duplicate(#main_cages)	#sch01_cage06	-1,1,1
+que_qsch02,150,159,0	duplicate(#main_cages)	#sch02_cage06	-1,1,1
+que_qsch03,150,159,0	duplicate(#main_cages)	#sch03_cage06	-1,1,1
+que_qsch04,150,159,0	duplicate(#main_cages)	#sch04_cage06	-1,1,1
+que_qsch05,150,159,0	duplicate(#main_cages)	#sch05_cage06	-1,1,1
 
 que_qaru01,1,8,0	script	#gd_main_mobctrl	844,{
 	end;
@@ -1476,13 +1477,13 @@ OnEnable:
 	set .@sub$,callfunc("F_Okolnir");
 	set .@c, 1;
 	while (.@c <= 4) {
-		for (set .@i, 0; .@i < getarraysize(getd(".@mob_"+.@c)); set .@i, .@i + 1)
+		for (set .@i, 0; .@i < getarraysize(getd(".@mob_"+.@c)); set .@i, .@i + 2)
 			monster "que_q"+.@sub$,getd(".@mob_"+.@c+"["+.@i+"]"),getd(".@mob_"+.@c+"["+(.@i+1)+"]"),getd(".@mob_"+.@c+"$"),atoi(getd(".@mob_"+.@c+"$[1]")),1,"#gd_"+.@sub$+"_mobctrl::OnMyMobDead";
 		set .@c, .@c + 1;
 	}
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#gd_"+.@sub$+"_mobctrl::OnMyMobDead";
 	end;
@@ -1491,21 +1492,21 @@ OnMyMobDead:
 	set .@sub$,callfunc("F_Okolnir");
 	if (mobcount("que_q"+.@sub$,"#gd_"+.@sub$+"_mobctrl::OnMyMobDead") < 7) {
 		setarray .@n, 107,152,109,135,113,116,157,107,163,133,149,156;
-		for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 1)
+		for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 			monster "que_q"+.@sub$,.@n[.@i],.@n[.@i+1],"Ball of Piamette",1738,1,"#gd_"+.@sub$+"_mobctrl::OnMyMobDead";
 	}
 	end;
 }
-que_qaru01,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru01_mobctrl	844,
-que_qaru02,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru02_mobctrl	844,
-que_qaru03,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru03_mobctrl	844,
-que_qaru04,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru04_mobctrl	844,
-que_qaru05,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru05_mobctrl	844,
-que_qsch01,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch01_mobctrl	844,
-que_qsch02,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch02_mobctrl	844,
-que_qsch03,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch03_mobctrl	844,
-que_qsch04,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch04_mobctrl	844,
-que_qsch05,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch05_mobctrl	844,
+que_qaru01,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru01_mobctrl	844
+que_qaru02,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru02_mobctrl	844
+que_qaru03,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru03_mobctrl	844
+que_qaru04,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru04_mobctrl	844
+que_qaru05,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru05_mobctrl	844
+que_qsch01,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch01_mobctrl	844
+que_qsch02,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch02_mobctrl	844
+que_qsch03,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch03_mobctrl	844
+que_qsch04,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch04_mobctrl	844
+que_qsch05,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch05_mobctrl	844
 
 -	script	windpaths_main	-1,{
 	end;
@@ -1525,27 +1526,27 @@ OnInit:
 	disablenpc "windpath04_"+.@sub$;
 	end;
 }
-que_qaru01,149,105,0	duplicate(windpaths_main)	windpath03_aru01	45,1,1,{
-que_qaru02,149,105,0	duplicate(windpaths_main)	windpath03_aru02	45,1,1,{
-que_qaru03,149,105,0	duplicate(windpaths_main)	windpath03_aru03	45,1,1,{
-que_qaru04,149,105,0	duplicate(windpaths_main)	windpath03_aru04	45,1,1,{
-que_qaru05,149,105,0	duplicate(windpaths_main)	windpath03_aru05	45,1,1,{
-que_qsch01,149,105,0	duplicate(windpaths_main)	windpath03_sch01	45,1,1,{
-que_qsch02,149,105,0	duplicate(windpaths_main)	windpath03_sch02	45,1,1,{
-que_qsch03,149,105,0	duplicate(windpaths_main)	windpath03_sch03	45,1,1,{
-que_qsch04,149,105,0	duplicate(windpaths_main)	windpath03_sch04	45,1,1,{
-que_qsch05,149,105,0	duplicate(windpaths_main)	windpath03_sch05	45,1,1,{
-
-que_qaru01,128,104,0	duplicate(windpaths_main)	windpath04_aru01	45,1,1,{
-que_qaru02,128,104,0	duplicate(windpaths_main)	windpath04_aru02	45,1,1,{
-que_qaru03,128,104,0	duplicate(windpaths_main)	windpath04_aru03	45,1,1,{
-que_qaru04,128,104,0	duplicate(windpaths_main)	windpath04_aru04	45,1,1,{
-que_qaru05,128,104,0	duplicate(windpaths_main)	windpath04_aru05	45,1,1,{
-que_qsch01,128,104,0	duplicate(windpaths_main)	windpath04_sch01	45,1,1,{
-que_qsch02,128,104,0	duplicate(windpaths_main)	windpath04_sch02	45,1,1,{
-que_qsch03,128,104,0	duplicate(windpaths_main)	windpath04_sch03	45,1,1,{
-que_qsch04,128,104,0	duplicate(windpaths_main)	windpath04_sch04	45,1,1,{
-que_qsch05,128,104,0	duplicate(windpaths_main)	windpath04_sch05	45,1,1,{
+que_qaru01,149,105,0	duplicate(windpaths_main)	windpath03_aru01	45,1,1
+que_qaru02,149,105,0	duplicate(windpaths_main)	windpath03_aru02	45,1,1
+que_qaru03,149,105,0	duplicate(windpaths_main)	windpath03_aru03	45,1,1
+que_qaru04,149,105,0	duplicate(windpaths_main)	windpath03_aru04	45,1,1
+que_qaru05,149,105,0	duplicate(windpaths_main)	windpath03_aru05	45,1,1
+que_qsch01,149,105,0	duplicate(windpaths_main)	windpath03_sch01	45,1,1
+que_qsch02,149,105,0	duplicate(windpaths_main)	windpath03_sch02	45,1,1
+que_qsch03,149,105,0	duplicate(windpaths_main)	windpath03_sch03	45,1,1
+que_qsch04,149,105,0	duplicate(windpaths_main)	windpath03_sch04	45,1,1
+que_qsch05,149,105,0	duplicate(windpaths_main)	windpath03_sch05	45,1,1
+
+que_qaru01,128,104,0	duplicate(windpaths_main)	windpath04_aru01	45,1,1
+que_qaru02,128,104,0	duplicate(windpaths_main)	windpath04_aru02	45,1,1
+que_qaru03,128,104,0	duplicate(windpaths_main)	windpath04_aru03	45,1,1
+que_qaru04,128,104,0	duplicate(windpaths_main)	windpath04_aru04	45,1,1
+que_qaru05,128,104,0	duplicate(windpaths_main)	windpath04_aru05	45,1,1
+que_qsch01,128,104,0	duplicate(windpaths_main)	windpath04_sch01	45,1,1
+que_qsch02,128,104,0	duplicate(windpaths_main)	windpath04_sch02	45,1,1
+que_qsch03,128,104,0	duplicate(windpaths_main)	windpath04_sch03	45,1,1
+que_qsch04,128,104,0	duplicate(windpaths_main)	windpath04_sch04	45,1,1
+que_qsch05,128,104,0	duplicate(windpaths_main)	windpath04_sch05	45,1,1
 
 -	script	#nm_switch_main	-1,{
 	end;
@@ -1606,16 +1607,16 @@ OnInit:
 	disablenpc "#nm_switch_"+.@sub$;
 	end;
 }
-que_qaru01,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru01	-1,5,5,
-que_qaru02,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru02	-1,5,5,
-que_qaru03,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru03	-1,5,5,
-que_qaru04,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru04	-1,5,5,
-que_qaru05,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru05	-1,5,5,
-que_qsch01,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch01	-1,5,5,
-que_qsch02,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch02	-1,5,5,
-que_qsch03,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch03	-1,5,5,
-que_qsch04,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch04	-1,5,5,
-que_qsch05,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch05	-1,5,5,
+que_qaru01,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru01	-1,5,5
+que_qaru02,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru02	-1,5,5
+que_qaru03,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru03	-1,5,5
+que_qaru04,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru04	-1,5,5
+que_qaru05,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru05	-1,5,5
+que_qsch01,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch01	-1,5,5
+que_qsch02,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch02	-1,5,5
+que_qsch03,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch03	-1,5,5
+que_qsch04,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch04	-1,5,5
+que_qsch05,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch05	-1,5,5
 
 -	script	#nmsommain_jin01	-1,{
 OnEnable:
@@ -1643,7 +1644,7 @@ OnTimer55000:
 OnTimer85000:
 OnTimer120000:
 	set .@sub$,callfunc("F_Okolnir");
-	setarray .xy2, 226,294,227,294,228,294,229,294,230,295,231,296,231,297,231,298,231,299,230,300,229,301,228,301,227,301,226,301,225,300,224,299,224,298,224,297,224,296,225,295;
+	setarray .@xy2, 226,294,227,294,228,294,229,294,230,295,231,296,231,297,231,298,231,299,230,300,229,301,228,301,227,301,226,301,225,300,224,299,224,298,224,297,224,296,225,295;
 	for (set .@i, 0; .@i < getarraysize(.@xy2); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Guard of Shadow",1752,1,"#nmsom"+.@sub$+"_jin01::OnMyMobDead";	
 	end;
@@ -1655,16 +1656,16 @@ OnTimer180000:
 OnMyMobDead:
 	end;
 }
-que_qaru01,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru01_jin01	-1,
-que_qaru02,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru02_jin01	-1,
-que_qaru03,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru03_jin01	-1,
-que_qaru04,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru04_jin01	-1,
-que_qaru05,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru05_jin01	-1,
-que_qsch01,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch01_jin01	-1,
-que_qsch02,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch02_jin01	-1,
-que_qsch03,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch03_jin01	-1,
-que_qsch04,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch04_jin01	-1,
-que_qsch05,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch05_jin01	-1,
+que_qaru01,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru01_jin01	-1
+que_qaru02,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru02_jin01	-1
+que_qaru03,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru03_jin01	-1
+que_qaru04,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru04_jin01	-1
+que_qaru05,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru05_jin01	-1
+que_qsch01,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch01_jin01	-1
+que_qsch02,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch02_jin01	-1
+que_qsch03,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch03_jin01	-1
+que_qsch04,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch04_jin01	-1
+que_qsch05,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch05_jin01	-1
 
 -	script	#main_stone01	-1,{
 	end;
@@ -1676,7 +1677,7 @@ OnEnable:
 		monster "que_q"+.@sub$,.@xy[.@i],.@xy[.@i+1],"Western Magic Guardian",1752,1,"#"+.@sub$+"_stone01::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#"+.@sub$+"_stone01::OnMyMobDead";
 	end;
@@ -1687,21 +1688,21 @@ OnMyMobDead:
 		setd "$@gqse_"+.@sub$+"_nm",getd("$@gqse_"+.@sub$+"_nm")+1;
 		donpcevent "#nmsom"+.@sub$+"_jin01::OnDisable";
 		if (getd("$@gqse_"+.@sub$+"_nm") == 3) {
-			donpcevent "Wish Maiden#"+.@sub$+"_boss::Onfight";
+			donpcevent "Wish Maiden#"+.@sub$+"_boss::OnFight";
 		}
 	}
 	end;
 }
-que_qaru01,2,8,0	duplicate(#main_stone01)	#aru01_stone01	844,
-que_qaru02,2,8,0	duplicate(#main_stone01)	#aru02_stone01	844,
-que_qaru03,2,8,0	duplicate(#main_stone01)	#aru03_stone01	844,
-que_qaru04,2,8,0	duplicate(#main_stone01)	#aru04_stone01	844,
-que_qaru05,2,8,0	duplicate(#main_stone01)	#aru05_stone01	844,
-que_qsch01,2,8,0	duplicate(#main_stone01)	#sch01_stone01	844,
-que_qsch02,2,8,0	duplicate(#main_stone01)	#sch02_stone01	844,
-que_qsch03,2,8,0	duplicate(#main_stone01)	#sch03_stone01	844,
-que_qsch04,2,8,0	duplicate(#main_stone01)	#sch04_stone01	844,
-que_qsch05,2,8,0	duplicate(#main_stone01)	#sch05_stone01	844,
+que_qaru01,2,8,0	duplicate(#main_stone01)	#aru01_stone01	844
+que_qaru02,2,8,0	duplicate(#main_stone01)	#aru02_stone01	844
+que_qaru03,2,8,0	duplicate(#main_stone01)	#aru03_stone01	844
+que_qaru04,2,8,0	duplicate(#main_stone01)	#aru04_stone01	844
+que_qaru05,2,8,0	duplicate(#main_stone01)	#aru05_stone01	844
+que_qsch01,2,8,0	duplicate(#main_stone01)	#sch01_stone01	844
+que_qsch02,2,8,0	duplicate(#main_stone01)	#sch02_stone01	844
+que_qsch03,2,8,0	duplicate(#main_stone01)	#sch03_stone01	844
+que_qsch04,2,8,0	duplicate(#main_stone01)	#sch04_stone01	844
+que_qsch05,2,8,0	duplicate(#main_stone01)	#sch05_stone01	844
 
 -	script	#nmsommain_jin02	-1,{
 OnEnable:
@@ -1739,16 +1740,16 @@ OnTimer180000:
 OnMyMobDead:
 	end;
 }
-que_qaru01,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru01_jin02	-1,
-que_qaru02,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru02_jin02	-1,
-que_qaru03,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru03_jin02	-1,
-que_qaru04,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru04_jin02	-1,
-que_qaru05,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru05_jin02	-1,
-que_qsch01,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch01_jin02	-1,
-que_qsch02,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch02_jin02	-1,
-que_qsch03,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch03_jin02	-1,
-que_qsch04,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch04_jin02	-1,
-que_qsch05,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch05_jin02	-1,
+que_qaru01,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru01_jin02	-1
+que_qaru02,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru02_jin02	-1
+que_qaru03,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru03_jin02	-1
+que_qaru04,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru04_jin02	-1
+que_qaru05,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru05_jin02	-1
+que_qsch01,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch01_jin02	-1
+que_qsch02,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch02_jin02	-1
+que_qsch03,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch03_jin02	-1
+que_qsch04,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch04_jin02	-1
+que_qsch05,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch05_jin02	-1
 
 -	script	#main_stone02	-1,{
 	end;
@@ -1760,7 +1761,7 @@ OnEnable:
 		monster "que_q"+.@sub$,.@xy[.@i],.@xy[.@i+1],"Eastern Magic Guardian",1753,1,"#"+.@sub$+"_stone02::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#"+.@sub$+"_stone02::OnMyMobDead";
 	end;
@@ -1771,21 +1772,21 @@ OnMyMobDead:
 		setd "$@gqse_"+.@sub$+"_nm",getd("$@gqse_"+.@sub$+"_nm")+1;
 		donpcevent "#nmsom"+.@sub$+"_jin02::OnDisable";
 		if (getd("$@gqse_"+.@sub$+"_nm") == 3) {
-			donpcevent "Wish Maiden#"+.@sub$+"_boss::Onfight";
+			donpcevent "Wish Maiden#"+.@sub$+"_boss::OnFight";
 		}
 	}
 	end;
 }
-que_qaru01,2,9,0	duplicate(#main_stone02)	#aru01_stone02	844,
-que_qaru02,2,9,0	duplicate(#main_stone02)	#aru02_stone02	844,
-que_qaru03,2,9,0	duplicate(#main_stone02)	#aru03_stone02	844,
-que_qaru04,2,9,0	duplicate(#main_stone02)	#aru04_stone02	844,
-que_qaru05,2,9,0	duplicate(#main_stone02)	#aru05_stone02	844,
-que_qsch01,2,9,0	duplicate(#main_stone02)	#sch01_stone02	844,
-que_qsch02,2,9,0	duplicate(#main_stone02)	#sch02_stone02	844,
-que_qsch03,2,9,0	duplicate(#main_stone02)	#sch03_stone02	844,
-que_qsch04,2,9,0	duplicate(#main_stone02)	#sch04_stone02	844,
-que_qsch05,2,9,0	duplicate(#main_stone02)	#sch05_stone02	844,
+que_qaru01,2,9,0	duplicate(#main_stone02)	#aru01_stone02	844
+que_qaru02,2,9,0	duplicate(#main_stone02)	#aru02_stone02	844
+que_qaru03,2,9,0	duplicate(#main_stone02)	#aru03_stone02	844
+que_qaru04,2,9,0	duplicate(#main_stone02)	#aru04_stone02	844
+que_qaru05,2,9,0	duplicate(#main_stone02)	#aru05_stone02	844
+que_qsch01,2,9,0	duplicate(#main_stone02)	#sch01_stone02	844
+que_qsch02,2,9,0	duplicate(#main_stone02)	#sch02_stone02	844
+que_qsch03,2,9,0	duplicate(#main_stone02)	#sch03_stone02	844
+que_qsch04,2,9,0	duplicate(#main_stone02)	#sch04_stone02	844
+que_qsch05,2,9,0	duplicate(#main_stone02)	#sch05_stone02	844
 
 -	script	#nmsommain_jin03	-1,{
 OnEnable:
@@ -1802,45 +1803,45 @@ OnTimer5000:
 	set .@sub$,callfunc("F_Okolnir");
 	mapannounce "que_q"+.@sub$,"The Northern magic formation is working to summon Keeper of the Temple.",bc_map,"0x4d4dff";
 	setarray .@xy, 247,329,249,329,251,329,253,329,255,329,243,339,245,337,247,335,247,333,254,333,256,335,258,337,260,339;
-	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 1)
+	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@xy[.@i],.@xy[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
 	end;
 
 OnTimer120000:
 	set .@sub$,callfunc("F_Okolnir");
 	setarray .@xy2, 251,343,252,343,255,341,255,340,254,337,253,336,250,336,249,337,248,340,248,341;
-	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 1)
+	for (set .@i, 0; .@i < getarraysize(.@xy2); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
 	end;
 
 OnTimer240000:
 	set .@sub$,callfunc("F_Okolnir");
 	setarray .@xy3, 250,343,252,343,254,342,255,340,255,338,253,336,250,336,248,338,248,340,249,342;
-	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 1)
-		monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
+	for (set .@i, 0; .@i < getarraysize(.@xy3); set .@i, .@i + 2)
+		monster "que_q"+.@sub$,.@xy3[.@i],.@xy3[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
 	end;
 
 OnTimer360000:
 	set .@sub$,callfunc("F_Okolnir");
 	setarray .@xy4, 250,343,252,343,254,342,255,340,255,338,253,336,251,336,249,337,248,339,248,341;
-	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 1)
-		monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
+	for (set .@i, 0; .@i < getarraysize(.@xy4); set .@i, .@i + 2)
+		monster "que_q"+.@sub$,.@xy4[.@i],.@xy4[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
 	stopnpctimer;
 	end;
 
 OnMyMobDead:
 	end;
 }
-que_qaru01,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru01_jin03	-1,
-que_qaru02,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru02_jin03	-1,
-que_qaru03,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru03_jin03	-1,
-que_qaru04,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru04_jin03	-1,
-que_qaru05,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru05_jin03	-1,
-que_qsch01,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch01_jin03	-1,
-que_qsch02,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch02_jin03	-1,
-que_qsch03,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch03_jin03	-1,
-que_qsch04,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch04_jin03	-1,
-que_qsch05,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch05_jin03	-1,
+que_qaru01,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru01_jin03	-1
+que_qaru02,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru02_jin03	-1
+que_qaru03,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru03_jin03	-1
+que_qaru04,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru04_jin03	-1
+que_qaru05,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru05_jin03	-1
+que_qsch01,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch01_jin03	-1
+que_qsch02,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch02_jin03	-1
+que_qsch03,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch03_jin03	-1
+que_qsch04,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch04_jin03	-1
+que_qsch05,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch05_jin03	-1
 
 -	script	#main_stone03	-1,{
 	end;
@@ -1848,11 +1849,11 @@ que_qsch05,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch05_jin03	-1,
 OnEnable:
 	set .@sub$,callfunc("F_Okolnir");
 	setarray .@xy, 251,343,252,343,255,341,255,340,254,337,253,336,250,336,249,337,248,340,248,341;
-	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 1)
+	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@xy[.@i],.@xy[.@i+1],"Northern Magic Guardian",1933,1,"#"+.@sub$+"_stone03::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#"+.@sub$+"_stone03::OnMyMobDead";
 	end;
@@ -1864,21 +1865,21 @@ OnMyMobDead:
 		donpcevent "#nmsom"+.@sub$+"_jin03::OnDisable";
 
 		if (getd("$@gqse_"+.@sub$+"_nm") == 3) {
-			donpcevent "Wish Maiden#"+.@sub$+"_boss::Onfight";
+			donpcevent "Wish Maiden#"+.@sub$+"_boss::OnFight";
 		}
 	}
 	end;
 }
-que_qaru01,2,10,0	duplicate(#main_stone03)	#aru01_stone03	844,
-que_qaru02,2,10,0	duplicate(#main_stone03)	#aru02_stone03	844,
-que_qaru03,2,10,0	duplicate(#main_stone03)	#aru03_stone03	844,
-que_qaru04,2,10,0	duplicate(#main_stone03)	#aru04_stone03	844,
-que_qaru05,2,10,0	duplicate(#main_stone03)	#aru05_stone03	844,
-que_qsch01,2,10,0	duplicate(#main_stone03)	#sch01_stone03	844,
-que_qsch02,2,10,0	duplicate(#main_stone03)	#sch02_stone03	844,
-que_qsch03,2,10,0	duplicate(#main_stone03)	#sch03_stone03	844,
-que_qsch04,2,10,0	duplicate(#main_stone03)	#sch04_stone03	844,
-que_qsch05,2,10,0	duplicate(#main_stone03)	#sch05_stone03	844,
+que_qaru01,2,10,0	duplicate(#main_stone03)	#aru01_stone03	844
+que_qaru02,2,10,0	duplicate(#main_stone03)	#aru02_stone03	844
+que_qaru03,2,10,0	duplicate(#main_stone03)	#aru03_stone03	844
+que_qaru04,2,10,0	duplicate(#main_stone03)	#aru04_stone03	844
+que_qaru05,2,10,0	duplicate(#main_stone03)	#aru05_stone03	844
+que_qsch01,2,10,0	duplicate(#main_stone03)	#sch01_stone03	844
+que_qsch02,2,10,0	duplicate(#main_stone03)	#sch02_stone03	844
+que_qsch03,2,10,0	duplicate(#main_stone03)	#sch03_stone03	844
+que_qsch04,2,10,0	duplicate(#main_stone03)	#sch04_stone03	844
+que_qsch05,2,10,0	duplicate(#main_stone03)	#sch05_stone03	844
 
 -	script	Guard of Shadow#main_all	-1,{
 	end;
@@ -1888,10 +1889,10 @@ OnTouch:
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@in;
 	switch (.@in) {
-		Case 1: setarray .@n, 234,284,235,285,236,286; break;
-		Case 2: setarray .@n, 223,289,224,290,225,291; break;
-		Case 3: setarray .@n, 235,295,236,296,237,297; break;
-		Case 4: setarray .@n, 224,302,225,303,226,304; break;
+		case 1: setarray .@n, 234,284,235,285,236,286; break;
+		case 2: setarray .@n, 223,289,224,290,225,291; break;
+		case 3: setarray .@n, 235,295,236,296,237,297; break;
+		case 4: setarray .@n, 224,302,225,303,226,304; break;
 	}
 	for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@n[.@i],.@n[.@i+1],"Guard of Shadow",1752,1,"Guard of Shadow#"+.@sub$+"_0"+.@in+"::OnMyMobDead";
@@ -1913,46 +1914,46 @@ OnInit:
 		disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@i;
 	end;
 }
-que_qaru01,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_01	1752,4,4,
-que_qaru01,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_02	1752,4,4,
-que_qaru01,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_03	1752,4,4,
-que_qaru01,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_04	1752,4,4,
-que_qaru02,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_01	1752,4,4,
-que_qaru02,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_02	1752,4,4,
-que_qaru02,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_03	1752,4,4,
-que_qaru02,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_04	1752,4,4,
-que_qaru03,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_01	1752,4,4,
-que_qaru03,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_02	1752,4,4,
-que_qaru03,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_03	1752,4,4,
-que_qaru03,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_04	1752,4,4,
-que_qaru04,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_01	1752,4,4,
-que_qaru04,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_02	1752,4,4,
-que_qaru04,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_03	1752,4,4,
-que_qaru04,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_04	1752,4,4,
-que_qaru05,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_01	1752,4,4,
-que_qaru05,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_02	1752,4,4,
-que_qaru05,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_03	1752,4,4,
-que_qaru05,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_04	1752,4,4,
-que_qsch01,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_01	1752,4,4,
-que_qsch01,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_02	1752,4,4,
-que_qsch01,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_03	1752,4,4,
-que_qsch01,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_04	1752,4,4,
-que_qsch02,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_01	1752,4,4,
-que_qsch02,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_02	1752,4,4,
-que_qsch02,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_03	1752,4,4,
-que_qsch02,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_04	1752,4,4,
-que_qsch03,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_01	1752,4,4,
-que_qsch03,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_02	1752,4,4,
-que_qsch03,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_03	1752,4,4,
-que_qsch03,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_04	1752,4,4,
-que_qsch04,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_01	1752,4,4,
-que_qsch04,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_02	1752,4,4,
-que_qsch04,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_03	1752,4,4,
-que_qsch04,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_04	1752,4,4,
-que_qsch05,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_01	1752,4,4,
-que_qsch05,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_02	1752,4,4,
-que_qsch05,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_03	1752,4,4,
-que_qsch05,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_04	1752,4,4,
+que_qaru01,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_01	1752,4,4
+que_qaru01,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_02	1752,4,4
+que_qaru01,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_03	1752,4,4
+que_qaru01,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_04	1752,4,4
+que_qaru02,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_01	1752,4,4
+que_qaru02,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_02	1752,4,4
+que_qaru02,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_03	1752,4,4
+que_qaru02,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_04	1752,4,4
+que_qaru03,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_01	1752,4,4
+que_qaru03,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_02	1752,4,4
+que_qaru03,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_03	1752,4,4
+que_qaru03,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_04	1752,4,4
+que_qaru04,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_01	1752,4,4
+que_qaru04,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_02	1752,4,4
+que_qaru04,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_03	1752,4,4
+que_qaru04,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_04	1752,4,4
+que_qaru05,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_01	1752,4,4
+que_qaru05,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_02	1752,4,4
+que_qaru05,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_03	1752,4,4
+que_qaru05,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_04	1752,4,4
+que_qsch01,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_01	1752,4,4
+que_qsch01,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_02	1752,4,4
+que_qsch01,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_03	1752,4,4
+que_qsch01,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_04	1752,4,4
+que_qsch02,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_01	1752,4,4
+que_qsch02,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_02	1752,4,4
+que_qsch02,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_03	1752,4,4
+que_qsch02,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_04	1752,4,4
+que_qsch03,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_01	1752,4,4
+que_qsch03,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_02	1752,4,4
+que_qsch03,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_03	1752,4,4
+que_qsch03,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_04	1752,4,4
+que_qsch04,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_01	1752,4,4
+que_qsch04,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_02	1752,4,4
+que_qsch04,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_03	1752,4,4
+que_qsch04,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_04	1752,4,4
+que_qsch05,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_01	1752,4,4
+que_qsch05,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_02	1752,4,4
+que_qsch05,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_03	1752,4,4
+que_qsch05,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_04	1752,4,4
 
 -	script	Bloody Hunter#main_all	-1,{
 	end;
@@ -1962,10 +1963,10 @@ OnTouch:
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@in;
 	switch (.@in) {
-		Case 1: setarray .@n, 265,297,266,296,267,295;
-		Case 2: setarray .@n, 270,284,271,283,272,282;
-		Case 3: setarray .@n, 269,308,270,307,271,306;
-		Case 4: setarray .@n, 278,301,279,300,280,299;
+		case 1: setarray .@n, 265,297,266,296,267,295;
+		case 2: setarray .@n, 270,284,271,283,272,282;
+		case 3: setarray .@n, 269,308,270,307,271,306;
+		case 4: setarray .@n, 278,301,279,300,280,299;
 	}
 	for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@n[.@i],.@n[.@i+1],"Bloody Hunter",1753,1,"Bloody Hunter#"+.@sub$+"_ac0"+.@in+"::OnMyMobDead";
@@ -1987,46 +1988,46 @@ OnInit:
 		disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@i;
 	end;
 }
-que_qaru01,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac01	1753,4,4,
+que_qaru01,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac01	1753,4,4
 que_qaru01,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac02	1753,4,4,
 que_qaru01,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac03	1753,4,4,
 que_qaru01,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac04	1753,4,4,
 que_qaru02,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac01	1753,4,4,
-que_qaru02,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac02	1753,4,4,
-que_qaru02,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac03	1753,4,4,
-que_qaru02,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac04	1753,4,4,
-que_qaru03,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac01	1753,4,4,
-que_qaru03,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac02	1753,4,4,
-que_qaru03,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac03	1753,4,4,
-que_qaru03,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac04	1753,4,4,
-que_qaru04,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac01	1753,4,4,
-que_qaru04,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac02	1753,4,4,
-que_qaru04,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac03	1753,4,4,
-que_qaru04,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac04	1753,4,4,
-que_qaru05,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac01	1753,4,4,
-que_qaru05,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac02	1753,4,4,
-que_qaru05,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac03	1753,4,4,
-que_qaru05,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac04	1753,4,4,
-que_qsch01,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac01	1753,4,4,
-que_qsch01,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac02	1753,4,4,
-que_qsch01,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac03	1753,4,4,
-que_qsch01,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac04	1753,4,4,
-que_qsch02,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac01	1753,4,4,
-que_qsch02,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac02	1753,4,4,
-que_qsch02,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac03	1753,4,4,
-que_qsch02,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac04	1753,4,4,
-que_qsch03,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac01	1753,4,4,
-que_qsch03,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac02	1753,4,4,
-que_qsch03,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac03	1753,4,4,
-que_qsch03,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac04	1753,4,4,
-que_qsch04,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac01	1753,4,4,
-que_qsch04,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac02	1753,4,4,
-que_qsch04,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac03	1753,4,4,
-que_qsch04,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac04	1753,4,4,
-que_qsch05,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac01	1753,4,4,
-que_qsch05,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac02	1753,4,4,
-que_qsch05,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac03	1753,4,4,
-que_qsch05,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac04	1753,4,4,
+que_qaru02,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac02	1753,4,4
+que_qaru02,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac03	1753,4,4
+que_qaru02,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac04	1753,4,4
+que_qaru03,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac01	1753,4,4
+que_qaru03,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac02	1753,4,4
+que_qaru03,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac03	1753,4,4
+que_qaru03,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac04	1753,4,4
+que_qaru04,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac01	1753,4,4
+que_qaru04,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac02	1753,4,4
+que_qaru04,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac03	1753,4,4
+que_qaru04,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac04	1753,4,4
+que_qaru05,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac01	1753,4,4
+que_qaru05,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac02	1753,4,4
+que_qaru05,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac03	1753,4,4
+que_qaru05,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac04	1753,4,4
+que_qsch01,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac01	1753,4,4
+que_qsch01,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac02	1753,4,4
+que_qsch01,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac03	1753,4,4
+que_qsch01,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac04	1753,4,4
+que_qsch02,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac01	1753,4,4
+que_qsch02,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac02	1753,4,4
+que_qsch02,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac03	1753,4,4
+que_qsch02,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac04	1753,4,4
+que_qsch03,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac01	1753,4,4
+que_qsch03,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac02	1753,4,4
+que_qsch03,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac03	1753,4,4
+que_qsch03,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac04	1753,4,4
+que_qsch04,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac01	1753,4,4
+que_qsch04,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac02	1753,4,4
+que_qsch04,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac03	1753,4,4
+que_qsch04,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac04	1753,4,4
+que_qsch05,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac01	1753,4,4
+que_qsch05,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac02	1753,4,4
+que_qsch05,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac03	1753,4,4
+que_qsch05,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac04	1753,4,4
 
 -	script	Temple Keeper#main_all	-1,{
 	end;
@@ -2036,8 +2037,8 @@ OnTouch:
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Temple Keeper#"+.@sub$+"_ac0"+.@in;
 	switch (.@in) {
-		Case 1: setarray .@n, 246,330,247,330,248,330; break;
-		Case 2: setarray .@n, 254,330,255,330,256,330; break;
+		case 1: setarray .@n, 246,330,247,330,248,330; break;
+		case 2: setarray .@n, 254,330,255,330,256,330; break;
 	}
 	for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@n[.@i],.@n[.@i+1],"Keeper Of The Temple",1933,1,"Temple Keeper#"+.@sub$+"_ac0"+.@in+"::OnMyMobDead";
@@ -2059,26 +2060,26 @@ OnInit:
 		disablenpc "Temple Keeper#"+.@sub$+"_ac0"+.@i;
 	end;
 }
-que_qaru01,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru01_ac01	1933,4,4,
-que_qaru01,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru01_ac02	1933,4,4,
-que_qaru02,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru02_ac01	1933,4,4,
-que_qaru02,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru02_ac02	1933,4,4,
-que_qaru03,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru03_ac01	1933,4,4,
-que_qaru03,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru03_ac02	1933,4,4,
-que_qaru04,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru04_ac01	1933,4,4,
-que_qaru04,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru04_ac02	1933,4,4,
-que_qaru05,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru05_ac01	1933,4,4,
-que_qaru05,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru05_ac02	1933,4,4,
-que_qsch01,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch01_ac01	1933,4,4,
-que_qsch01,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch01_ac02	1933,4,4,
-que_qsch02,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch02_ac01	1933,4,4,
-que_qsch02,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch02_ac02	1933,4,4,
-que_qsch03,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch03_ac01	1933,4,4,
-que_qsch03,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch03_ac02	1933,4,4,
-que_qsch04,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch04_ac01	1933,4,4,
-que_qsch04,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch04_ac02	1933,4,4,
-que_qsch05,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch05_ac01	1933,4,4,
-que_qsch05,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch05_ac02	1933,4,4,
+que_qaru01,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru01_ac01	1933,4,4
+que_qaru01,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru01_ac02	1933,4,4
+que_qaru02,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru02_ac01	1933,4,4
+que_qaru02,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru02_ac02	1933,4,4
+que_qaru03,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru03_ac01	1933,4,4
+que_qaru03,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru03_ac02	1933,4,4
+que_qaru04,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru04_ac01	1933,4,4
+que_qaru04,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru04_ac02	1933,4,4
+que_qaru05,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru05_ac01	1933,4,4
+que_qaru05,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru05_ac02	1933,4,4
+que_qsch01,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch01_ac01	1933,4,4
+que_qsch01,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch01_ac02	1933,4,4
+que_qsch02,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch02_ac01	1933,4,4
+que_qsch02,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch02_ac02	1933,4,4
+que_qsch03,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch03_ac01	1933,4,4
+que_qsch03,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch03_ac02	1933,4,4
+que_qsch04,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch04_ac01	1933,4,4
+que_qsch04,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch04_ac02	1933,4,4
+que_qsch05,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch05_ac01	1933,4,4
+que_qsch05,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch05_ac02	1933,4,4
 
 -	script	Wish Maiden#main_boss	-1,{
 	end;
@@ -2090,7 +2091,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-Onfight:
+OnFight:
 	initnpctimer;
 	end;
 
@@ -2116,7 +2117,7 @@ OnTimer5000:
 OnMyMobDead:
 	set .@sub$,callfunc("F_Okolnir");
 	if (!mobcount("que_q"+.@sub$,"Wish Maiden#"+.@sub$+"_boss::OnMyMobDead")) {
-		donpcevent "#okolnir_"+.@sub$+"::Onstop";
+		donpcevent "#okolnir_"+.@sub$+"::OnStop";
 		donpcevent "Wish Maiden#"+.@sub$+"_gift::OnEnable";
 		mapannounce "que_q"+.@sub$,"Wish Maiden : ..Good, you deserve the Goddess' shine.",bc_map,"0x00ff00";
 	}
@@ -2127,16 +2128,16 @@ OnInit:
 		hideonnpc "Wish Maiden#"+.@sub$+"_boss";	
 	end;
 }
-que_qaru01,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru01_boss	1931,
-que_qaru02,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru02_boss	1931,
-que_qaru03,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru03_boss	1931,
-que_qaru04,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru04_boss	1931,
-que_qaru05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru05_boss	1931,
-que_qsch01,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch01_boss	1931,
-que_qsch02,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch02_boss	1931,
-que_qsch03,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch03_boss	1931,
-que_qsch04,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch04_boss	1931,
-que_qsch05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch05_boss	1931,
+que_qaru01,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru01_boss	1931
+que_qaru02,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru02_boss	1931
+que_qaru03,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru03_boss	1931
+que_qaru04,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru04_boss	1931
+que_qaru05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru05_boss	1931
+que_qsch01,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch01_boss	1931
+que_qsch02,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch02_boss	1931
+que_qsch03,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch03_boss	1931
+que_qsch04,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch04_boss	1931
+que_qsch05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch05_boss	1931
 
 -	script	Wish Maiden#main_gift	-1,{
 	set .@sub$,callfunc("F_Okolnir");
@@ -2146,14 +2147,14 @@ que_qsch05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch05_boss	193
 		if (strcharinfo(0) == getguildmaster(.@GID)) {
 			if (compare(.@sub$,"aru")) {
 				setarray .@n, 7835,1,7836,1,7837,1,7838,1,2513,1,7291,10,7293,10,7063,100,985,20;
-				set .@rwd, 2541;
+				set .@rwd, 2541; //Asprika
 			} else {
 				setarray .@n, 7830,1,7831,1,7832,1,7833,1,7834,1,2357,1,7510,100,969,10,985,20;
-				set .@rwd, 2383;
+				set .@rwd, 2383; //Brynhild
 			}
 			for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2) {
 				if (countitem(.@n[.@i]) >= .@n[.@i+1])
-				set .@check, .@check + 1;
+					set .@check, .@check + 1;
 			}
 			if (.@check >= 9) {
 				cutin "wish_maiden12",1;
@@ -2178,7 +2179,7 @@ que_qsch05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch05_boss	193
 				for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 					delitem .@n[.@i],.@n[.@i+1];
 				getitem .@rwd,1;
-				getitem 7840,1;
+				getitem 7840,1; //Valkyrie_Gift
 				announce "["+ strcharinfo(0) +"], of guild ["+ GetGuildName(.@GID) +"] has brought a "+getitemname(.@rwd)+" into this world.",bc_all,"0x70dbdb";
 				close2;
 				cutin "wish_maiden11",255;
@@ -2256,16 +2257,16 @@ OnInit:
 		disablenpc "Wish Maiden#"+.@sub$+"_gift";
 	end;
 }
-que_qaru01,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru01_gift	403,
-que_qaru02,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru02_gift	403,
-que_qaru03,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru03_gift	403,
-que_qaru04,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru04_gift	403,
-que_qaru05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru05_gift	403,
-que_qsch01,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch01_gift	403,
-que_qsch02,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch02_gift	403,
-que_qsch03,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch03_gift	403,
-que_qsch04,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch04_gift	403,
-que_qsch05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch05_gift	403,
+que_qaru01,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru01_gift	403
+que_qaru02,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru02_gift	403
+que_qaru03,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru03_gift	403
+que_qaru04,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru04_gift	403
+que_qaru05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru05_gift	403
+que_qsch01,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch01_gift	403
+que_qsch02,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch02_gift	403
+que_qsch03,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch03_gift	403
+que_qsch04,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch04_gift	403
+que_qsch05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch05_gift	403
 
 -	script	#to_agit_main_gate	-1,{
 	end;
@@ -2280,16 +2281,16 @@ OnInit:
 		disablenpc "#to_agit_"+.@sub$+"_gate";
 	end;
 }
-que_qaru01,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru01_gate	45,1,1,
-que_qaru02,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru02_gate	45,1,1,
-que_qaru03,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru03_gate	45,1,1,
-que_qaru04,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru04_gate	45,1,1,
-que_qaru05,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru05_gate	45,1,1,
-que_qsch01,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch01_gate	45,1,1,
-que_qsch02,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch02_gate	45,1,1,
-que_qsch03,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch03_gate	45,1,1,
-que_qsch04,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch04_gate	45,1,1,
-que_qsch05,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch05_gate	45,1,1,
+que_qaru01,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru01_gate	45,1,1
+que_qaru02,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru02_gate	45,1,1
+que_qaru03,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru03_gate	45,1,1
+que_qaru04,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru04_gate	45,1,1
+que_qaru05,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru05_gate	45,1,1
+que_qsch01,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch01_gate	45,1,1
+que_qsch02,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch02_gate	45,1,1
+que_qsch03,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch03_gate	45,1,1
+que_qsch04,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch04_gate	45,1,1
+que_qsch05,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch05_gate	45,1,1
 
 -	script	#okolnir_main_time01	-1,{
 	end;
@@ -2300,7 +2301,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	setd "$siz_"+.@sub$+"_on",0;
 	setd "$gqse_"+.@sub$+"_time",0;
@@ -2328,16 +2329,16 @@ OnInit:
 	if (getd("$siz_"+.@sub$+"_on") == 2) initnpctimer;
 	end;
 }
-que_qaru01,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru01_time01	844,
-que_qaru02,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru02_time01	844,
-que_qaru03,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru03_time01	844,
-que_qaru04,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru04_time01	844,
-que_qaru05,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru05_time01	844,
-que_qsch01,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch01_time01	844,
-que_qsch02,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch02_time01	844,
-que_qsch03,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch03_time01	844,
-que_qsch04,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch04_time01	844,
-que_qsch05,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch05_time01	844,
+que_qaru01,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru01_time01	844
+que_qaru02,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru02_time01	844
+que_qaru03,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru03_time01	844
+que_qaru04,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru04_time01	844
+que_qaru05,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru05_time01	844
+que_qsch01,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch01_time01	844
+que_qsch02,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch02_time01	844
+que_qsch03,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch03_time01	844
+que_qsch04,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch04_time01	844
+que_qsch05,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch05_time01	844
 
 que_qaru01,116,313,0,0	monster	Garden Keeper	1932,1,180000,0,0
 que_qaru01,120,285,0,0	monster	Garden Keeper	1932,1,180000,0,0
diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt
index 31dea6319..91c43db0c 100644
--- a/npc/quests/partyrelay.txt
+++ b/npc/quests/partyrelay.txt
@@ -1,17 +1,16 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Party Relay Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
+//= [Official Conversion]
 //= Party Relay Quest.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Fixed a couple typos, npcs check area for PCs. [L0ne_W0lf]
+//= 1.2 Updated RE/Pre-RE EXP. [Euphy]
 //============================================================
 
 payon,103,113,3	script	Ledrion#payon::RelayLedrion	109,{
@@ -75,27 +74,7 @@ payon,103,113,3	script	Ledrion#payon::RelayLedrion	109,{
 		else {
 			getitem 617,3; //Old_Violet_Box
 		}
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 19560,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Ledrion]";
 		mes "Well, I hope you like it!";
 		mes "If you can't use it, then";
@@ -151,27 +130,7 @@ payon,103,113,3	script	Ledrion#payon::RelayLedrion	109,{
 		getitem 603,3; //Old_Blue_Box
 		getitem 617,1; //Old_Violet_Box
 		getitem 7738,1; //Mission_Certificate9
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 19560,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		next;
 		mes "[Ledrion]";
 		mes "Please give that ticket";
@@ -220,27 +179,7 @@ payon,103,113,3	script	Ledrion#payon::RelayLedrion	109,{
 		getitem 644,3; //Gift_Box
 		getitem 603,1; //Old_Blue_Box
 		getitem 7734,1; //Mission_Certificate5
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 19560,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		close;
 	}
 	if (countitem(7733) > 0) {
@@ -485,27 +424,7 @@ payon,83,327,3	script	Gatan#payon::RelayGatan	86,{
 		getitem 7739,1; //Mission_Certificate10
 		getitem 610,2; //Leaf_Of_Yggdrasil
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 19560,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		next;
 		mes "[Gatan]";
 		mes "Alright, get that done.";
@@ -970,27 +889,7 @@ payon,83,327,3	script	Gatan#payon::RelayGatan	86,{
 		set party_relay,17;
 		getitem 7735,1; //Mission_Certificate6
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 19560,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		next;
 		mes "[Gatan]";
 		mes "Alright, get that done.";
@@ -1461,27 +1360,7 @@ payon,83,327,3	script	Gatan#payon::RelayGatan	86,{
 		set party_relay,6;
 		getitem 7731,1; //Mission_Certificate2
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		next;
 		mes "[Gatan]";
 		mes "Don't forget to make";
@@ -1983,27 +1862,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		getitem 7740,1; //Mission_Certificate11
 		getitem 610,2; //Leaf_Of_Yggdrasil
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Make sure that you give";
 		mes "that ticket to an Archer";
@@ -2028,27 +1887,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		getitem 7740,1; //Mission_Certificate11
 		getitem 610,2; //Leaf_Of_Yggdrasil
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Make sure that you give";
 		mes "that ticket to an Archer";
@@ -2075,7 +1914,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "Don't forget now, alright?";
 		close;
 	}
-	if ((countitem(7739) > 0) && (.@relaytime >= 11) && (.@relaytime < 14) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) {
+	if ((countitem(7739) > 0) && (.@relaytime >= 11) && (.@relaytime < 14) && ((BaseClass == Job_Thief) || (BaseClass == Job_Acolyte))) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2102,7 +1941,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "I'll see you later~";
 		close;
 	}
-	else if ((countitem(7739) > 0) && (.@relaytime >= 0) && (.@relaytime < 3) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) {
+	else if ((countitem(7739) > 0) && (.@relaytime >= 0) && (.@relaytime < 3) && ((BaseClass == Job_Thief) || (BaseClass == Job_Acolyte))) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2130,7 +1969,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "I'll see you later~";
 		close;
 	}
-	if ((countitem(7739) > 0) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) {
+	if ((countitem(7739) > 0) && ((BaseClass == Job_Thief) || (BaseClass == Job_Acolyte))) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2170,27 +2009,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,20;
 		getitem 7736,1; //Mission_Certificate7
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Do me a favor and make";
 		mes "sure that the Merchant";
@@ -2214,27 +2033,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,20;
 		getitem 7736,1; //Mission_Certificate7
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Do me a favor and make";
 		mes "sure that the Merchant";
@@ -2276,27 +2075,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,20;
 		getitem 7736,1; //Mission_Certificate7
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Do me a favor and make";
 		mes "sure that the Merchant";
@@ -2320,27 +2099,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,20;
 		getitem 7736,1; //Mission_Certificate7
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Do me a favor and make";
 		mes "sure that the Merchant";
@@ -2480,27 +2239,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,9;
 		getitem 7732,1; //Mission_Certificate3
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Please give that";
 		mes "ticket to the Archer";
@@ -2523,27 +2262,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,9;
 		getitem 7732,1; //Mission_Certificate3
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		next;
 		mes "[Bafhail]";
 		mes "Please give that";
@@ -2632,7 +2351,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "Standard Time. Don't forget!";
 		close;
 	}
-	if ((countitem(7731) > 0) && (BaseLevel > 39) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (Baseclass == Job_Thief)) {
+	if ((countitem(7731) > 0) && (BaseLevel > 39) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (BaseClass == Job_Thief)) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2664,7 +2383,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "items for missions, okay?";
 		close;
 	}
-	else if ((countitem(7731) > 0) && (BaseLevel > 39) && ((.@relaytime >= 21) && (Baseclass == Job_Thief))) {
+	else if ((countitem(7731) > 0) && (BaseLevel > 39) && ((.@relaytime >= 21) && (BaseClass == Job_Thief))) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2696,7 +2415,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "items for missions, okay?";
 		close;
 	}
-	if ((countitem(7731) > 0) && (BaseLevel > 39) && (Baseclass == Job_Thief)) {
+	if ((countitem(7731) > 0) && (BaseLevel > 39) && (BaseClass == Job_Thief)) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2783,27 +2502,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		getitem 7741,1; //Mission_Certificate12
 		getitem 610,2; //Leaf_Of_Yggdrasil
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -2840,27 +2539,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		getitem 7741,1; //Mission_Certificate12
 		getitem 610,2; //Leaf_Of_Yggdrasil
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -2970,7 +2649,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		mes "important to know!";
 		close;
 	}
-	if ((countitem(7740) > 0) && ((Baseclass == Job_Archer) || (BaseClass == Job_Merchant))) {
+	if ((countitem(7740) > 0) && ((BaseClass == Job_Archer) || (BaseClass == Job_Merchant))) {
 		mes "[Lospii]";
 		mes "Hi, I'm Lospii! Maybe";
 		mes "I'm younger than you, but";
@@ -3021,27 +2700,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		set party_relay,22;
 		getitem 7737,1; //Mission_Certificate8
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -3077,27 +2736,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		set party_relay,22;
 		getitem 7737,1; //Mission_Certificate8
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -3258,27 +2897,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		set party_relay,11;
 		getitem 7733,1; //Mission_Certificate4
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -3314,27 +2933,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		set party_relay,11;
 		getitem 7733,1; //Mission_Certificate4
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -3362,7 +2961,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		mes "I... I can't read watches...";
 		close;
 	}
-	if ((countitem(7732) > 0) && (BaseLevel > 39) && ((.@relaytime >= 14) && (.@relaytime < 17)) && (Baseclass == Job_Archer)) {
+	if ((countitem(7732) > 0) && (BaseLevel > 39) && ((.@relaytime >= 14) && (.@relaytime < 17)) && (BaseClass == Job_Archer)) {
 		mes "[Lospii]";
 		mes "Hi, I'm Lospii! Maybe";
 		mes "I'm younger than you, but";
@@ -3403,7 +3002,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		mes "important to know!";
 		close;
 	}
-	else if ((countitem(7732) > 0) && (BaseLevel > 39) && ((.@relaytime >= 18) && (.@relaytime < 21)) && (Baseclass == Job_Archer)) {
+	else if ((countitem(7732) > 0) && (BaseLevel > 39) && ((.@relaytime >= 18) && (.@relaytime < 21)) && (BaseClass == Job_Archer)) {
 		mes "[Lospii]";
 		mes "Hi, I'm Lospii! Maybe";
 		mes "I'm younger than you, but";
@@ -3444,7 +3043,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		mes "important to know!";
 		close;
 	}
-	if ((countitem(7732) > 0) && (BaseLevel > 39) && (Baseclass == Job_Archer)) {
+	if ((countitem(7732) > 0) && (BaseLevel > 39) && (BaseClass == Job_Archer)) {
 		mes "[Lospii]";
 		mes "Hi, I'm Lospii! Maybe";
 		mes "I'm younger than you, but";
@@ -3476,6 +3075,28 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 	close;
 }
 
+// EXP Rewards
+function	script	F_PartyRelay_Exp	{
+	if (checkre(3)) { //unconfirmed
+		if (BaseLevel > 94) getexp 104760,0;
+		else if (BaseLevel > 89) getexp 85920,0;
+		else if (BaseLevel > 79) getexp 38520,0;
+		else if (BaseLevel > 69) getexp 19560,0;
+		else if (BaseLevel > 59) getexp 6720,0;
+		else if (BaseLevel > 49) getexp 2880,0;
+		else getexp 1080,0;
+	} else {
+		if (BaseLevel > 94) getexp 1047600,0;
+		else if (BaseLevel > 89) getexp 859200,0;
+		else if (BaseLevel > 79) getexp 385200,0;
+		else if (BaseLevel > 69) getexp 195600,0;
+		else if (BaseLevel > 59) getexp 67200,0;
+		else if (BaseLevel > 49) getexp 28800,0;
+		else getexp 10800,0;
+	}
+	return;
+}
+
 // Comodo Relay
 comodo,71,137,3	duplicate(RelayLedrion)	Ledrion#comodo	109
 comodo,236,197,3	duplicate(RelayGatan)	Gatan#comodo	86
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index ddb7a3eea..5b4b43f94 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 2.7a
+//= 3.4
 //===== Description: =========================================
 //= [Official Conversion]
 //= Contains Quests:
@@ -15,49 +15,27 @@
 //= Finding a Fairy & Finding a Giant Tree
 //= The Tripartite Union's Feud
 //= Cat Hand Agent
-//= - Contains untranslated dialog.
 //= Part Time Work
-//= - Contains Custom translated dialog.
 //= Report from the New World
-//= - Contains Custom translated dialog.
-// Persuing Rayan Moore
-//= - Contains Custom translated dialog.
+//= Persuing Rayan Moore
 //===== Additional Comments: =================================
-//= 1.0 First Version. [L0ne_W0lf]
-//= 1.1 I missed an end in one of the lhz guards. [L0ne_W0lf]
-//= 1.2 Fixed missing ends, wrong label and some typos [Gepard]
-//= 1.3 Added the two remaining 13.1 quests. [L0ne_W0lf]
-//=     Cat Hand Agents no longer ignore you with 300+ points.
-//= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131)
-//= 1.5 Removed a 'close;' which should have been 'close2'. (bugreport:4276)
-//= 1.6 Fixed check in cat hand agent.
-//= 1.7 Moved the close in Cat Hand Service Warps. (bugreport:4079) [L0ne_W0lf]
-//= 1.8 Added 13.2 Additions to Report from the New World NPCs
-//= 1.9 Upped success rates for Report from the New World drops.
-//= 2.0 Added Mid Camp Warper, translated from the Official [Slim]
-//= 2.1 Fixed some typos [tr0n]
-//= 2.2 A little optimization (-25kb). [Euphy]
-//= 2.3 Updated to match the new Izlude Map. [Masao]
-//= 2.4 More optimization (-32kb). [Euphy]
-//= 2.5 Yet more optimization (-22kb). [Euphy]
-//= 2.5a Minor fixes. [Euphy]
-//= 2.6 Disabled "Ash Vacuum Warper" as it's no longer in iRO. [Euphy]
-//= 2.6a Added 'npcskill' command. [Euphy]
-//= 2.7 Updated incorrect EXP values & added checkre() checks [Streusel]
-//= 2.7a Modified Promotional Staff for Izlude
-//= 2.8 Fixed a missing variable check. [Joseph]
+//= 3.0 Fixed a missing variable check. [Joseph]
+//= 3.1 Updated RE/Pre-RE EXP. [Euphy]
+//= 3.2 Updated ep13_start and dialog to match official script. [Joseph]
+//= 3.3 Updated to match the latest official script. [Euphy]
+//= 3.3a Added Izlude RE coordinates. [Euphy]
+//= 3.4 Added GM management function and NPC. [Euphy]
 //============================================================
 
-// Onward to the New World
+// Onward to the New World :: ep13_gogo
 //============================================================
-prontera,163,53,3	script	Promotional Staff#prt	100,{
+function	script	Promotional_Staff	{
 	mes "[Promotional Staff]";
 	mes "We are looking for adventurers who are super curious and extremely brave.";
 	mes "Join us for a wonderful adventure!";
 	next;
 	mes "[Promotional Staff]";
-	mes "Hey, you're a knowledgeable person, right?";
-	mes "Are you interested in my story?";
+	mes "Hey, you're a knowledgeable person, right? Are you interested in my story?";
 	next;
 	switch(select("Yes.:No, thanks.")) {
 	case 1:
@@ -69,8 +47,7 @@ prontera,163,53,3	script	Promotional Staff#prt	100,{
 		mes "[Promotional Staff]";
 		mes "I usually send adventurers to";
 		mes "newly found places for research.";
-		mes "It's quite challenging, as nobody's";
-		mes "ever been to these places.";
+		mes "It's quite challeging, as nobody's ever been to these places.";
 		next;
 		mes "[Promotional Staff]";
 		mes "The missions are quite dangerous,";
@@ -79,15 +56,10 @@ prontera,163,53,3	script	Promotional Staff#prt	100,{
 		mes "of this mission.";
 		next;
 		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong";
-		mes "enough, but you seem brave. How";
-		mes "about going to the kingdom";
-		mes "receptionist? He should be in the";
-		mes "first room of Prontera Castle.";
+		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
 		next;
 		mes "[Promotional Staff]";
-		mes "From what I've heard about this";
-		mes "new place... It's not a new continent.";
+		mes "From what I've heard about this place... It's not a new continent.";
 		mes "I don't know where it is.";
 		mes "Hmm... Inside of the sky?";
 		next;
@@ -97,20 +69,21 @@ prontera,163,53,3	script	Promotional Staff#prt	100,{
 		mes "It's not my business.";
 		next;
 		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many";
-		mes "adventurers about it.";
+		mes "Anyway, I'm supposed to inform many adventurers about it.";
 		mes "There's no time to waste!";
 		close;
 	case 2:
 		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real";
-		mes "adventurer. You're missing a big";
-		mes "opportunity. You're definitely not";
-		mes "brave. Absolutely not!";
+		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
 		close;
 	}
 }
 
+prontera,163,53,3	script	Promotional Staff#prt	100,{
+	callfunc "Promotional_Staff";
+	end;
+}
+
 prt_castle,121,51,3	script	Alliance Manager#prt	752,{
 	if (ep13_ryu == 13) {
 		mes "[Alliance Manager]";
@@ -295,7 +268,7 @@ prt_castle,83,67,5	script	Recruiter for the Brave	109,{
 		next;
 		changequest 10064,10065;
 		set ep13_ryu,9;
-		if(checkre(0))
+		if (checkre(3))
 			getexp 66000,21000;
 		else
 			getexp 660000,210000;
@@ -388,7 +361,14 @@ aldebaran,127,138,3	script	Promotional Staff#alde	100,{
 		mes "Just visit the ^FF0000Promotional Staff in Geffen^000000. You have no business with me anymore. Bless you. I wish you a safe adventure.";
 		close;
 	}
-	if ((ep13_ryu == 2) && (countitem(909) > 299)) {
+	if (ep13_ryu == 2) {
+		if (countitem(909) < 300) {
+			mes "[Promotional Staff]";
+			mes "Don't forget to bring... ^FF0000300 Jellopy^000000.";
+			mes "Got it? ^FF0000300 Jellopy^000000!";
+			mes "Let me know once you got them.";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "Hey! Let me know once you collect all of them.";
 		mes "Don't disturb me anymore. I'm a busy man... What a waste.";
@@ -428,13 +408,6 @@ aldebaran,127,138,3	script	Promotional Staff#alde	100,{
 		mes "Bless you!";
 		close;
 	}
-	if (ep13_ryu == 2) {
-		mes "[Promotional Staff]";
-		mes "Don't forget to bring... ^FF0000300 Jellopy^000000.";
-		mes "Got it? ^FF0000300 Jellopy^000000!";
-		mes "Let me know once you got them.";
-		close;
-	}
 	if (ep13_ryu == 1) {
 		mes "[Promotional Staff]";
 		mes "We want the adventurers who are super curious and extremely brave. Join us for a wonderful adventure!";
@@ -473,52 +446,8 @@ aldebaran,127,138,3	script	Promotional Staff#alde	100,{
 		mes "Then we can go forward.";
 		close;
 	}
-	mes "[Promotional Staff]";
-	mes "We want the adventurers who are super curious and extremely brave. Join us for a wonderful adventure!";
-	next;
-	mes "[Promotional Staff]";
-	mes "Hey, you're a well-versed person, right? Are you interested in my story?";
-	next;
-	switch(select("Yes.:No, thanks.")) {
-	case 1:
-		mes "[Promotional Staff]";
-		mes "You're a real adventurer.";
-		mes "Good for you!";
-		mes "You won't regret it.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I usually send adventurers to";
-		mes "newly found places for research.";
-		mes "It's quite challeging, as nobody's ever been to these places.";
-		next;
-		mes "[Promotional Staff]";
-		mes "The missions are quite dangerous,";
-		mes "so only those who are courageous";
-		mes "are qualified for the challenge";
-		mes "of this mission.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
-		next;
-		mes "[Promotional Staff]";
-		mes "From what I've heard about this place... It's not a new continent.";
-		mes "I don't know where it is.";
-		mes "Hmm... Inside of the sky?";
-		next;
-		mes "[Promotional Staff]";
-		mes "Could just be a rumor,";
-		mes "but I don't know exactly.";
-		mes "It's not my business.";
-		next;
-		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many adventurers about it.";
-		mes "There's no time to waste!";
-		close;
-	case 2:
-		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
-		close;
-	}
+	callfunc "Promotional_Staff";
+	end;
 }
 
 geffen,90,67,3	script	Promotional Staff#gef	100,{
@@ -534,7 +463,14 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "Or do you have any business in Geffen?";
 		close;
 	}
-	if ((ep13_ryu == 5) && (countitem(723) > 0)) {
+	if (ep13_ryu == 5) {
+		if (countitem(723) == 0) {
+			mes "[Promotional Staff]";
+			mes "^FF00001 Ruby!!^000000.";
+			mes "Don't you forget it!";
+			mes "Hurry up! Time is zeny!";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "Wow, you brought a genuine Jewel.";
 		mes "You are absolutely qualified.";
@@ -567,14 +503,13 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "Good luck!";
 		close;
 	}
-	if (ep13_ryu == 5) {
-		mes "[Promotional Staff]";
-		mes "^FF00001 Ruby!!^000000.";
-		mes "Don't you forget it!";
-		mes "Hurry up! Time is zeny!";
-		close;
-	}
-	if ((ep13_ryu == 4) && (countitem(721) > 0)) {
+	if (ep13_ryu == 4) {
+		if (countitem(721) == 0) {
+			mes "[Promotional Staff]";
+			mes "The one you should bring me is";
+			mes "^FF0000Emerald^000000. Can you get it?";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "You brought it so soon!";
 		mes "You're a real adventurer!";
@@ -598,12 +533,6 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "I will wait until you bring me a stone again.";
 		close;
 	}
-	if (ep13_ryu == 4) {
-		mes "[Promotional Staff]";
-		mes "The one you should bring me is";
-		mes "^FF0000Emerald^000000. Can you get it?";
-		close;
-	}
 	if (ep13_ryu == 3) {
 		mes "[Promotional Staff]";
 		mes "We are recruiting adventurers who are strong and curious. Try your life at something more challenging.";
@@ -633,55 +562,11 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "Then we can go forward.";
 		close;
 	}
-	mes "[Promotional Staff]";
-	mes "We want adventurers who are super curious and extremely brave. Join us for a wonderful adventure!";
-	next;
-	mes "[Promotional Staff]";
-	mes "Hey, you're a knowledgeable person, right? Are you interested in my story?";
-	next;
-	switch(select("Yes.:No, thanks.")) {
-	case 1:
-		mes "[Promotional Staff]";
-		mes "You're a real adventurer.";
-		mes "Good for you!";
-		mes "You won't regret it.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I usually send adventurers to";
-		mes "newly found places for research.";
-		mes "It's quite challeging, as nobody's ever been to these places.";
-		next;
-		mes "[Promotional Staff]";
-		mes "The missions are quite dangerous,";
-		mes "so only those who are courageous";
-		mes "are qualified for the challenge";
-		mes "of this mission.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
-		next;
-		mes "[Promotional Staff]";
-		mes "From what I've heard about this place... It's not a new continent.";
-		mes "I don't know where it is.";
-		mes "Hmm... Inside of the sky?";
-		next;
-		mes "[Promotional Staff]";
-		mes "Could just be a rumor,";
-		mes "but I don't know exactly.";
-		mes "It's not my business.";
-		next;
-		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many adventurers about it.";
-		mes "There's no time to waste!";
-		close;
-	case 2:
-		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
-		close;
-	}
+	callfunc "Promotional_Staff";
+	end;
 }
 
--	script	::Promotional Staff#iz	-1,{
+-	script	::PromotionalStaff_izlude	-1,{
 	if (ep13_ryu > 8) {
 		mes "[Promotional Staff]";
 		mes "I bless you for your future! May it be full of happiness!";
@@ -693,7 +578,21 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "If you have any other business, go to the palace.";
 		close;
 	}
-	if ((ep13_ryu == 7) && (BaseLevel > 69)) {
+	if (ep13_ryu == 7) {
+		if (BaseLevel < 70) {
+			mes "[Promotional Staff]";
+			mes "You don't look that strong.";
+			mes "Nothing but skin and bones!";
+			mes "Not reliable.";
+			mes "You should level up more before";
+			mes "considering this adventure.";
+			next;
+			mes "[Promotional Staff]";
+			mes "I don't need adventurers who are";
+			mes "body-builders... but at least";
+			mes "someone not so little!!";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "Wow! You are considerably";
 		mes "stronger than before!";
@@ -732,20 +631,6 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "for your great future!";
 		close;
 	}
-	if (ep13_ryu == 7) {
-		mes "[Promotional Staff]";
-		mes "You don't look that strong.";
-		mes "Nothing but skin and bones!";
-		mes "Not reliable.";
-		mes "You should level up more before";
-		mes "considering this adventure.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I don't need adventurers who are";
-		mes "body-builders... but at least";
-		mes "someone not so little!!";
-		close;
-	}
 	if (ep13_ryu == 6) {
 		mes "[Promotional Staff]";
 		mes "We are recruiting adventurers";
@@ -810,54 +695,8 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 			close;
 		}
 	}
-	mes "[Promotional Staff]";
-	mes "We want the adventurers who are super curious";
-	mes "and extremely brave.";
-	mes "Join us for a wonderful adventure!";
-	next;
-	mes "[Promotional Staff]";
-	mes "Hey, you're a well-knowledged person, as I know. Are you interested in my story?";
-	next;
-	switch(select("Yes.:No, thanks.")) {
-	case 1:
-		mes "[Promotional Staff]";
-		mes "You're a real adventurer.";
-		mes "Good for you!";
-		mes "You won't regret it.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I usually send adventurers to";
-		mes "newly found places for research.";
-		mes "It's quite challeging, as nobody's ever been to these places.";
-		next;
-		mes "[Promotional Staff]";
-		mes "The missions are quite dangerous,";
-		mes "so only those who are courageous";
-		mes "are qualified for the challenge";
-		mes "of this mission.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
-		next;
-		mes "[Promotional Staff]";
-		mes "From what I've heard about this place... It's not a new continent.";
-		mes "I don't know where it is.";
-		mes "Hmm... Inside of the sky?";
-		next;
-		mes "[Promotional Staff]";
-		mes "Could just be a rumor,";
-		mes "but I don't know exactly.";
-		mes "It's not my business.";
-		next;
-		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many adventurers about it.";
-		mes "There's no time to waste!";
-		close;
-	case 2:
-		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
-		close;
-	}
+	callfunc "Promotional_Staff";
+	end;
 }
 
 lighthalzen,220,292,3	script	Guide#ep13_1	899,{
@@ -1944,7 +1783,7 @@ moc_fild22b,230,197,5	script	Munkenro#2	967,{
 		next;
 		completequest 10078;
 		set ep13_ryu,100;
-		if(checkre(0))
+		if (checkre(3))
 			getexp 66000,21000;
 		else
 			getexp 660000,210000;
@@ -1968,7 +1807,7 @@ OnEnable:
 	monster "moc_fild22b",0,0,"Allied Soldier",1851,80,"Head of the Alliance#moo::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "moc_fild22b","Head of the Alliance#moo::OnMyMobDead";
 	end;
 
@@ -2081,23 +1920,25 @@ moc_ruins,137,89,5	script	Time-Space Gap Guard	707,{
 	close;
 }
 
-/*
 moc_fild22b,370,370,3	script	Allied Manager#gm	100,{
+	callfunc "F_GM_NPC";
 	mes "[Manager]";
 	mes "Please enter the password.";
 	next;
-	input .@input;
-	if ((.@input < 0) || (.@input > 9000) ) {
+	set .@i, callfunc("F_GM_NPC",8028,0,0,9000);
+	if (.@i == -2) {
 		mes "[Manager]";
 		mes "Incorrect password.";
 		close;
-	}
-	else if (.@input == 0) {
+	} else if (.@i == -1) {
 		mes "[Manager]";
 		mes "Please enter a password other then 0.";
 		close;
-	}
-	else if (.@input == 8028) {
+	} else if (.@i == 0) {
+		mes "[Manager]";
+		mes "Nevermind then.";
+		close;
+	} else {
 		mes "[Manager]";
 		mes "What would you like to do?";
 		next;
@@ -2114,25 +1955,19 @@ moc_fild22b,370,370,3	script	Allied Manager#gm	100,{
 			close;
 		}
 	}
-	else {
-		mes "[Manager]";
-		mes "Nevermind then.";
-		close;
-	}
 }
-*/
 
-// New Surroundings
-//============================================================ 
+// New Surroundings :: ep13_newbs
+//============================================================
 mid_camp,222,283,4	script	Marian#ep13bs	727,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "[Marian]";
-		mes "You are carrying too much weight.";
-		mes "Please try again after losing some weight.";
+		mes "You have too many items~";
+		mes "Drop some and come back to me.";
 		close;
 	}
 	if (ep13_newbs < 1) {
-		if (ep13_ryu > 99) {
+		if (ep13_ryu > 99 || ep13_start > 99) {
 			mes "[Marian]";
 			mes "You must be a stranger here.";
 			mes "Is this your first visit here?";
@@ -2827,7 +2662,7 @@ mid_camp,261,284,4	script	Instructor#ep13bs	405,{
 			mes "Hehe, don't mention it.";
 			mes "And Otto said that he";
 			mes "would come to see you.";
-			emotion 40,1;
+			emotion e_shy,1;
 			next;
 			mes "[Instructor Lugen]";
 			mes "Did he?";
@@ -2840,7 +2675,7 @@ mid_camp,261,284,4	script	Instructor#ep13bs	405,{
 			set ep13_newbs,100;
 			getitem 617,1; //Old_Violet_Box
 			getitem 12322,5; //Chocolate_Pie
-			if(checkre(0))
+			if (checkre(3))
 				getexp 100000,10000;
 			else
 				getexp 1000000,100000;
@@ -3099,7 +2934,7 @@ mid_camp,264,263,4	script	Diego#ep13bs	931,{
 		case 1:
 			mes "[Diego]";
 			mes "Thanks.";
-			emotion 15;
+			emotion e_thx;
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "What do you need?";
@@ -3363,12 +3198,12 @@ mid_camp,160,298,4	script	Jan#ep13bs	865,{
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "Yes...";
-			emotion 4,1;
+			emotion e_swt,1;
 			next;
 			mes "[Jan]";
 			mes "Ahhh, it's exciting~";
 			mes "I love it.";
-			emotion 38;
+			emotion e_awsm;
 			next;
 			mes "[Jan]";
 			mes "I want to unwrap it right now~";
@@ -3442,7 +3277,7 @@ mid_camp,30,168,4	script	Gerard#ep13bs	939,{
 			mes "I was considering";
 			mes "going back to the camp.";
 			mes "I really appreciate this.";
-			emotion 37;
+			emotion e_rice;
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "...";
@@ -3510,7 +3345,7 @@ man_fild01,80,248,4	script	Alberto#ep13bs	934,{
 			mes "I finally got it.";
 			mes "My coat...sniff.";
 			mes "It's freezing here.";
-			emotion 28;
+			emotion e_sob;
 			next;
 			mes "[Alberto]";
 			mes "Sniff...";
@@ -3550,7 +3385,7 @@ man_fild01,80,248,4	script	Alberto#ep13bs	934,{
 			mes "[Alberto]";
 			mes "It's so cold here~~";
 			mes "the wind chills me to the bones~";
-			emotion 28;
+			emotion e_sob;
 			close;
 		}
 	}
@@ -3598,7 +3433,7 @@ mid_camp,166,248,4	script	Sorcerer#ep13bs	937,{
 	next;
 	mes "[Biolay]";
 	mes "I want to go back to my house.";
-	emotion 28;
+	emotion e_sob;
 	close;
 }
 
@@ -3809,10 +3644,10 @@ mid_camp,267,258,0	script	Post#ep13bs2	111,{
 	}
 }
 
-// Attitude to the New
-//============================================================ 
+// Attitude to the New :: ep13_ecology
+//============================================================
 mid_camp,188,254,3	script	Monster Scholar#ep13	883,{
-	if (ep13_ryu < 100) {
+	if (ep13_ryu < 100 && ep13_start < 100) {
 		mes "[Monster Scholar]";
 		mes "Who... Who are you?";
 		mes "Are you from the other";
@@ -4373,10 +4208,7 @@ mid_camp,188,254,3	script	Monster Scholar#ep13	883,{
 				mes "I hope you'll make yourself known in Ash Vacuum with your great accomplishments.";
 				set ep13_animal,15;
 				completequest 2157;
-				if(checkre(0))
-					getexp 100000,0;
-				else
-					getexp 1500000,0;
+				getexp (checkre(3))?100000:1500000,0;
 				close;
 			}
 			else {
@@ -4387,128 +4219,122 @@ mid_camp,188,254,3	script	Monster Scholar#ep13	883,{
 		}
 		else if (ep13_animal == 15) {
 			if (countitem(6033) > 0) {
-				// Custom Translation.
 				mes "["+strcharinfo(0)+"]";
-				mes "Rumis! Come see this!";
+				mes "Mr. Rumis! Take a look at this!";
 				next;
 				mes "[Rumis Block]";
-				mes "... What's all the fuss?";
-				mes "I feel so down because I cannot go back to my own country...";
+				mes "...Oh, hello.";
+				mes "I'm extremely frustrated. I feel helpless because I wasn't able to go back home last time...";
 				next;
 				mes "["+strcharinfo(0)+"]";
-				mes "I found this on a monster at the Splendide Area.";
-				mes "It's a mysterious monster with grass grown over it's body!";
+				mes "I've found this horn from a monster in the Splendide Area.";
+				mes "That monster was very mysterious, and its body was covered with grass.";
 				next;
 				mes "[Rumis Block]";
-				mes "Oeh... body with grass grown over it?";
-				mes "No, no. I'm not interested with it.";
+				mes "Ho... Covered with grass?";
+				mes "...I know you're excited, but that doesn't sound interesting to me. Sorry.";
 				next;
 				mes "[Rumis Block]";
-				mes "Let me see the horn you brought back.";
+				mes "Let me take a look at the horn.";
 				next;
 				mes "[Rumis Block]";
-				mes "Okay.";
+				mes "Hmm.";
 				next;
 				mes "[Rumis Block]";
-				mes "Okay.....";
+				mes "Uhmm...";
 				next;
 				mes "[Rumis Block]";
-				mes "Hah....?";
+				mes "Huh...?";
 				next;
 				mes "[Rumis Block]";
-				mes "... This is amazing.";
-				mes "... It's actually almost identical to the Manuk Field area Hillsrion horn.";
+				mes "...This is remarkable.";
+				mes "...This horn looks very similar to that of the Hillsrions that inhabit the Manuk area.";
 				next;
 				mes "[Rumis Block]";
-				mes "Could they be related?";
-				mes "Or has it evolved?";
+				mes "I wonder if they're related,";
+				mes "or if this is an evolved Hillsrion.";
 				next;
 				mes "["+strcharinfo(0)+"]";
-				mes "What about evolution due to the enviromental changes?";
+				mes "Ah, and there's the possibility of mutation caused by the environment.";
 				next;
 				mes "[Rumis Block]";
-				mes "... What do you mean by that?";
-				mes "Do you mean that the changes made their physical appearance evolved?";
+				mes "...What do you mean?";
+				mes "Are you saying the monster has been mutated by environmental causes?";
 				next;
 				mes "["+strcharinfo(0)+"]";
-				mes "Yes... That is right. Maybe like that! Hehe.";
+				mes "Well, that's possible, isn't it? Haha!";
 				next;
-				mes "- You told Rumis about the mutated plant that you heard about from Botanist Terris -";
+				mes "- You told Rumis what you've heard from Botanist Terris: some plants are already showing signs of mutation. -";
 				next;
 				mes "[Rumis Block]";
-				mes "Hoho... this is interesting.";
-				mes "If there are those special... miracle energy filling devices, I guess.. it can cause those monsters to mutate.";
+				mes "Oh, that's interesting.";
+				mes "If such a device really exists, it's possible to cause abnormal growth to monsters by injecting them with special energy.";
 				next;
 				mes "[Rumis Block]";
-				mes "But, who setup that device?";
+				mes "By the way, who came up with the idea of that device?";
 				next;
 				mes "["+strcharinfo(0)+"]";
-				mes "That I do not know. Hehe.";
+				mes "I have no idea. Haha!";
 				next;
 				mes "[Rumis Block]";
 				mes "I see...";
-				mes "Human devices cause these mutations... other than Tendrilrion, there may be other things alike aswell..";
+				mes "Mutants caused by a man-made device... Then there might be more mutated creatures in addition to Tendrillion.";
 				next;
 				mes "[Rumis Block]";
-				mes "... I would like to know.";
-				mes "But, I have to go back to my country now. The management should be giving me my order to go back, my researches are worthless now.";
+				mes "...Now I'm very curious.";
+				mes "But... I want to go back home... It's no use studying them if the management will order me to return.";
 				next;
 				mes "[Rumis Block]";
-				mes "My brother seems to like this place.";
-				mes "He spents a lot of time here...";
+				mes "I guess my brother really likes this place.";
+				mes "I mean, he's working so hard to figure things out...";
 				next;
 				mes "[Rumis Block]";
-				mes "But, I guess everyone has their own life.";
-				mes "Perhaps if my brother can... understands this younger brother a little, I won't ask for any other things anymore...";
+				mes "Well, not everyone can live the same life.";
+				mes "I just hope he'll have a better understanding about me...";
 				next;
 				mes "[Rumis Block]";
-				mes "What will others think of me when I go back to Midgard?";
-				mes "But still, thank you, at least I can still talk to another human. ...Thank you.";
+				mes "I don't know if people in Midgard will welcome me back.";
+				mes "Thanks to you, I at least have a few interesting stories to tell them.";
 				next;
 				mes "[Rumis Block]";
-				mes "If after this can stay here, please take care of my brother.";
-				mes "If this area can be developed, by that time I will...";
+				mes "If you're going to stick around here longer, please help my brother with his study.";
+				mes "I might want to come back later once this area is fully explored and developed...";
 				next;
-				mes "- Rumis Block laid his hand out shyly, but then backed off -";
+				mes "- With a shy smile on the face, Rumis Block asked you to shake hands, and then turned around hurriedly. -";
 				next;
-				mes "- You pat his shoulder gently, it's worrying that Rumis is not able to return to his country. -";
+				mes "- You really hope that Rumis will be able to go back home. -";
 				set ep13_animal,100;
 				delitem 6033,1; //Horn_Of_Tendrilion
-				if(checkre(0))
-					getexp 50000,0;
-				else
-					getexp 1000000,0;
+				getexp (checkre(3))?50000:1000000,0;
 				close;
 			}
 			else {
 				mes "[Rumis Block]";
 				mes "...I submitted the report to the management, but they have not yet ordered me to go back home...";
-				mes "*Sigh* I guess nothing's as easy as I'd hoped....";
+				mes "...*Sigh* I guess nothing's as easy as I'd hoped.";
 				close;
 			}
 		}
 		else if (ep13_animal == 100) {
-			// Custom Translation.
-			mes "Rumis seems anxious.";
+			mes "- Rumis seems anxious and scatterbrained. -";
 			close;
 		}
 		else {
-			// Custom Translation.
 			mes "[Rumis Block]";
-			mes "If only I can go back to Rune Midgard....";
+			mes "When can I go back to Midgard...? *Sigh*";
 			close;
 		}
 	}
 }
 
 mid_camp,240,270,3	script	Botanist#ep13	750,{
-	if (ep13_ryu < 100) {
+	if (ep13_ryu < 100 && ep13_start < 100) {
 		mes "[Botanist]";
 		mes "This new land!";
 		mes "Undiscovered life!";
 		mes "Everything about this world excites me.";
 		next;
-		emotion 14;
+		emotion e_lv2;
 		mes "[Botanist]";
 		mes "Oh, okay... Ah-hah!";
 		mes "This is how it goes...";
@@ -4521,7 +4347,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 			mes "Undiscovered life!";
 			mes "Everything about this world excites me.";
 			next;
-			emotion 14;
+			emotion e_lv2;
 			mes "[Botanist]";
 			mes "Oh, okay... Ah-hah!";
 			mes "This is how it goes...";
@@ -4532,7 +4358,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 			mes "Undiscovered life!";
 			mes "Everything about this world excites me.";
 			next;
-			emotion 14;
+			emotion e_lv2;
 			emotion e_dots,1;
 			mes "[Botanist]";
 			mes "Oh, okay... Ah-hah!";
@@ -4550,7 +4376,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 				next;
 				break;
 			case 2:
-				emotion 14,1;
+				emotion e_lv2,1;
 				mes "["+strcharinfo(0)+"]";
 				mes "I agree. There's so much to see around here!";
 				next;
@@ -4598,7 +4424,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 			mes "[Botanist]";
 			mes "Usually twins share the same feelings and ideas, I can see what he does or thinks if I try hard.";
 			next;
-			emotion 54;
+			emotion e_sigh;
 			mes "[Botanist]";
 			mes "Let me see what Rumis is doing right now... Oh, he's picking his nose with his left hand and eating a slice of bread with his right.";
 			mes "God, how disgusting!";
@@ -4618,7 +4444,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 				next;
 				break;
 			case 2:
-				emotion 54;
+				emotion e_sigh;
 				mes "[Botanist]";
 				mes "Oh,";
 				mes "won't you cut me some slack? I was just joking to melt the ice.";
@@ -4783,225 +4609,43 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 }
 
 mid_camp,336,171,1	script	Camp Guard#man1	852,{
-	if (ep13_animal == 0) {
-		if (ep13_newbs == 6 || ep13_newbs == 19 || ep13_start == 100) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			mes "[Camp Guard]";
-			mes "Your cooperation is appreciated.";
-			close;
-		}
-	}
-	else if (ep13_animal == 1) {
-		if (ep13_newbs == 6 || ep13_newbs == 19) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			mes "[Camp Guard]";
-			mes "Your cooperation is appreciated.";
-			next;
-			switch(select("I've come to help with some research.:I want to stay.")) {
-			case 1:
-				mes "["+strcharinfo(0)+"]";
-				mes "Hi, my name is "+strcharinfo(0)+". I'm the assistant of Monster Scholar Rumis Block.";
-				next;
-				mes "[Camp Guard]";
-				mes "That 'fraidy-- Wah! I'm sorry!";
-				mes "I didn't mean to say that... And I completely understand that he hasn't been able to adapt himself to new surroundings.";
-				next;
-				mes "[Camp Guard]";
-				mes "So, you're here to assist Mr. Rumis Block, huh?";
-				mes "You may pass. If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-				set ep13_animal,2;
-				close2;
-				warp "man_fild01",36,235;
-				end;
-			case 2:
-				mes "[Camp Guard]";
-				mes "No, you can't. Please return to the expedition camp.";
-				close;
-			}
-		}
-	}
-	else {
-		if (ep13_newbs == 6 || ep13_newbs == 19) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			switch(select("Let me move to the next zone.:I want to stay here.")) {
-			case 1:
-				mes "[Camp Guard]";
-				mes "Please be careful out there.";
-				mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-				close2;
-				warp "man_fild01",36,235;
-				end;
-			case 2:
-				mes "[Camp Guard]";
-				mes "No, you can't. Please return to the expedition camp.";
-				close;
-			}
-		}
-	}
-OnHalt:
-	if (ep13_newbs == 6) set .@n$,"Diego.";
-	else if (ep13_newbs == 19) set .@n$,"Lugen.";
-	mes "[Camp Guard]";
-	mes "Stop!";
-	mes "You're about to enter an area that has not been fully explored.";
-	mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-	next;
-	mes "[Camp Guard]";
-	mes "Your cooperation is appreciated.";
-	next;
-	mes "[Camp Guard]";
-	mes "Oh, I was informed of your arrival by Mr. "+.@n$;
-	mes "You may pass.";
-	next;
-	mes "[Camp Guard]";
-	mes "Please be careful out there.";
-	mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-	close2;
-	warp "man_fild01",36,235;
-	end;
-}
-
-mid_camp,13,143,5	script	Camp Guard#man2	852,{
-	if (ep13_animal == 0) {
-		if (ep13_newbs == 6 || ep13_newbs == 19  || ep13_start == 100) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			mes "[Camp Guard]";
-			mes "Your cooperation is appreciated.";
-			close;
-		}
-	}
-	else if (ep13_animal == 5) goto OnHalt;
-	else {
-		if (ep13_newbs == 6 || ep13_newbs == 19) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			switch(select("Let me move to the next zone.:I want to stay here.")) {
-			case 1:
-				mes "[Camp Guard]";
-				mes "Please be careful out there.";
-				mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-				close2;
-				warp "spl_fild02",379,143;
-				end;
-			case 2:
-				mes "[Camp Guard]";
-				mes "No, you can't. Please return to the expedition camp.";
-				close;
-			}
-		}
-	}
-OnHalt:
-	if (ep13_newbs == 6) set .@n$,"Diego.";
-	else if (ep13_newbs == 19) set .@n$,"Lugen.";
-	else set .@n$,"Terris.";
 	mes "[Camp Guard]";
 	mes "Stop!";
 	mes "You're about to enter an area that has not been fully explored.";
 	mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
+	if (ep13_ryu < 100 && ep13_start < 100)
+		close;
 	next;
-	mes "[Camp Guard]";
-	mes "Your cooperation is appreciated.";
-	next;
-	mes "[Camp Guard]";
-	mes "Oh, I was informed of your arrival by Mr. "+.@n$;
-	mes "You may pass.";
-	next;
-	mes "[Camp Guard]";
-	mes "Please be careful out there.";
-	mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-	close2;
-	warp "spl_fild02",379,143;
-	end;
-}
-
-mid_camp,9,215,5	script	Camp Guard#man3	852,{
-	if (ep13_animal == 0) {
-		if (ep13_newbs == 6 || ep13_newbs == 19  || ep13_start == 100) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			mes "[Camp Guard]";
-			mes "Your cooperation is appreciated.";
-			close;
-		}
-	}
-	else if (ep13_animal == 5) goto OnHalt;
-	else {
-		if (ep13_newbs == 6 || ep13_newbs == 19) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			switch(select("Let me move to the next zone.:I want to stay here.")) {
-			case 1:
-				mes "[Camp Guard]";
-				mes "Please be careful out there.";
-				mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-				close2;
-				warp "spl_fild02",380,217;
-				end;
-			case 2:
-				mes "[Camp Guard]";
-				mes "No, you can't. Please return to the expedition camp.";
-				close;
-			}
+	switch(select("I want to enter the next area.:I want to stay.")) {
+	case 1:
+		mes "[Camp Guard]";
+		mes "Please be careful out there.";
+		mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
+		close2;
+		switch(atoi(charat(strnpcinfo(2),3))) {
+		case 1:
+			if (ep13_animal == 1)
+				set ep13_animal,2;
+			warp "man_fild01",36,235;
+			break;
+		case 2:
+			warp "spl_fild02",379,143;
+			break;
+		case 3:
+			warp "spl_fild02",380,217;
+			break;
 		}
+		end;
+	case 2:
+		mes "[Camp Guard]";
+		mes "No, you can't. Please return to the expedition camp.";
+		close;
 	}
-OnHalt:
-	if (ep13_newbs == 6) set .@n$,"Diego.";
-	else if (ep13_newbs == 19) set .@n$,"Lugen.";
-	else set .@n$,"Terris.";
-	mes "[Camp Guard]";
-	mes "Stop!";
-	mes "You're about to enter an area that has not been fully explored.";
-	mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-	next;
-	mes "[Camp Guard]";
-	mes "Your cooperation is appreciated.";
-	next;
-	mes "[Camp Guard]";
-	mes "Oh, I was informed of your arrival by Mr. "+.@n$;
-	mes "You may pass.";
-	next;
-	mes "[Camp Guard]";
-	mes "Please be careful out there.";
-	mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-	close2;
-	warp "spl_fild02",380,217;
-	end;
 }
+mid_camp,13,143,5	duplicate(Camp Guard#man1)	Camp Guard#man2	852
+mid_camp,9,215,5	duplicate(Camp Guard#man1)	Camp Guard#man3	852
 
 mid_camp,49,154,0	script	#env_clear	-1,3,3,{
-//OnTouch2:
 OnTouch:
 	if (ep13_animal == 7) {
 		enablenpc "Botanist#ep13_1";
@@ -5129,15 +4773,15 @@ man_fild01,92,230,3	script	Frozen Tree#evt_lumis	111,1,1,{
 		next;
 		mes "[Rumis Block]";
 		mes "Their horns might possess a special power. And I want to have them for further research.";
-		mes "...20 horns will be enough.";
+		mes "...5 horns will be enough.";
 		set ep13_animal,12;
 		changequest 2154,2155;
 		close;
 	}
 	else if (ep13_animal == 12) {
-		if (countitem(6032) < 20) {
+		if (countitem(6032) < 5) {
 			mes "[Rumis Block]";
-			mes "I'd like to study Hillsrion's Horns. Please bring 20 of them for me, okay.";
+			mes "I'd like to study Hillsrion's Horns. Please bring 5 of them for me, okay.";
 			close;
 		}
 		else {
@@ -5187,7 +4831,7 @@ man_fild01,92,230,3	script	Frozen Tree#evt_lumis	111,1,1,{
 			mes "[Rumis Block]";
 			mes "Let's go back to the camp. Shall we? I have something to discuss with you.";
 			set ep13_animal,13;
-			delitem 6032,20; //Horn_Of_Hilsrion
+			delitem 6032,5; //Horn_Of_Hilsrion
 			changequest 2155,2156;
 			close;
 		}
@@ -5196,7 +4840,7 @@ man_fild01,92,230,3	script	Frozen Tree#evt_lumis	111,1,1,{
 }
 
 // Finding a Fairy & Finding a Giant Tree
-//============================================================ 
+//============================================================
 spl_fild02,34,223,5	script	Small Fairy#spl	442,{
 	if (BaseLevel > 69) {
 		if (checkquest(2158) == -1) {
@@ -5204,7 +4848,7 @@ spl_fild02,34,223,5	script	Small Fairy#spl	442,{
 			mes "It has tiny wings on the back...";
 			mes "It's a fairy!";
 			next;
-			emotion 6;
+			emotion e_an;
 			mes "[Small Fairy]";
 			mes "RLGHLRXLA TKANTLFDMS";
 			mes "WJACK TNAHRDNJSDMFH";
@@ -5218,19 +4862,9 @@ spl_fild02,34,223,5	script	Small Fairy#spl	442,{
 			setquest 2158;
 			close;
 		}
-		else {
-			emotion 6;
-			mes "[Small Fairy]";
-			mes "RLGHLRXLA TKANTLFDMS";
-			mes "WJACK TNAHRDNJSDMFH";
-			mes "WLSGHKWND !!";
-			next;
-			mes "The surprised fairy is saying something to you, but you cannot understand fairy language.";
-			close;
-		}
 	}
-	else {
-		emotion 6;
+	emotion e_an;
+	if (!isequipped(2782) && ep13_2_rhea < 100) {
 		mes "[Small Fairy]";
 		mes "RLGHLRXLA TKANTLFDMS";
 		mes "WJACK TNAHRDNJSDMFH";
@@ -5238,6 +4872,10 @@ spl_fild02,34,223,5	script	Small Fairy#spl	442,{
 		next;
 		mes "The surprised fairy is saying something to you, but you cannot understand fairy language.";
 		close;
+	} else {
+		mes "[Small Fairy]";
+		mes "Who are you?! Are you looking for the Sapha!?";
+		close;
 	}
 }
 
@@ -5261,19 +4899,9 @@ man_fild03,236,105,3	script	Tree Giant#man	454,{
 			setquest 2159;
 			close;
 		}
-		else {
-			emotion e_dots;
-			mes "[Tree Giant]";
-			mes "TJDTMFJDNS CJFDI";
-			mes "TKADLFDMF QKATOS";
-			mes "EKDTLSDML DLFMADMS..";
-			next;
-			mes "The surprised giant is saying something to you, but you cannot understand.";
-			close;
-		}
 	}
-	else {
-		emotion e_dots;
+	emotion e_dots;
+	if (!isequipped(2782) && ep13_2_rhea < 100) {
 		mes "[Tree Giant]";
 		mes "TJDTMFJDNS CJFDI";
 		mes "TKADLFDMF QKATOS";
@@ -5281,6 +4909,10 @@ man_fild03,236,105,3	script	Tree Giant#man	454,{
 		next;
 		mes "The surprised giant is saying something to you, but you cannot understand.";
 		close;
+	} else {
+		mes "[Tree Giant]";
+		mes "Where are the Laphine reinforcements? I might have a problem.";
+		close;
 	}
 }
 
@@ -5309,10 +4941,7 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 			mes "I'll discuss this more with the expedition management.";
 			mes "Thank you for your valuable information.";
 			completequest 2158;
-			if(checkre(0))
-				getexp 90000,0;
-			else
-				getexp 900000,0;
+			getexp (checkre(3))?90000:900000,0;
 			close;
 		}
 		else if (checkquest(2158) == -1) {
@@ -5321,31 +4950,6 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 			mes "Sorry to bother you.";
 			close;
 		}
-		else if (checkquest(2158) == 2) {
-			if (checkquest(2159) == 1) {
-				mes "- You report your encounter with a tree giant in the Manuk area to the guard captain. -";
-				next;
-				mes "[Captain]";
-				mes "That sounds very important.";
-				mes "It's too early to say this, but we might have to dispatch an investigation group to the area.";
-				next;
-				mes "[Captain]";
-				mes "I'll discuss this more with the expedition management.";
-				mes "Thank you for your valuable information.";
-				completequest 2159;
-				if(checkre(0))
-					getexp 90000,0;
-				else
-					getexp 900000,0;
-				close;
-			}
-			else {
-				mes "["+strcharinfo(0)+"]";
-				mes "Oh, nothing.";
-				mes "Sorry to bother you.";
-				close;
-			}
-		}
 		else {
 			if (checkquest(2159) == 1) {
 				mes "- You report your encounter with a tree giant in the Manuk area to the guard captain. -";
@@ -5358,10 +4962,7 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 				mes "I'll discuss this more with the expedition management.";
 				mes "Thank you for your valuable information.";
 				completequest 2159;
-				if(checkre(0))
-					getexp 90000,0;
-				else
-					getexp 900000,0;
+				getexp (checkre(3))?90000:900000,0;
 				close;
 			}
 			else {
@@ -5374,18 +4975,17 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 	}
 }
 
-// The Tripartite Union's Feud
-//============================================================ 
+// The Tripartite Union's Feud :: ep13_1_rhea
+//============================================================
 mid_campin,376,120,0	script	Research Official#ep131	754,3,3,{
-
 OnTouch:
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
 		mes "[United Research Official]";
-		mes "Why are you carrying so much stuff?";
-		mes "Are you working out?";
+		mes "How come you've got so much to carry?";
+		mes "Are you perhaps on training or something?";
 		close;
 	}
-	if (ep13_ryu > 99) {
+	if (ep13_ryu > 99 || ep13_start > 99) {
 		if (ep13_1_rhea < 1) {
 			mes "[United Research Official]";
 			mes "Hmmmm...mmm...";
@@ -5529,7 +5129,7 @@ OnTouch:
 			mes "Finally, the meeting's starting.";
 			mes "You should come in.";
 			next;
-			donpcevent "Research Official#ep131::Onmeet";
+			donpcevent "Research Official#ep131::OnMeet";
 			mes "[United Research Official]";
 			mes "So, everyone's here.";
 			mes "Let us begin our meeting.";
@@ -5615,7 +5215,7 @@ OnTouch:
 			mes "scream as well, and rushed out of";
 			mes "the room. -";
 			set ep13_1_rhea,20;
-			donpcevent "Research Official#ep131::Oncall";
+			donpcevent "Research Official#ep131::OnCall";
 			close2;
 			warp "mid_camp",165,236;
 			end;
@@ -5630,7 +5230,7 @@ OnTouch:
 			mes "- Knock, knock-";
 			mes "- The researchers come back into the room. -";
 			next;
-			donpcevent "Research Official#ep131::Onmeet";
+			donpcevent "Research Official#ep131::OnMeet";
 			mes "[Ryosen]";
 			mes "Uh-hmm! Sorry about the mess.";
 			mes "I... Something urgent came up...";
@@ -5787,7 +5387,7 @@ OnTouch:
 			mes "- You feel so refreshed and light, as you drink the tea that the Official offered. -";
 			specialeffect2 EF_ABSORBSPIRITS;
 			set ep13_1_rhea,100;
-			if(checkre(0))
+			if (checkre(3))
 				getexp 80000,3000;
 			else
 				getexp 300000,10000;
@@ -5843,13 +5443,13 @@ OnDisable:
 	hideonnpc "Research Official#ep131";
 	end;
 
-Onmeet:
+OnMeet:
 	donpcevent "Ryosen#ep131_rhea05::OnEnable";
 	donpcevent "Hue#ep131_rhea06::OnEnable";
 	donpcevent "Hansenne#ep131_rhea07::OnEnable";
 	end;
 
-Oncall:
+OnCall:
 	initnpctimer;
 	monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
 	monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
@@ -5882,13 +5482,13 @@ OnTimer300000:
 }
 
 mid_camp,165,245,0	script	Ryosen#ep131_rhea01	748,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
 		mes "[Ryosen]";
-		mes "Why are you carrying so much stuff?";
-		mes "Are you working out?";
+		mes "How come you've got so much to carry?";
+		mes "Are you perhaps on training or something?";
 		close;
 	}
-	if (ep13_ryu > 99) {
+	if (ep13_ryu > 99 || ep13_start > 99) {
 		if (ep13_1_rhea < 1) {
 			mes "[Ryosen]";
 			mes "Please, keep your hands off my stuff!";
@@ -6428,13 +6028,13 @@ mid_camp,165,245,0	script	Ryosen#ep131_rhea01	748,{
 }
 
 mid_camp,247,255,1	script	Hue#ep131_rhea02	868,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
 		mes "[Hue]";
-		mes "Why are you carrying so much stuff?";
-		mes "Are you working out?";
+		mes "How come you've got so much to carry?";
+		mes "Are you perhaps on training or something?";
 		close;
 	}
-	if (ep13_ryu > 99) {
+	if (ep13_ryu > 99 || ep13_start > 99) {
 		if (ep13_1_rhea < 4) {
 			mes "[Hue]";
 			mes "What is it you want?";
@@ -6821,13 +6421,13 @@ mid_camp,247,255,1	script	Hue#ep131_rhea02	868,{
 }
 
 mid_camp,222,218,3	script	Hansenne#ep131_rhea03	931,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
 		mes "[Hansenne]";
-		mes "Why are you carrying so much stuff?";
-		mes "Are you working out?";
+		mes "How come you've got so much to carry?";
+		mes "Are you perhaps on training or something?";
 		close;
 	}
-	if (ep13_ryu > 99) {
+	if (ep13_ryu > 99 || ep13_start > 99) {
 		if (ep13_1_rhea < 6) {
 			mes "[Hansenne]";
 			mes "Who's there?";
@@ -7343,14 +6943,16 @@ OnTimer300000:
 	end;
 }
 
-// Part Time Work
-//============================================================ 
+// Part Time Work :: ep13_alba
+//============================================================
 mid_camp,1,1,0	script	#timer_alba01	844,{
-	/*
+	callfunc "F_GM_NPC";
 	mes "Please enter the password";
 	next;
-	input .@input;
-	if (.@input == "1854") {
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "Wrong password.";
+		close;
+	} else {
 		mes "Current Status:";
 		if ($@PartTimeOn == 1) {
 			mes "Recruiting.";
@@ -7358,7 +6960,7 @@ mid_camp,1,1,0	script	#timer_alba01	844,{
 		else {
 			mes "Not Recruiting.";
 		}
-		mes "Recruited part-timers" + $@PartTimeSlots + "part-timers.";
+		mes "Recruited " + $@PartTimeSlots + " part-timers.";
 		mes "What do you want to do?";
 		next;
 		switch(select("Reset the recruiting.:Cancel.")) {
@@ -7380,12 +6982,6 @@ mid_camp,1,1,0	script	#timer_alba01	844,{
 			close;
 		}
 	}
-	else {
-		mes "Wrong password.";
-		close;
-	}
-	end;
-	*/
 
 OnInit:
 	set $@PartTimeOn,0;
@@ -7394,7 +6990,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -7422,7 +7018,7 @@ OnTimer7800000:
 }
 
 mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
-	if (ep13_ryu > 99) {
+	if (ep13_ryu > 99 || ep13_start > 99) {
 		if (ep13_alba < 1) {
 			mes "[Taab]";
 			mes "How may I help you?";
@@ -7552,33 +7148,40 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 							close;
 						}
 						else {
-							// Custom Translation
 							set ep13_alba,5;
 							setquest 7046;
 							mes "[Taab]";
-							mes "I would like to place something on the floor of the cage. Something soft, and fur-like should be good. Something to keep the ground dry.";
+							mes "Oh, I always wanted to put something warm on the floor for my creatures.";
+							mes "I was thinking of using fur.";
+							mes "I can also use fur to cover the cage during rainy days, you know?";
 							next;
 							mes "[Taab]";
-							mes "Would you collect ^4d4dff30 Fur^000000. This should be very simple, right? I've heard Tatacho and Hillsrion fur is quite durable.";
+							mes "Can you please bring me ^4d4dff30 scraps of fur^000000?";
+							mes "It sounds easy, doesn't it?";
+							mes "I think the fur of Tatachoes and Hillsrions will be perfect.";
 							next;
 							mes "[Taab]";
-							mes "Of course, I do not intend to put them into the Hillsrion and Tatacho cage on the ground. I would put them on the ground of the Cornus cage.";
+							mes "Of course, I'm not going to use them for the cages with the Tatachoes and Hillsrions.";
+							mes "Those furs will be for the Cornuses.";
 							next;
 							mes "[Taab]";
-							mes "The Cornus seem to like a warmer climate, and the climate is very unusual here... so it hasn't been very easy for them here.";
+							mes "It seems Cornuses love being warm.";
+							mes "The weather in this area is so strange that I'm having a hard time optimizing the temperature for each kind of creature.";
 							next;
 							mes "[Taab]";
 							mes "Thank you in advance.";
-							mes "Don't forget the";
-							mes "^4d4dff30 Fur^000000.";
+							mes "Don't forget the 30 scraps of fur.";
 							close;
 						}
 					}
 					else {
 						mes "[Taab]";
-						mes "I'm sorry, but I don't need any assistance right now.";
-						mes "I'll make an official anouncement if I need help.";
-						mes "Please come back then.";
+						mes "Oh, I'm sorry, but no jobs are available right now.";
+						mes "Some other part-timers finished all the work.";
+						next;
+						mes "[Taab]";
+						mes "I'm sorry for the trouble I must have caused you to come here. Haha...";
+						mes "I'll see you next time.";
 						close;
 					}
 				}
@@ -7607,14 +7210,17 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				next;
 				delitem 579,50; //Delicious_Fish
 				set ep13_alba,6;
-				if(checkre(0))
+				if (checkre(3)) {
 					getexp 8000,3000;
-				else
+					mes "^4d4dff You have received 8,000 EXP";
+					mes "and 3,000 JEXP.^000000.";
+				} else {
 					getexp 80000,30000;
+					mes "^4d4dff You have received 80,000 EXP";
+					mes "and 30,000 JEXP.^000000.";
+				}
 				erasequest 7042;
 				setquest 7047;
-				mes "^4d4dff You have received 8,000 EXP";
-				mes "and 3,000 JEXP.^000000.";
 				close;
 			}
 			else {
@@ -7643,14 +7249,17 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				delitem 7198,30; //Great_Leaf
 				delitem 7188,30; //Browny_Root
 				set ep13_alba,6;
-				if(checkre(0))
+				if (checkre(3)) {
 					getexp 9000,4000;
-				else
+					mes "^4d4dff You have received 9,000 EXP";
+					mes "and 4,000 JEXP.^000000.";
+				} else {
 					getexp 90000,40000;
+					mes "^4d4dff You have received 90,000 EXP";
+					mes "and 40,000 JEXP.^000000.";
+				}
 				erasequest 7043;
 				setquest 7047;
-				mes "^4d4dff You have received 9,000 EXP";
-				mes "and 4,000 JEXP.^000000.";
 				close;
 			}
 			else {
@@ -7684,14 +7293,17 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				delitem 528,20; //Monster's_Feed
 				delitem 537,30; //Pet_Food
 				set ep13_alba,6;
-				if(checkre(0))
+				if (checkre(3)) {
 					getexp 8000,3000;
-				else
+					mes "^4d4dff You have received 8,000 EXP";
+					mes "and 3,000 JEXP.^000000.";
+				} else {
 					getexp 80000,30000;
+					mes "^4d4dff You have received 80,000 EXP";
+					mes "and 30,000 JEXP.^000000.";
+				}
 				erasequest 7044;
 				setquest 7047;
-				mes "^4d4dff You have received 8,000 EXP";
-				mes "and 3,000 JEXP.^000000.";
 				close;
 			}
 			else {
@@ -7722,14 +7334,17 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				delitem 517,50; //Meat
 				delitem 537,30; //Pet_Food
 				set ep13_alba,6;
-				if(checkre(0))
+				if (checkre(3)) {
 					getexp 8000,3000;
-				else
+					mes "^4d4dff You have received 8,000 EXP";
+					mes "and 3,000 JEXP.^000000.";
+				} else {
 					getexp 80000,30000;
+					mes "^4d4dff You have received 80,000 EXP";
+					mes "and 30,000 JEXP.^000000.";
+				}
 				erasequest 7045;
 				setquest 7047;
-				mes "^4d4dff You have received 8,000 EXP";
-				mes "and 3,000 JEXP.^000000.";
 				close;
 			}
 			else {
@@ -7757,14 +7372,17 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				next;
 				delitem 6020,30; //Fur
 				set ep13_alba,6;
-				if(checkre(0))
+				if (checkre(3)) {
 					getexp 8000,3000;
-				else
+					mes "^4d4dff You have received 8,000 EXP";
+					mes "and 3,000 JEXP.^000000.";
+				} else {
 					getexp 80000,30000;
+					mes "^4d4dff You have received 80,000 EXP";
+					mes "and 30,000 JEXP.^000000.";
+				}
 				erasequest 7046;
 				setquest 7047;
-				mes "^4d4dff You have received 8,000 EXP";
-				mes "and 3,000 JEXP.^000000.";
 				close;
 			}
 			else {
@@ -7890,7 +7508,7 @@ OnEnable:
 	if (rand(1,3) > 1) initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	killmonster "mid_camp","#monster_master::OnMyMobDead";
 	stopnpctimer;
 	end;
@@ -7933,8 +7551,8 @@ OnMyMobDead:
 	end;
 }
 
-// Cat Hand Trading Post
-//============================================================ 
+// Cat Hand Trading Post :: cat_yong
+//============================================================
 mid_camp,62,125,4	script	Cat Hand Agent	421,{
 function Catwarp;
 	if (ep13_yong1 < 1) {
@@ -8043,7 +7661,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				set Zeny, Zeny-60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will";
@@ -8090,7 +7708,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				set Zeny, Zeny-60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will";
@@ -8179,9 +7797,8 @@ function Catwarp;
 				}
 			}
 			else {
-				// Custom Translation.
 				mes "[Cat Hand Agent]";
-				mes "I am sorry, but you don't have enough credit points to use the warp service. Please come back when you have more points.";
+				mes "I'm sorry, but you're not eligible to use the warp service. Please check your points, and then come back.";
 			}
 			close;
 		case 4:
@@ -8213,7 +7830,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				set Zeny, Zeny-60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will";
@@ -8293,9 +7910,8 @@ function Catwarp;
 				}
 			}
 			else {
-				// Custom Translation
 				mes "[Cat Hand Agent]";
-				mes "I am sorry, but you don't have enough credit points to use the warp service. Please come back when you have more points.";
+				mes "I'm sorry, but you're not eligible to use the warp service. Please check your points, and then come back.";
 			}
 			close;
 		case 4:
@@ -8324,13 +7940,14 @@ function Catwarp {
 	if (Zeny < getarg(0)) {
 		mes "[Cat Hand Agent]";
 		mes "Don't play with money.";
-		close; }
+		close;
+	}
 	close2;
 	set Zeny, Zeny-getarg(0);
 	switch(getarg(1)) {
 		case 1: warp "alberta",117,56; end;
 		case 2: warp "prontera",116,72; end;
-		case 3: warp "izlude",91,105; end;
+		case 3: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; end;
 		case 4: warp "geffen",120,39; end;
 		case 5: warp "payon",161,58; end;
 		case 6: warp "morocc",156,46; end;
@@ -8512,11 +8129,11 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				mes "You've brough Pieces of Fish!";
 				mes "GOOD JOB!";
 				delitem 6039,10; //Piece_Of_Fish
-				getexp 20000,0;
+				getexp (checkre(3))?20000:30000,0;
 				set ep13_yong1,10;
 				setquest 12060;
 				next;
-				mes "^0000ffYou gain EXP 3,000^000000";
+				mes "^0000ffYou gain EXP "+(checkre(3)?"20,000":"30,000")+"^000000";
 				close;
 			}
 			else {
@@ -8536,7 +8153,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				setquest 12060;
 				set ep13_yong1,ep13_yong1+1;
 				next;
-				mes "^0000ffYou gain EXP 1,500^000000";
+				mes "^0000ffYou gain EXP 15,000^000000";
 				close;
 			}
 			else {
@@ -8557,7 +8174,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				setquest 12060;
 				set ep13_yong1,ep13_yong1+1;
 				next;
-				mes "^0000ffYou gain EXP 1,500^000000";
+				mes "^0000ffYou gain EXP 15,000^000000";
 				close;
 			}
 			else {
@@ -8577,7 +8194,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				setquest 12060;
 				set ep13_yong1,ep13_yong1+1;
 				next;
-				mes "^0000ffYou gain EXP 1,500^000000";
+				mes "^0000ffYou gain EXP 15,000^000000";
 				close;
 			}
 			else {
@@ -8588,14 +8205,14 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				close;
 			}
 		}
-		else if ((ep13_yong1 > 59) && (ep13_yong1 < 80)) {
+		else if (ep13_yong1 > 59) {
 			npcskill "AL_HEAL",8,50,50;
 			if (countitem(6039) > 9) {
 				mes "[Ferocious Gorurug]";
 				mes "You've brough Pieces of Fish!";
 				mes "GOOD JOB!";
 				delitem 6039,10; //Piece_Of_Fish
-				getexp 1500,0;
+				getexp 15000,0;
 				setquest 12060;
 				set ep13_yong1,ep13_yong1+1;
 				next;
@@ -8603,12 +8220,11 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				close;
 			}
 			else {
-				// custom translation
-				mes "Ferocious Gorurug welcomes you gracefully.";
+				mes "Gorurung welcomes you with a happy purr.";
 				next;
 				mes "[Ferocious Gorurug]";
-				mes "There you are!";
-				mes "What did you catch today?";
+				mes "Welcome!";
+				mes "You're here to give me fishes, aren't you?";
 				close;
 			}
 		}
@@ -8759,7 +8375,7 @@ mid_camp,88,100,55	script	Cat Hand Mining Agent	876,{
 			mes "Thank you for collecting minerals for me.";
 			next;
 			delitem 6048,3; //Unidentified_Mineral
-			getexp 20000,0;
+			getexp (checkre(3))?20000:30000,0;
 			setquest 12062;
 			set ep13_yong1,ep13_yong1+1;
 			select("I'm freezing! Take them quickly.");
@@ -8815,11 +8431,13 @@ mid_camp,88,100,55	script	Cat Hand Mining Agent	876,{
 		else getitem 6048,1; //Unidentified_Mineral
 		initnpctimer;
 		disablenpc strnpcinfo(0);
-		end; }
+		end;
+	}
 	else {
 		mes "This rock contains unidentified minerals.";
 		mes "It's not possible to mine more than the limit.";
-		close; }
+		close;
+	}
 	end;
 
 OnTimer120000:
@@ -8827,7 +8445,6 @@ OnTimer120000:
 	stopnpctimer;
 	end;
 }
-
 man_fild01,180,170,0	duplicate(manukrock)	Mysterious Rock#1	844
 man_fild01,147,157,0	duplicate(manukrock)	Mysterious Rock#2	844
 man_fild01,114,174,0	duplicate(manukrock)	Mysterious Rock#3	844
@@ -8847,12 +8464,27 @@ man_fild03,104,248,0	duplicate(manukrock)	Mysterious Rock#16	844
 man_fild03,91,272,0	duplicate(manukrock)	Mysterious Rock#17	844
 man_fild03,95,301,0	duplicate(manukrock)	Mysterious Rock#18	844
 
-// Report from the New World
-//============================================================ 
+sec_in02,80,171,0	script	Piece of crack#sec	406,{
+	callfunc "F_GM_NPC";
+	mes "1~3000";
+	input .@input;
+	next;
+	if (.@input < 1 || .@input > 3000) {
+		mes "Cat trading Point adjust";
+		mes "You can enter the number between 1~3000.";
+		close;
+	} else {
+		set ep13_yong1,.@input;
+		close;
+	}
+}
+
+// Report from the New World :: ep13_1_edq
+//============================================================
 mid_campin,90,121,5	script	Hibba Agip	459,{
 	cutin "ep13_captin_edq",2;
-	set .@start,(ep13_newbs + ep13_ryu + mao_morocc2 + ep13_1_rhea + ep13_animal);
-	if ((ep13_1_edq == 0) && (.@start > 298)) {
+	set .@start,(ep13_newbs + ep13_ryu + mao_morocc2 + ep13_1_rhea + ep13_animal + ep13_start);
+	if ((ep13_1_edq == 0) && (.@start > 115)) {
 		mes "[Hibba Agip]";
 		mes "*Sigh* Look at me, I used to command the desert of Morroc, but I've been deployed to a world that only God knows where...";
 		next;
@@ -8878,7 +8510,7 @@ mid_campin,90,121,5	script	Hibba Agip	459,{
 		mes "What is it?";
 		next;
 		mes "[Staff Officer Abidal]";
-		mes "Err? Hey, aren't you that famous adventurer, " + strcharinfo(0) + "? I've heard many good things about you.";
+		mes "Err? Hey, aren't you that famous adventurer," + strcharinfo(0) + "? I've heard many good things about you.";
 		next;
 		mes "[Instructor Igrid]";
 		mes "I don't know what you're talking about. Boss, do you know this adventurer?";
@@ -8920,7 +8552,7 @@ mid_campin,90,121,5	script	Hibba Agip	459,{
 	}
 	else if (ep13_1_edq == 2) {
 		mes "[Hibba Agip]";
-		mes "Oh yes, right... You're " + strcharinfo(0) + ", right? Abidal has told me good things about you.";
+		mes "Oh yes, right... You're" + strcharinfo(0) + ", right? Abidal has told me good things about you.";
 		next;
 		mes "[Hibba Agip]";
 		mes "We're lucky to have you, my friend... I hope you're as good as the stories play you up to be.";
@@ -9039,21 +8671,17 @@ mid_campin,90,121,5	script	Hibba Agip	459,{
 		mes "[Hibba Agip]";
 		mes "Now, search everywhere for the pages of that report. Staff Officer Abidal will bind them into the full report for you.";
 		next;
-		// custom translation
 		mes "[Hibba Agip]";
-		mes "Hmm... and... I received a report, that you surrendered the report to the enemy, right?";
+		mes "Ah, and... I've received a report that you tried to hand out the report to our enemy when the situation happened.";
 		next;
-		// custom translation
 		mes "[Instructor Igrid]";
-		mes "Hmm...";
+		mes "Argh...";
 		next;
-		// custom translation
 		mes "[Hibba Agip]";
-		mes "Hehehehe. How smart of you... Thou feel not safe for you to be my subordinate...";
+		mes "Hahaha! You're smart, my friend. Of course, I don't like smart soldiers.";
 		next;
-		// custom translation
 		mes "[Hibba Agip]";
-		mes "Hey, I said. It is justice as well, injustice as well. But, trust and deal... is very important. Understand? You must remember this.";
+		mes "Let me tell you this: I can care less about justice or righteousness, but loyalty and faithfulness are very important. Keep that in mind for your own good, alright?";
 		set ep13_1_edq,61;
 		changequest 3088,3089;
 		next;
@@ -9274,9 +8902,8 @@ mid_campin,90,121,5	script	Hibba Agip	459,{
 		mes "And please take this small reward.";
 		mes "Thank you for your help so far.";
 		next;
-		if(checkre(0))
-			getexp 30000,0; //kRO
-			//getexp 3750000,0; //iRO?
+		if (checkre(3))
+			getexp 300000,0;
 		else
 			getexp 2500000,0;
 		getitem 12110,3; //First_Aid_Kit
@@ -10329,7 +9956,7 @@ mid_camp,206,286,3	script	Expedition Messenger	997,{
 			mes "Haha, I may have failed to take the report, but it's better destroyed than in your hands!";
 			cutin "ep13_shadow_edq",255;
 			next;
-			donpcevent "Expedition Messenger#3::OnMessenger#edq3";
+			donpcevent "Expedition Messenger#3::OnDisable";
 			mes "[Expedition Agent]";
 			mes "Are you alright? What about the report... ?";
 			next;
@@ -10451,689 +10078,75 @@ man_fild01,315,95,3	script	Expedition Scout#1	707,{
 	next;
 	mes "[Expedition Scout]";
 	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
-	next;
-	switch(select("Ask about search results.:Chitchat.:Quit.")) {
-	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
-			mes "[Expedition Scout]";
-			mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		close;
-	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-	case 3:
-		close;
-	}
-}
-
-man_fild03,202,251,3	script	Expedition Scout#2	707,{
-	mes "[Expedition Scout]";
-	mes "Good day. I'm from the Third Scout Party under direct command of the commander of the Midgard Expedition.";
-	next;
-	mes "[Expedition Scout]";
-	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
-	next;
-	switch(select("Ask about search results.:Chitchat.:Quit.")) {
-	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 piece of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
-			mes "[Expedition Scout]";
-			mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		close;
-	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-	case 3:
-		close;
-	}
-}
-
-spl_fild02,295,368,3	script	Expedition Scout#3	707,{
-	mes "[Expedition Scout]";
-	mes "Good day. I'm from the Third Scout Party under direct command of the commander of the Midgard Expedition.";
-	next;
-	mes "[Expedition Scout]";
-	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
-	next;
-	switch(select("Ask about search results.:Chitchat.:Quit.")) {
-	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
-			mes "[Expedition Scout]";
-			mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 piece of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		close;
-	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-		}
-		close;
-	case 3:
-		close;
-	}
-}
-
-spl_fild03,172,71,3	script	Expedition Scout#4	707,{
-	mes "[Expedition Scout]";
-	mes "Good day. I'm from the Third Scout Party under direct command of the commander of the Midgard Expedition.";
-	next;
-	mes "[Expedition Scout]";
-	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
+	set .@playtime,checkquest(3091,PLAYTIME);
 	next;
 	switch(select("Ask about search results.:Chitchat.:Quit.")) {
 	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
+		if (ep13_1_edq == 71 || ep13_1_edq == 72) {
 			mes "[Expedition Scout]";
-			mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
+			mes "Oh, you must be"+strcharinfo(0)+". I heard that you'll be delivering the report.";
 			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
+			if (.@playtime == 0 || .@playtime == 1) {
 				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
+				mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
 				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
+			} else {
+				switch(rand(1,6)) {
+				case 1:
+				case 6:
+					set .@i,2;
+					break;
+				case 3:
+					set .@i,3;
+					break;
+				case 4:
+					set .@i,5;
+					break;
+				case 2:
+				case 5:
+					set .@i,0;
+					break;
+				}
 				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
+				if (.@i) {
+					mes "Good news! I've found "+.@i+" pieces of paper that appear to be part of the report.";
+					next;
+					getitem 6040,.@i; //Some_Of_Report
+				} else {
+					mes "I'm doing my best, but I haven't found any pages yet.";
+					next;
+				}
+				if (.@playtime == -1) {
+					changequest 3090,3091;
+					erasequest 3090;
+				} else
+					erasequest 3091;
 				setquest 3091;
 				mes "[Expedition Scout]";
 				mes "Well then, keep up the good work!";
 				close;
 			}
 		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
+		mes "[Expedition Scout]";
+		mes "Who are you? Why do you want to know about our search results? Are you from the army?";
+		next;
+		mes "[Expedition Scout]";
+		mes "Man, don't you know that you can be arrested for interrupting a military operation?";
+		next;
+		mes "[Expedition Scout]";
+		mes "Please leave immediately.";
 		close;
 	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-		}
+		mes "[Expedition Scout]";
+		mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
 		close;
 	case 3:
 		close;
 	}
 }
+man_fild03,202,251,3	duplicate(Expedition Scout#1)	Expedition Scout#2	707
+spl_fild02,295,368,3	duplicate(Expedition Scout#1)	Expedition Scout#3	707
+spl_fild03,172,71,3	duplicate(Expedition Scout#1)	Expedition Scout#4	707
 
 prt_castle,88,165,3	script	Laur	57,{
 	mes "[Laur]";
@@ -11153,7 +10166,7 @@ prt_castle,88,165,3	script	Laur	57,{
 		if (ep13_1_edq == 9) set ep13_1_edq,101;
 		else if (ep13_1_edq == 111) set ep13_1_edq,112;
 		else if (ep13_1_edq == 121) set ep13_1_edq,122;
-		else if (ep13_1_edq == 113 || ep13_1_edq == 123) { 
+		else if (ep13_1_edq == 113 || ep13_1_edq == 123) {
 			set ep13_1_edq,13;
 			changequest 3093,3094;
 		}
@@ -11413,66 +10426,66 @@ OnMyMobDead:
 	end;
 }
 
-// Persuing Rayan Moore
-//============================================================ 
+// Persuing Rayan Moore :: ep13_moc2
+//============================================================
 mid_campin,68,185,3	script	Pursuit Party Leader#1	803,{
-	if (checkweight(714,1) == 0) {
+	if (checkweight(714,3) == 0) {
 		mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
 		close;
 	}
 	if (mao_morocc2 == 0) {
-		if (ep13_ryu == 100) {
-			mes "[Echinacea]";
-			mes "Oh adventurer, you've come at the perfect time.";
-			mes "Since you and I both know that we can't waste time on idle chitchat,";
-			mes "I'll cut to the chase.";
-			next;
-			mes "[Echinacea]";
-			mes "Most expeditions come to this area to explore the Ash Vacuum,";
-			mes "but we've come here for a different reason.";
-			next;
-			mes "[Echinacea]";
-			mes "You know about this space gap that was caused by Satan Morocc, don't you?";
-			next;
-			mes "[Echinacea]";
-			mes "Our job is to pursue Satan Morocc and figure out how this all happened.";
-			mes "Your job is to assist us, and prove that you can be a good member of our expedition.";
-			next;
-			mes "[Echinacea]";
-			mes "... Umm... So, you'll have to.. Let me think which job would be perfect for you.";
-			mes "Umm.. I remember someone said that he needed assistance...";
-			next;
-			select("Hey, excuse me.");
-			mes "[Echinacea]";
-			mes "Ah, I know what you can do!";
-			mes "There's a guy conducting an investigation near the space gap. You can go help him.";
-			mes "Just do what he asks you to do, alright?";
-			mes "Now go!";
-			next;
-			mes "[Echinacea]";
-			mes "......";
-			mes "By the way, adventurer,";
-			mes "What's your name?";
-			next;
-			mes "[" + strcharinfo(0) + "]";
-			mes "......";
-			mes "......";
-			mes "" + strcharinfo(0) + "...";
-			mes "......";
-			next;
-			mes "[Echinacea]";
-			mes "Ah, you are";
-			mes "" + strcharinfo(0) + ".";
-			mes "Well, " + strcharinfo(0) + ", I've just assigned you as Mr. Kidd's assistant.";
-			mes "Good, everything's done on this end. I just needed to get your name on record.";
-			next;
-			mes "[Echinacea]";
-			mes "What are you still doing here?";
-			mes "" + strcharinfo(0) + ", your job is to assist Mr. Kidd.";
-			mes "Please go help him, will you?";
-			set mao_morocc2,1;
-			setquest 7012;
-			close;
+		if (ep13_ryu == 100 || ep13_start == 100) {
+				mes "[Echinacea]";
+				mes "Oh adventurer, you've come at the perfect time.";
+				mes "Since you and I both know that we can't waste time on idle chitchat,";
+				mes "I'll cut to the chase.";
+				next;
+				mes "[Echinacea]";
+				mes "Most expeditions come to this area to explore the Ash Vacuum,";
+				mes "but we've come here for a different reason.";
+				next;
+				mes "[Echinacea]";
+				mes "You know about this space gap that was caused by Satan Morocc, don't you?";
+				next;
+				mes "[Echinacea]";
+				mes "Our job is to pursue Satan Morocc and figure out how this all happened.";
+				mes "Your job is to assist us, and prove that you can be a good member of our expedition.";
+				next;
+				mes "[Echinacea]";
+				mes "... Umm... So, you'll have to.. Let me think which job would be perfect for you.";
+				mes "Umm.. I remember someone said that he needed assistance...";
+				next;
+				select("Hey, excuse me.");
+				mes "[Echinacea]";
+				mes "Ah, I know what you can do!";
+				mes "There's a guy conducting an investigation near the space gap. You can go help him.";
+				mes "Just do what he asks you to do, alright?";
+				mes "Now go!";
+				next;
+				mes "[Echinacea]";
+				mes "......";
+				mes "By the way, adventurer,";
+				mes "What's your name?";
+				next;
+				mes "[" + strcharinfo(0) + "]";
+				mes "......";
+				mes "......";
+				mes "" + strcharinfo(0) + "...";
+				mes "......";
+				next;
+				mes "[Echinacea]";
+				mes "Ah, you are";
+				mes "" + strcharinfo(0) + ".";
+				mes "Well, " + strcharinfo(0) + ", I've just assigned you as Mr. Kidd's assistant.";
+				mes "Good, everything's done on this end. I just needed to get your name on record.";
+				next;
+				mes "[Echinacea]";
+				mes "What are you still doing here?";
+				mes "" + strcharinfo(0) + ", your job is to assist Mr. Kidd.";
+				mes "Please go help him, will you?";
+				set mao_morocc2,1;
+				setquest 7012;
+				close;
 		}
 		else {
 			mes "[Echinacea]";
@@ -11610,7 +10623,7 @@ mid_campin,68,185,3	script	Pursuit Party Leader#1	803,{
 			next;
 			mes "[Echinacea]";
 			mes "Go check the number again.";
-			set mao_morocc2,.@quest+3;
+			if (mao_morocc2 < 26) set mao_morocc2,.@quest+3;
 			close;
 		}
 	}
@@ -11674,7 +10687,7 @@ mid_campin,68,185,3	script	Pursuit Party Leader#1	803,{
 		mes "[Echinacea]";
 		mes "Keep up the good work assisting the explorers in this camp.";
 		set mao_morocc2,100;
-		if(checkre(0))
+		if (checkre(3))
 			getexp 120000,20000;
 		else
 			getexp 1200000,200000;
@@ -12054,7 +11067,7 @@ mid_camp,199,311,7	script	Mr. Kidd#ep13_dan01	884,{
 			delitem 6029,1; //Morocc_Tracing_Log
 			delitem 6027,1; //Crystal_Of_Feardoom
 			set mao_morocc2,10;
-			if(checkre(0))
+			if (checkre(3))
 				getexp 20000,1000;
 			else
 				getexp 200000,10000;
@@ -12062,9 +11075,9 @@ mid_camp,199,311,7	script	Mr. Kidd#ep13_dan01	884,{
 			close2;
 		}
 		else {
-			//custom translation
 			mes "[" + strcharinfo(0) + "]";
-			mes "Now where did I put Rin's journal and the bloody crystal...";
+			mes "(I was supposed to give him the 'Morroc Pursuit Journal' and a 'Bloody Crystal of the Darkness'...";
+			mes "Err? Where have they gone? I need to find them.)";
 			close2;
 		}
 	}
@@ -13051,7 +12064,7 @@ que_job01,82,95,3	script	Bar Master#moc2_01	46,{
 						mes "Here, drink up.";
 						mes "This drink is mainly made of fruit juice,";
 						mes "but you still shouldn't drink too much.";
-						set zeny,zeny-800;
+						set Zeny, Zeny-800;
 						getitem 12112,1; //Tropical_Sograt
 					}
 					close;
@@ -13069,15 +12082,14 @@ que_job01,82,95,3	script	Bar Master#moc2_01	46,{
 						mes "There you go.";
 						mes "This drink is mainly made of fruit juice,";
 						mes "but you still shouldn't drink too much.";
-						set zeny,zeny-1000;
+						set Zeny, Zeny-1000;
 						getitem 12112,1; //Tropical_Sograt
 						close;
 					}
 				}
 			}
 		case 2:
-			set .@now_weight,MaxWeight-Weight;
-			if (.@now_weight < 2000) {
+			if (MaxWeight - Weight < 2000) {
 				mes "[Karred]";
 				mes "Are you sure you can even hold a glass of alcohol?";
 				mes "You're carrying too many things on you already.";
@@ -13096,7 +12108,7 @@ que_job01,82,95,3	script	Bar Master#moc2_01	46,{
 						mes "[Karred]";
 						mes "I'll give you a special discount.";
 						mes "Here, enjoy.";
-						set zeny,zeny-800;
+						set Zeny, Zeny-800;
 						getitem 12113,1; //Vermilion_The_Beach
 					}
 					close;
@@ -13113,7 +12125,7 @@ que_job01,82,95,3	script	Bar Master#moc2_01	46,{
 						mes "[Karred]";
 						mes "There you go.";
 						mes "Don't drink too much, alright?";
-						set zeny,zeny-1000;
+						set Zeny, Zeny-1000;
 						getitem 12113,1; //Vermilion_The_Beach
 						close;
 					}
@@ -13261,7 +12273,7 @@ OnTouch:
 					mes "Hey, bartender! Gimme";
 					mes "the usual! I like your";
 					mes "style, adventurer...";
-					set zeny,zeny-1000;
+					set Zeny, Zeny-1000;
 					next;
 					mes "[Litheron]";
 					mes "Alright, you can come";
@@ -13409,8 +12421,7 @@ que_job01,49,49,5	script	Tao#dan_09	877,{
 
 que_job01,51,55,0	script	que_job01#room_1	45,1,1,{
 OnInit:
-	if ($maobar_room) set $maobar_room,0;
-Onreset:
+OnReset:
 	set $@moc_mao_room1,0; //Global Variable
 	end;
 
@@ -13479,12 +12490,12 @@ OnEnable:
 	mapannounce "que_job01", "You will now enter the Master Zone, Area 1.",bc_map,"0x70DBDB";
 	end;
 
-Onstop:
+OnStop:
 	mapannounce "que_job01", "The security magic in the Master Zone, Area 1 is deactivated.",bc_map,"0x70DBDB";
 	donpcevent "#room1_warp13::OnDisable";
 	donpcevent "Valdes#moc_master_1::OnDisable";
 	donpcevent "Marjana#poison::OnDisable";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 	end;
 
@@ -13500,7 +12511,7 @@ OnTimer245000:
 
 OnTimer250000:
 	mapannounce "que_job01", "The security magic Master Zone, Area 1 is now activated.",bc_map,"0x70DBDB";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 }
 
@@ -13522,7 +12533,7 @@ OnTouch:
 que_job01,11,4,0	script	que_job01#room1_out	45,1,1,{
 OnTouch:
 	warp "que_job01",52,50;
-	donpcevent " #room1timer::Onstop";
+	donpcevent " #room1timer::OnStop";
 	end;
 }
 
@@ -13570,7 +12581,7 @@ que_job01,51,44,0	script	que_job01#room_2	45,1,1,{
 	end;
 
 OnInit:
-Onreset:
+OnReset:
 	set $@moc_mao_room2,0; //Global Variable
 	end;
 
@@ -13657,14 +12668,14 @@ OnEnable:
 	mapannounce "que_job01", "Master Zone 2 is now under surveillance.",bc_map,"0x70DBDB";
 	end;
 
-Onstop:
+OnStop:
 	mapannounce "que_job01", "The magic shield of Master Zone 2 has been reset.",bc_map,"0x70DBDB";
 	donpcevent "#room2_1_warp::OnDisable";
 	donpcevent "#room2_2_warp::OnDisable";
 	donpcevent "Rin#moc_room2_2::OnDisable";
 	donpcevent "Rin#moc_room2_1::OnDisable";
 	donpcevent "Rayan#moc_room2_2::OnDisable";
-	donpcevent "que_job01#room_2::Onreset";
+	donpcevent "que_job01#room_2::OnReset";
 	stopnpctimer;
 	end;
 
@@ -13683,7 +12694,7 @@ OnTimer245000:
 
 OnTimer250000:
 	mapannounce "que_job01", "Master Zone 2 has been released from surveillance.",bc_map,"0x70DBDB";
-	donpcevent "que_job01#room_2::Onreset";
+	donpcevent "que_job01#room_2::OnReset";
 	stopnpctimer;
 }
 
@@ -13720,14 +12731,14 @@ OnTouch:
 que_job01,80,27,0	script	que_job01#room2_1_out	45,1,1,{
 OnTouch:
 	warp "que_job01",52,50;
-	donpcevent " #room2timer::Onstop";
+	donpcevent " #room2timer::OnStop";
 	end;
 }
 
 que_job01,144,61,0	script	que_job01#room2_2_out	45,1,1,{
 OnTouch:
 	warp "que_job01",52,50;
-	donpcevent " #room2timer::Onstop";
+	donpcevent " #room2timer::OnStop";
 	end;
 }
 
@@ -13916,10 +12927,9 @@ que_job01,84,17,3	script	Rin#moc_room2_1	885,{
 		close2;
 	}
 	else if (mao_morocc2 == 8) {
-		// Missed
 		cutin "moc2_rin02",2;
 		mes "[Rin]";
-		mes "Anything new?";
+		mes "Have you found anything?";
 		next;
 		mes "- You told her you couldn't find anything regarding their whereabouts,";
 		mes "but you found the ''Bloody Crystal of Darkness'' in the bushes.";
@@ -13970,15 +12980,14 @@ que_job01,84,17,3	script	Rin#moc_room2_1	885,{
 			close2;
 		}
 		else {
-			//custom translation
 			cutin "moc2_rin01",2;
 			mes "[Rin]";
-			mes "...The 'Bloody Crystal of Darkness'...";
-			mes "Where is it?";
+			mes "..A bloody Crystal of the Darkness?";
+			mes "Can you show it to me?";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			mes "I'll bring it right away.";
-			mes "^4d4dffNow what did I do with it...?^000000";
+			mes "Oh, I don't have it with me. I'll go bring it right away.";
+			mes "^4d4dff(Wait, what did I do with it? I didn't sell it or anything, did I?)^000000";
 			close2;
 		}
 	}
@@ -13995,10 +13004,9 @@ que_job01,84,17,3	script	Rin#moc_room2_1	885,{
 		close2;
 	}
 	else {
-		//custom translation
 		cutin "moc2_rin03",2;
 		mes "[Rin]";
-		mes "... ... I am just a patient here, don't mind me~";
+		mes "..Argh.. I'm still recovering .. I'm not supposed to move~";
 		close2;
 	}
 	cutin "moc2_rin03",255;
@@ -14177,14 +13185,14 @@ que_job01,144,54,3	script	Rin#moc_room2_2	885,{
 			close2;
 		}
 		else {
-			//custom translation
 			cutin "moc2_rin01",2;
 			mes "[Rin]";
-			mes "What is it? I'm a little busy...";
+			mes "What's up?";
+			mes "I'm kind of busy right now.";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			mes "Oh, I seem to have forgot to bring the Journal...";
-			mes "...Yeah. ...I'll be back with it soon.";
+			mes "..I've brought back the journal and something else..";
+			mes "..Er, sorry. I forgot to bring the journal! I'll be right back.";
 			close2;
 		}
 	}
@@ -14434,7 +13442,7 @@ OnDisable:
 	disablenpc "#moc2_event_on";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -14445,8 +13453,7 @@ OnTouch:
 		initnpctimer;
 	}
 	else {
-		//custom translation
-		mes "An unknown force seems to block you.";
+		mes "A mysterious force is repelling you, and you're unable to push forward into this area.";
 		close2;
 		warp "morocc",100,100;
 		set $@moc_mao_gate1,0; //Global Variable
@@ -14477,7 +13484,7 @@ OnTimer307000:
 	donpcevent "Dandelion Member#moc2_4::OnDisable";
 	donpcevent "Dandelion Member#moc2_5::OnDisable";
 	donpcevent "#moc2_event01::OnDisable";
-	donpcevent "Corpse#moc2_dead01::Onreset";
+	donpcevent "Corpse#moc2_dead01::OnReset";
 	end;
 
 OnTimer308000:
@@ -14498,7 +13505,7 @@ OnEnable:
 
 OnTouch:
 	soundeffect "wander_man_move.wav",1;
-	sc_start sc_blind,600000,0;
+	sc_start SC_BLIND,600000,0;
 	mes "As soon as you touched the crystal,";
 	mes "you feel your body being pulled into the space gap.";
 	mes "You remember Kidd's confused voice, screaming your name.";
@@ -14528,7 +13535,7 @@ OnTouch:
 	mes "I'm not going to let you run away again!";
 	next;
 	soundeffect "wander_man_move.wav",1;
-	sc_end sc_blind;
+	sc_end SC_BLIND;
 	mes "[" + strcharinfo(0) + "]";
 	mes "... !!!!";
 	mes "Rin!!!!";
@@ -14594,7 +13601,7 @@ OnTouch:
 	donpcevent "Dandelion Member#moc2_4::OnDisable";
 	donpcevent "Dandelion Member#moc2_5::OnDisable";
 	donpcevent "Corpse#moc2_dead01::OnEnable";
-	donpcevent "Corpse#moc2_dead01::Oncall";
+	donpcevent "Corpse#moc2_dead01::OnCall";
 	end;
 }
 
@@ -14627,7 +13634,7 @@ que_dan01,49,36,5	script	Corpse#moc2_dead01	457,{
 			mes "Let's bring this to Kidd.^000000";
 			set mao_morocc2,11;
 			getitem 6028,1; //Seal_Scroll
-			donpcevent "#moc2_event_on::Onstop";
+			donpcevent "#moc2_event_on::OnStop";
 			initnpctimer;
 			changequest 7020,7021;
 			close;
@@ -14660,7 +13667,7 @@ OnEnable:
 	enablenpc "Corpse#moc2_dead01";
 	end;
 
-Oncall:
+OnCall:
 	monster "que_dan01",26,40,"Dandelion Member",1985,1,"Corpse#moc2_dead01::OnMyMobDead";
 	monster "que_dan01",21,35,"Dandelion Member",1985,1,"Corpse#moc2_dead01::OnMyMobDead";
 	monster "que_dan01",25,32,"Dandelion Member",1985,1,"Corpse#moc2_dead01::OnMyMobDead";
@@ -14671,7 +13678,7 @@ Oncall:
 OnMyMobDead:
 	end;
 
-Onreset:
+OnReset:
 	killmonster "que_dan01","Corpse#moc2_dead01::OnMyMobDead";
 	end;
 
@@ -14808,7 +13815,7 @@ OnTouch:
 		set mao_morocc2,18;
 		changequest 7026,7027;
 		close2;
-		warp "SavePoint",0,0;
+		consumeitem 602; //Wing_Of_Butterfly
 		end;
 	}
 	else if (mao_morocc2 == 19) {
@@ -14900,7 +13907,7 @@ que_dan02,115,53,3	script	Man#moc2_crazyR01	456,{
 		set mao_morocc2,20;
 		changequest 7028,7029;
 		close2;
-		warp "SavePoint",0,0;
+		consumeitem 602; //Wing_Of_Butterfly
 		donpcevent "Mr. Kidd#moc_extra01::OnDisable";
 	}
 	else {
@@ -14959,9 +13966,11 @@ que_dan02,102,42,3	script	Disfigured Corpse#moc2	457,{
 	close;
 }
 
+// Ash-Vacuum Warper :: gogoash
+//============================================================
 /*
-//Mid Camp Warper (gogoash), Translated from the Official [Slim]
-prontera,161,192,5	script	Ash Vacuum Warper	707,{
+// Event NPC, now disabled on official servers.
+prontera,161,192,5	script	Ash-Vacuum Warper	707,{
 	mes "[Warp Soldier]";
 	mes "For a limited period.";
 	mes "I can send you to Ash-Vacuum without any fee.";
@@ -14969,24 +13978,50 @@ prontera,161,192,5	script	Ash Vacuum Warper	707,{
 	mes "[Warp Soldier]";
 	mes "Do you want to go to Ash-Vacuum right now?";
 	next;
-	switch(select("Yes, please","Not yet")) {
-
-		case 1:
-			mes "[Warp Soldier]";
-			mes "Ok. I hope you";
-			mes "enjoy your trip.";
-			close2;
-			set ep13_ryu,100;
-			warp "mid_camp",210,291;
-			break;
-		case 2:
-			mes "[Warp Soldier]";
-			mes "No problem. I understand.";
-			mes "Tell me when you change your mind.";
-			mes "See you.";
-			close;
-			break;
+	switch(select("Yes, please:Not yet")) {
+	case 1:
+		mes "[Warp Soldier]";
+		mes "Ok. I hope you";
+		mes "enjoy your trip.";
+		close2;
+		set ep13_ryu,100;
+		warp "mid_camp",210,291;
+		end;
+	case 2:
+		mes "[Warp Soldier]";
+		mes "No problem. I understand.";
+		mes "Tell me when you change your mind.";
+		mes "See you.";
+		close;
 	}
-	end;
 }
 */
+
+//============================================================
+// Old changelog
+//============================================================
+//= 1.0 First Version. [L0ne_W0lf]
+//= 1.1 I missed an end in one of the lhz guards. [L0ne_W0lf]
+//= 1.2 Fixed missing ends, wrong label and some typos [Gepard]
+//= 1.3 Added the two remaining 13.1 quests. [L0ne_W0lf]
+//=     Cat Hand Agents no longer ignore you with 300+ points.
+//= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131)
+//= 1.5 Removed a 'close;' which should have been 'close2'. (bugreport:4276)
+//= 1.6 Fixed check in cat hand agent.
+//= 1.7 Moved the close in Cat Hand Service Warps. (bugreport:4079) [L0ne_W0lf]
+//= 1.8 Added 13.2 Additions to Report from the New World NPCs
+//= 1.9 Upped success rates for Report from the New World drops.
+//= 2.0 Added Mid Camp Warper, translated from the Official [Slim]
+//= 2.1 Fixed some typos [tr0n]
+//= 2.2 A little optimization (-25kb). [Euphy]
+//= 2.3 Updated to match the new Izlude Map. [Masao]
+//= 2.4 More optimization (-32kb). [Euphy]
+//= 2.5 Yet more optimization (-22kb). [Euphy]
+//= 2.5a Minor fixes. [Euphy]
+//= 2.6 Disabled "Ash Vacuum Warper" as it's no longer in iRO. [Euphy]
+//= 2.6a Added 'npcskill' command. [Euphy]
+//= 2.7 Updated EXP rewards.
+//= 2.7a Added 'consumeitem' command. [Euphy]
+//= 2.8 Some optimization, and moved an Izlude NPC. [Euphy]
+//= 2.9 Fixed an invalid event label. [Joseph]
+//============================================================
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index de8f86970..e71a787b8 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Collection of episode 13.2 quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 2.5
-//===== Compatible With: =====================================
-//= rAthena SVN
+//= 2.8
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Cat Hand Addition. (Leads to 13.2 areas)
 //= Two Tribes
 //= Monster Suppression
 //= Daily Quests:
 //= - Bradium Collection
 //= - Laphine Craftsman
-//= - Drago Egg Collection (npc includes 'Wanted' quest)
+//= - Draco Egg Collection (npc includes 'Wanted' quest)
 //= Otherworld language
 //= Daily Quests:
 //= - Midgard Ore
@@ -43,14 +41,18 @@
 //= 2.3 Fixed EF_Wind not showing. (bugreport:5149) [Masao]
 //= 2.4 Optimized (6000+ lines reduced!). [Euphy]
 //= 2.4a Fixed an invisible NPC clashing with a warp portal. [Euphy]
-//= 2.5 Fixed EXP values, added support for pre-re
-//=      & other minor stuff [Streusel] 
-//============================================================ 
+//= 2.5 Updated EXP rewards.
+//= 2.6 Fixed incorrect use of 'close'. [Joseph]
+//= 2.6a Disabled GM NPC. [Euphy]
+//= 2.7 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.7a Added Izlude RE coordinates. [Euphy]
+//= 2.8 Added GM management function. [Euphy]
+//============================================================
 
-// Cat Hand Addition.
-//============================================================ 
+// Cat Hand Addition :: cat_enhance
+//============================================================
 spl_fild02,25,211,4	script	Cat Hand Agent#spl	421,{
-function Catwarp;
+	function Catwarp;
 	if (ep13_yong1 < 3) {
 		mes "[Cat Hand Agent]";
 		mes "Welcome to Cat Trading.";
@@ -104,7 +106,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				set Zeny, Zeny-60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will be opened shortly.";
@@ -151,7 +153,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				set Zeny, Zeny-60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will be opened shortly.";
@@ -272,7 +274,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				set Zeny, Zeny-60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will be opened shortly.";
@@ -390,13 +392,14 @@ function Catwarp {
 	if (Zeny < getarg(0)) {
 		mes "[Cat Hand Agent]";
 		mes "Don't play with money.";
-		close; }
+		close;
+	}
 	close2;
 	set Zeny, Zeny-getarg(0);
 	switch(getarg(1)) {
 		case 1: warp "alberta",117,56; end;
 		case 2: warp "prontera",116,72; end;
-		case 3: warp "izlude",91,105; end;
+		case 3: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; end;
 		case 4: warp "geffen",120,39; end;
 		case 5: warp "payon",161,58; end;
 		case 6: warp "morocc",156,46; end;
@@ -410,7 +413,6 @@ function Catwarp {
 	}
 }
 }
-
 man_fild02,132,47,4	duplicate(Cat Hand Agent#spl)	Cat Hand Agent#man	421
 
 -	script	Mysterious Rock#30::manukrock2	-1,{
@@ -427,11 +429,13 @@ man_fild02,132,47,4	duplicate(Cat Hand Agent#spl)	Cat Hand Agent#man	421
 		else getitem 6048,1; //Unidentified_Mineral
 		initnpctimer;
 		disablenpc strnpcinfo(0);
-		end; }
+		end;
+	}
 	else {
 		mes "This rock contains unidentified minerals.";
 		mes "It's not possible to mine more than the limit.";
-		close; }
+		close;
+	}
 	end;
 
 OnTimer120000:
@@ -525,7 +529,7 @@ spl_fild01,55,269,0	duplicate(FishingHole_spl3)	School of Fish#12	844
 spl_fild01,332,131,0	duplicate(FishingHole_spl3)	School of Fish#13	844
 spl_fild01,170,74,0	duplicate(FishingHole_spl3)	School of Fish#14	844
 
-// Two Tribes
+// Two Tribes :: ep13_2_msg
 //============================================================
 spl_in01,32,306,3	script	Splendide Guard#ep13md01	447,2,2,{
 	if (checkweight(1201,2) == 0) {
@@ -2454,7 +2458,7 @@ spl_in02,236,92,5	script	Arc#ep13md_l02	447,{
 			mes "I'm sorry this is all I can give you for now.";
 			set ep13_mdrama,27;
 			getitem 6081,25; //Splendide_Coin
-			if(checkre(0))
+			if (checkre(3))
 				getexp 120000,10000;
 			else
 				getexp 1200000,100000;
@@ -2697,7 +2701,7 @@ spl_fild01,329,29,0	script	???#ep13mdf03	844,{
 	}
 }
 
-// Monster Suppression
+// Monster Suppression :: ep13_2_dayquest
 //============================================================
 manuk,252,116,3	script	Manuk Galtun#ep13_2day	450,{
 	if (checkweight(1201,2) == 0) {
@@ -2776,7 +2780,7 @@ manuk,252,116,3	script	Manuk Galtun#ep13_2day	450,{
 				completequest 7074;
 				completequest 7075;
 				set ep13_2_days01,2;
-				if(checkre(0))
+				if (checkre(3))
 					getexp 50000,30000;
 				else
 					getexp 500000,300000;
@@ -2810,10 +2814,10 @@ manuk,252,116,3	script	Manuk Galtun#ep13_2day	450,{
 	close;
 }
 
-// Daily Quests
+// Daily Quests :: ep13_2_dayquest
 // - Bradium Collection
 // - Laphine Craftsman
-// - Draco Egg Collection (npc includes 'Wanted' quest)
+// - Draco Egg Collection (NPC includes 'Wanted' quest)
 //============================================================
 man_in01,378,276,3	script	Manuk Engineer#ep13_2	453,{
 	if (checkweight(1201,2) == 0) {
@@ -2942,117 +2946,103 @@ spl_in01,97,313,3	script	Laphine Craftsman#ep13	446,{
 					mes "That should be sufficient for the time being.";
 					close;
 				}
+				mes "[Laphine craftsman]";
+				mes "Thank you for collecting those items for me.";
+				mes "Hopefully you can help us again.";
+				erasequest 7082;
+				close;
+			}
+			set .@alba2,checkquest(7081);
+			if ((.@alba2 == 0) || (.@alba2 == 1)) {
+				if ((countitem(7326) > 14) && (countitem(6075) > 14)) {
+					mes "[Laphine craftsman]";
+					mes "Oh, fantastic.";
+					mes "These are enough materials for today.";
+					mes "I'll let you know if I need more.";
+					delitem 7326,15; //Fluorescent_Liquid
+					delitem 6075,15; //Crystalized_Teardrop
+					erasequest 7081;
+					setquest 7082;
+					getexp 30000,30000;
+					getitem 6081,3; //Splendide_Coin
+					close;
+				}
 				else {
 					mes "[Laphine craftsman]";
-					mes "Thank you for collecting those items for me.";
-					mes "Hopefully you can help us again.";
-					erasequest 7082;
+					mes "What can I help you with?";
+					mes "Not yet done with my request?";
 					close;
 				}
 			}
-			else {
-				set .@alba2,checkquest(7081);
-				if ((.@alba2 == 0) || (.@alba2 == 1)) {
-					if ((countitem(7326) > 14) && (countitem(6075) > 14)) {
-						mes "[Laphine craftsman]";
-						mes "Oh, fantastic.";
-						mes "These are enough materials for today.";
-						mes "I'll let you know if I need more.";
-						delitem 7326,15; //Fluorescent_Liquid
-						delitem 6075,15; //Crystalized_Teardrop
-						erasequest 7081;
-						setquest 7082;
-						getexp 30000,30000;
-						getitem 6081,3; //Splendide_Coin
-						close;
-					}
-					else {
-						mes "[Laphine craftsman]";
-						mes "What can I help you with?";
-						mes "Not yet done with my request?";
-						close;
-					}
-				}
-				else {
+			mes "[Laphine craftsman]";
+			mes "What's up??";
+			mes "I need to make more decorations for the Yai.";
+			next;
+			if (select("May I help you?:What's a Yai?") == 1) {
+				mes "[Laphine craftsman]";
+				mes "You want to help?";
+				mes "This place is being used for battle but it is also our home.";
+				next;
+				mes "[Laphine craftsman]";
+				mes "We prefer to be alone so we must each have our own Yai.";
+				mes "Though we are in a military base we should take care of each Yai.";
+				next;
+				mes "[Laphine craftsman]";
+				mes "I am not a soldier but we hope all of us to be as confident as they are.";
+				mes "I would like to support all Laphine with my skills.";
+				next;
+				mes "[Laphine craftsman]";
+				mes "So I want to help make decorations for everyone's Yai.";
+				mes "I need more materials to make them.";
+				next;
+				mes "[Laphine craftsman]";
+				mes "I heard that a water ghost has been appearing in the cave.";
+				mes "Can you bring me 15 Crystallized Teardrop and 15 Fluorescent Liquid?";
+				next;
+				if (select("Yes.:Sorry.") == 1) {
 					mes "[Laphine craftsman]";
-					mes "What's up??";
-					mes "I need to make more decorations for the Yai.";
-					next;
-					switch(select("May I help you?:What's a Yai?")) {
-					case 1:
-						mes "[Laphine craftsman]";
-						mes "You want to help?";
-						mes "This place is being used for battle but it is also our home.";
-						next;
-						mes "[Laphine craftsman]";
-						mes "We prefer to be alone so we must each have our own Yai.";
-						mes "Though we are in a military base we should take care of each Yai.";
-						next;
-						mes "[Laphine craftsman]";
-						mes "I am not a soldier but we hope all of us to be as confident as they are.";
-						mes "I would like to support all Laphine with my skills.";
-						next;
-						mes "[Laphine craftsman]";
-						mes "So I want to help make decorations for everyone's Yai.";
-						mes "I need more materials to make them.";
-						next;
-						mes "[Laphine craftsman]";
-						mes "I heard that a water ghost has been appearing in the cave.";
-						mes "Can you bring me 15 Crystallized Teardrop and 15 Fluorescent Liquid?";
-						next;
-						switch(select("Yes.:Sorry.")) {
-						case 1:
-							mes "[Laphine craftsman]";
-							mes "Please take my request.";
-							mes "Can you bring me 15 Crystallized Teardrop and 15 Fluorescent Liquid?";
-							setquest 7081;
-							close;
-						case 2:
-							mes "[Laphine craftsman]";
-							mes "Yes, I'm sure that you have your own business to attend to.";
-							mes "I feel embarrassed asking a favor from you, as a Laphine.";
-							next;
-							mes "[Laphine craftsman]";
-							mes "But, why are you trying to be involved in our business yet you won't take up our request?";
-							close;
-						}
-					case 2:
-						mes "[Laphine craftsman]";
-						mes "Yai...";
-						mes "All grown Laphine have one.";
-						mes "They're essential for all Laphine to live in since we are very private people.";
-						next;
-						select("It's a house...?");
-						mes "[Laphine craftsman]";
-						mes "Yes...";
-						mes "That's it. We sometimes invite our friends or guests to our Yai.";
-						mes "And decorations for Yai are quite important to us...";
-						next;
-						mes "[Laphine craftsman]";
-						mes "We Laphine care about ourselves and our Yai as well.";
-						next;
-						mes "[Laphine craftsman]";
-						mes "We are far away from our hometown now...";
-						mes "If we don't have this kind of hobby, there's nothing to enjoy here.";
-						close;
-					}
+					mes "Please take my request.";
+					mes "Can you bring me 15 Crystallized Teardrop and 15 Fluorescent Liquid?";
+					setquest 7081;
+					close;
 				}
+				mes "[Laphine craftsman]";
+				mes "Yes, I'm sure that you have your own business to attend to.";
+				mes "I feel embarrassed asking a favor from you, as a Laphine.";
+				next;
+				mes "[Laphine craftsman]";
+				mes "But, why are you trying to be involved in our business yet you won't take up our request?";
+				close;
 			}
-		}
-		else {
 			mes "[Laphine craftsman]";
-			mes "Hm? Oh, can't you see I'm busy?";
-			mes "I'm making ornaments though, if you must know.";
+			mes "Yai...";
+			mes "All grown Laphine have one.";
+			mes "They're essential for all Laphine to live in since we are very private people.";
+			next;
+			select("It's a house...?");
+			mes "[Laphine craftsman]";
+			mes "Yes...";
+			mes "That's it. We sometimes invite our friends or guests to our Yai.";
+			mes "And decorations for Yai are quite important to us...";
+			next;
+			mes "[Laphine craftsman]";
+			mes "We Laphine care about ourselves and our Yai as well.";
+			next;
+			mes "[Laphine craftsman]";
+			mes "We are far away from our hometown now...";
+			mes "If we don't have this kind of hobby, there's nothing to enjoy here.";
 			close;
 		}
-	}
-	else {
 		mes "[Laphine craftsman]";
-		mes "Yur,Dur AnoVa?";
-		mes "Wha? Dieb OsaDur .. ";
-		mes "ah..RuffThus NeAsh. man nesAsh OdesAlah ?";
+		mes "Hm? Oh, can't you see I'm busy?";
+		mes "I'm making ornaments though, if you must know.";
 		close;
 	}
+	mes "[Laphine craftsman]";
+	mes "Yur,Dur AnoVa?";
+	mes "Wha? Dieb OsaDur .. ";
+	mes "ah..RuffThus NeAsh. man nesAsh OdesAlah ?";
+	close;
 }
 
 mid_camp,146,306,3	script	Pet Breeder#ep13_eden01	982,{
@@ -3106,166 +3096,142 @@ mid_camp,146,306,3	script	Pet Breeder#ep13_eden01	982,{
 		mes "- They just continue to argue -";
 		close;
 	}
-	else {
-		mes "[Pinedel]";
-		mes "Ah, Taab isn't flexible at all.";
-		mes "Hey there! What's up??";
-		next;
-		switch(select("Notice for criminal report:Cute pet investigation.")) {
-		case 1:
-			if (ep13_2_wanted == 1) {
-				if (checkquest(7076,HUNTING) == 2) {
-					mes "[Pinedel]";
-					mes "Have you hunted the Runaway Dandelion?";
-					mes "Ok, I accept you.";
-					mes "Here's something Rin was storing here.";
-					next;
-					mes "[Pinedel]";
-					mes "This is Rin's cherished treasure box...";
-					mes "This is enough payment, right?";
-					completequest 7076;
-					set ep13_2_wanted,2;
-					getitem 7444,1; //Treasure_Box
-					close;
-				}
-				else {
-					mes "[Pinedel]";
-					mes "I know you haven't terminated the Runaway Dandelion yet.";
-					mes "Don't take me for a fool.";
-					close;
-				}
-			}
-			else if (ep13_2_wanted == 2) {
+	mes "[Pinedel]";
+	mes "Ah, Taab isn't flexible at all.";
+	mes "Hey there! What's up??";
+	next;
+	if (select("Notice for criminal report:Cute pet investigation.") == 1) {
+		if (ep13_2_wanted == 1) {
+			if (checkquest(7076,HUNTING) == 2) {
 				mes "[Pinedel]";
-				mes "I will forward everything to Rin.";
-				mes "She'll love it.";
-				mes "Just tell her your name " + strcharinfo(0) + ".";
+				mes "Have you hunted the Runaway Dandelion?";
+				mes "Ok, I accept you.";
+				mes "Here's something Rin was storing here.";
 				next;
 				mes "[Pinedel]";
-				mes "I can remember that I've heard about you from Rin.";
-				mes "But Rin likes you, so that must mean that you're nice.";
-				close;
-			}
-			else {
-				mes "[Pinedel]";
-				mes "Seaching for a criminal?";
-				mes "I'm not sure that you're involved in it.";
+				mes "This is Rin's cherished treasure box...";
+				mes "This is enough payment, right?";
+				completequest 7076;
+				set ep13_2_wanted,2;
+				getitem 7444,1; //Treasure_Box
 				close;
 			}
-		case 2:
-			if (ep13_2_dayegg == 1) {
-				if (countitem(6093) > 9) {
-					mes "[Pinedel]";
-					mes "Oh! Nice!";
-					mes "I can go through this study deeper with your assistance.";
-					next;
-					mes "[Pinedel]";
-					mes "I will try to make these Dragon eggs into cute pets.";
-					mes "Don't expect much!";
-					mes "Come back after a day to check on the progress.";
-					delitem 6093,10; //Egg_Of_Draco
-					erasequest 7077;
-					setquest 7078;
-					set ep13_2_dayegg,2;
-					getexp 40000,40000;
-					getitem 6081,1; //Splendide_Coin
-					getitem 6080,1; //Manuk_Coin
-					close;
-				}
-				else {
-					mes "[Pinedel]";
-					mes "Draco was being kept in the nest just before hatching. Please collect 10 Dragon eggs for me.";
-					mes "You know, those are hard to hatch in captivity.";
-					close;
-				}
-			}
-			else if (ep13_2_dayegg == 2) {
-				set .@alba_check,checkquest(7078,PLAYTIME);
-				if (.@alba_check == -1) {
-					mes "[Pinedel]";
-					mes "Those eggs are about to hatch now.";
-					mes "I will investigate those back home.";
-					close2;
-					erasequest 7078;
-					set ep13_2_dayegg,3;
-					end;
-				}
-				else if ((.@alba_check == 0) || (.@alba_check == 1)) {
-					mes "[Pinedel]";
-					mes "Those eggs are about to hatch now.";
-					mes "I will investigate those back home.";
-					mes "For now I still need more time.";
-					next;
-					mes "[Pinedel]";
-					mes "Can you come back here tomorrow?";
-					close;
-				}
-				else if (.@alba_check == 2) {
-					mes "[Pinedel]";
-					mes "Those eggs are about to hatch now.";
-					mes "I will investigate those back home.";
-					close2;
-					erasequest 7078;
-					set ep13_2_dayegg,3;
-					close;
-				}
-			}
-			else if (ep13_2_dayegg == 3) {
-				mes "[Pinedel]";
-				mes "Do you want to help me gather more Dragon eggs today?";
-				mes "I want to try many things with those eggs.";
-				next;
-				switch(select("Sure.:Sorry, I can't.")) {
-				case 1:
-					mes "[Pinedel]";
-					mes "Please collect 10 Draco Eggs.";
-					set ep13_2_dayegg,1;
-					setquest 7077;
-					close;
-				case 2:
-					mes "[Pinedel]";
-					mes "Ok. You have your own business here.";
-					mes "Go ahead.";
-					close;
-				}
-			}
-			else {
-				mes "[Pinedel]";
-				mes "I am investigating cute pets.";
-				mes "Ash-vacuum has several monsters that I think could become cute pets.";
-				next;
-				mes "[Pinedel]";
-				mes "The objective is one Dragon egg!";
-				mes "Can you bring me a Dragon Egg?";
-				next;
-				switch(select("Yes.:Nope.")) {
-				case 1:
-					mes "[Pinedel]";
-					mes "There would be Dragon nest in the cave you found out.";
-					mes "There should be nice Dragon Eggs.";
-					next;
-					mes "[Pinedel]";
-					mes "Please collect 10 Draco Eggs.";
-					mes "Let's work together to make them as pets.";
-					set ep13_2_dayegg,1;
-					setquest 7077;
-					close;
-				case 2:
-					mes "[Pinedel]";
-					mes "I know it's not the easiest task.";
-					mes "But I refuse to give up.";
-					mes "I will make it into a cute pet someday.";
-					next;
-					mes "[Taab]";
-					mes "Would you just give up making exogamous beings into cute pets...";
-					mes " ";
-					mes "[Pinedel]";
-					mes "Taab doesn't have any guts!";
-					close;
-				}
-			}
+			mes "[Pinedel]";
+			mes "I know you haven't terminated the Runaway Dandelion yet.";
+			mes "Don't take me for a fool.";
+			close;
+		}
+		else if (ep13_2_wanted == 2) {
+			mes "[Pinedel]";
+			mes "I will forward everything to Rin.";
+			mes "She'll love it.";
+			mes "Just tell her your name " + strcharinfo(0) + ".";
+			next;
+			mes "[Pinedel]";
+			mes "I can remember that I've heard about you from Rin.";
+			mes "But Rin likes you, so that must mean that you're nice.";
+			close;
+		}
+		mes "[Pinedel]";
+		mes "Seaching for a criminal?";
+		mes "I'm not sure that you're involved in it.";
+		close;
+	}
+	if (ep13_2_dayegg == 1) {
+		if (countitem(6093) > 9) {
+			mes "[Pinedel]";
+			mes "Oh! Nice!";
+			mes "I can go through this study deeper with your assistance.";
+			next;
+			mes "[Pinedel]";
+			mes "I will try to make these Dragon eggs into cute pets.";
+			mes "Don't expect much!";
+			mes "Come back after a day to check on the progress.";
+			delitem 6093,10; //Egg_Of_Draco
+			erasequest 7077;
+			setquest 7078;
+			set ep13_2_dayegg,2;
+			getexp 40000,40000;
+			getitem 6081,1; //Splendide_Coin
+			getitem 6080,1; //Manuk_Coin
+			close;
+		}
+		mes "[Pinedel]";
+		mes "Draco was being kept in the nest just before hatching. Please collect 10 Dragon eggs for me.";
+		mes "You know, those are hard to hatch in captivity.";
+		close;
+	}
+	else if (ep13_2_dayegg == 2) {
+		mes "[Pinedel]";
+		mes "Those eggs are about to hatch now.";
+		mes "I will investigate those back home.";
+		set .@alba_check,checkquest(7078,PLAYTIME);
+		if (.@alba_check == -1) {
+			close2;
+			erasequest 7078;
+			set ep13_2_dayegg,3;
+			end;
+		}
+		else if ((.@alba_check == 0) || (.@alba_check == 1)) {
+			mes "For now I still need more time.";
+			next;
+			mes "[Pinedel]";
+			mes "Can you come back here tomorrow?";
+			close;
+		}
+		close2;
+		erasequest 7078;
+		set ep13_2_dayegg,3;
+		end;
+	}
+	else if (ep13_2_dayegg == 3) {
+		mes "[Pinedel]";
+		mes "Do you want to help me gather more Dragon eggs today?";
+		mes "I want to try many things with those eggs.";
+		next;
+		if (select("Sure.:Sorry, I can't.") == 1) {
+			mes "[Pinedel]";
+			mes "Please collect 10 Draco Eggs.";
+			set ep13_2_dayegg,1;
+			setquest 7077;
+			close;
 		}
+		mes "[Pinedel]";
+		mes "Ok. You have your own business here.";
+		mes "Go ahead.";
+		close;
+	}
+	mes "[Pinedel]";
+	mes "I am investigating cute pets.";
+	mes "Ash-vacuum has several monsters that I think could become cute pets.";
+	next;
+	mes "[Pinedel]";
+	mes "The objective is one Dragon egg!";
+	mes "Can you bring me a Dragon Egg?";
+	next;
+	if (select("Yes.:Nope.") == 1) {
+		mes "[Pinedel]";
+		mes "There would be Dragon nest in the cave you found out.";
+		mes "There should be nice Dragon Eggs.";
+		next;
+		mes "[Pinedel]";
+		mes "Please collect 10 Draco Eggs.";
+		mes "Let's work together to make them as pets.";
+		set ep13_2_dayegg,1;
+		setquest 7077;
+		close;
 	}
+	mes "[Pinedel]";
+	mes "I know it's not the easiest task.";
+	mes "But I refuse to give up.";
+	mes "I will make it into a cute pet someday.";
+	next;
+	mes "[Taab]";
+	mes "Would you just give up making exogamous beings into cute pets...";
+	mes " ";
+	mes "[Pinedel]";
+	mes "Taab doesn't have any guts!";
+	close;
 }
 
 mid_camp,192,239,4	script	Wanted Sign#ep13_2ect01	857,{
@@ -3293,27 +3259,20 @@ mid_camp,192,239,4	script	Wanted Sign#ep13_2ect01	857,{
 		next;
 		if (ep13_2_wanted == 0) {
 			mes "Do you accept Rin's request?";
-			switch(select("I accept that request.:No, I can't.")) {
-			case 1:
+			if (select("I accept that request.:No, I can't.") == 1) {
 				mes "I accepted Rin's request.";
 				set ep13_2_wanted,1;
 				setquest 7076;
 				close;
-			
-			case 2:
-				mes "No, I won't get involved in it.";
-				close;
 			}
-		}
-		else {
-			mes "I've already decided to take the request.";
+			mes "No, I won't get involved in it.";
 			close;
 		}
-	}
-	else {
-		mes "There must be someone who remove the wanted notice paper.";
+		mes "I've already decided to take the request.";
 		close;
 	}
+	mes "There must be someone who remove the wanted notice paper.";
+	close;
 }
 
 -	script	Dragon Egg#ep13_degg_0	-1,{
@@ -3359,26 +3318,25 @@ nyd_dun02,68,256,0	script	Dragon Egg#ep13_degg_1	463,{
 	if ((ep13_2_dayegg == 1) && (countitem(6093) < 10)) {
 		mes "We just got fresh eggs from the dragon nest.";
 		getitem 6093,1; //Egg_Of_Draco
-		disablenpc strnpcinfo(1);
+		disablenpc strnpcinfo(0);
 		initnpctimer;
 		close;
 	}
 	end;
 
 OnTimer240000:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	stopnpctimer;
 	end;
 
 OnEnable:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	end;
 
 OnDisable:
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 }
-
 nyd_dun02,68,256,0	duplicate(Dragon Egg#ep13_degg_1)	Dragon Egg#ep13_degg11	463
 nyd_dun02,202,166,0	duplicate(Dragon Egg#ep13_degg_1)	Dragon Egg#ep13_degg12	463
 nyd_dun02,200,165,0	duplicate(Dragon Egg#ep13_degg_1)	Dragon Egg#ep13_degg13	463
@@ -3391,26 +3349,25 @@ nyd_dun02,201,166,0	script	Dragon Egg#ep13_degg_2	463,{
 	if ((ep13_2_dayegg == 1) && (countitem(6093) < 10)) {
 		mes "We just got fresh eggs from the dragon nest.";
 		getitem 6093,1; //Egg_Of_Draco
-		disablenpc strnpcinfo(1);
+		disablenpc strnpcinfo(0);
 		initnpctimer;
 		close;
 	}
 	end;
 
 OnTimer120000:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	stopnpctimer;
 	end;
 
 OnEnable:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	end;
 
 OnDisable:
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 }
-
 nyd_dun02,201,166,0	duplicate(Dragon Egg#ep13_degg_2)	Dragon Egg#ep13_degg16	463
 nyd_dun02,203,167,0	duplicate(Dragon Egg#ep13_degg_2)	Dragon Egg#ep13_degg17	463
 nyd_dun02,201,164,0	duplicate(Dragon Egg#ep13_degg_2)	Dragon Egg#ep13_degg18	463
@@ -3485,11 +3442,11 @@ OnDisable:
 	disablenpc "Stranger#ep13_2_dan01";
 	end;
 
-Oncall:
+OnCall:
 	monster "nyd_dun02",144,103,"Runway Dandelion",2026,1,"Stranger#ep13_2_dan03::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "nyd_dun02","Stranger#ep13_2_dan03::OnMyMobDead";
 	end;
 
@@ -3497,7 +3454,7 @@ OnTouch:
 	emotion e_gasp,1;
 	emotion e_omg;
 	disablenpc "Stranger#ep13_2_dan01";
-	donpcevent "Stranger#ep13_2_dan02::Oncall";
+	donpcevent "Stranger#ep13_2_dan02::OnCall";
 	end;
 }
 
@@ -3513,11 +3470,11 @@ OnEnable:
 	enablenpc "Stranger#ep13_2_dan02";
 	end;
 
-Oncall:
+OnCall:
 	monster "nyd_dun02",206,114,"Runway Dandelion",2026,1,"Stranger#ep13_2_dan04::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "nyd_dun02","Stranger#ep13_2_dan04::OnMyMobDead";
 	end;
 
@@ -3525,7 +3482,7 @@ OnTouch:
 	emotion e_gasp,1;
 	emotion e_omg;
 	disablenpc "Stranger#ep13_2_dan02";
-	donpcevent "Stranger#ep13_2_dan01::Oncall";
+	donpcevent "Stranger#ep13_2_dan01::OnCall";
 	end;
 }
 
@@ -3557,8 +3514,8 @@ OnTimer300000:
 	end;
 }
 
-// Otherworld language
-//============================================================ 
+// Otherworld language :: ep13_2_rhea
+//============================================================
 mid_camp,197,237,3	script	Schwartzvalt Mechanic#1	869,{
 	if (ep13_1_edq > 2 || ep13_start == 100) {
 		if (ep13_2_rhea < 1) {
@@ -3747,7 +3704,7 @@ mid_camp,197,237,3	script	Schwartzvalt Mechanic#1	869,{
 				mes "I hope this ring would be a big help for your journey through the other world.";
 				completequest 8253;
 				set ep13_2_rhea,100;
-				if(checkre(0))
+				if (checkre(3))
 					getexp 200000,5000;
 				else
 					getexp 1000000,300000;
@@ -4626,78 +4583,69 @@ OnTimer300000:
 	end;
 }
 
-/*
 mid_camp,7,3,0	script	Translator Preparation#1	708,{
-	mes "[Plot13 Translator Quest Preparation]";
-	mes "Input password.";
+	callfunc "F_GM_NPC";
+	mes "[EP13 Translator Quest Preparation]";
+	mes "First, you must confirm that you are my master.";
 	next;
-	input .@input; //,0,2000;
-	if (.@input == 0) {
+	set .@i, callfunc("F_GM_NPC",1854,0);
+	if (.@i == -1) {
 		mes "[EP 13 Translator Quest Preparation]";
 		mes "Cancelled";
 		close;
-	}
-	else if (.@input == 1854) {
+	} else if (.@i == 0) {
 		mes "[EP 13 Translator Quest Preparation]";
-		mes "I'm the provider of ep13.2 Translator Quest's quest item's NPC" <--Not my fault, they used bad chinese grammar in first place;
+		mes "Try again.";
+		close;
+	} else {
+		mes "[EP 13 Translator Quest Preparation]";
+		mes "I'm the NPC who gives the Episode 13.2 Translator Quest's Linked-Quest Items.";
 		next;
-		mes "What you want?";
+		mes "What would you like to do?";
 		next;
-		switch(select("Finish quest:Accept fairy / giant meetup quest")) {
+		switch(select("Receive EP13.1 Quest:Receive Quest Window - Meeting with Fairy and Giant")) {
 		case 1:
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Acquired the report's quest completion item";
+			mes "Episode 13.1 - The Report Quest Reward Item Received.";
 			next;
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Current report quest's item is "+ ep13_1_edq +" ";
-			mes "Start Quest?";
+			mes "Currently the Report Quest's Set Item is "+ep13_1_edq+".";
+			mes "Do you want to proceed?";
 			next;
-			switch(select("Yes:No")) {
-			case 1:
+			if(select("No:Yes") == 1) {
 				mes "[EP 13 Translator Quest Preparation]";
 				mes "Cancelled";
 				close;
-			case 2:
-				break;
 			}
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Acquired the report's quest completion item";
+			mes "Episode 13.1 - The Report Quest Reward Item Received.";
 			set ep13_1_edq,14;
 			close;
 		case 2:
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Accept the fairy / giant meetup quest";
+			mes "Episode 13.1 - Receiving the Quest window - Meeting with Fairy and Giant.";
 			next;
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Start Quest?";
+			mes "Do you want to proceed?";
 			next;
-			switch(select("Yes:No")) {
-			case 1:
+			if(select("No:Yes") == 1) {
 				mes "[EP 13 Translator Quest Preparation]";
 				mes "Cancelled";
 				close;
-			case 2:
-				break;
 			}
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Acquired the report's quest completion item";
+			mes "Episode 13.1 - The Report Quest Reward Item Received.";
 			setquest 2158;
 			setquest 2159;
 			close;
 		}
 	}
-	else {
-		mes "[EP 13 Translator Quest Preparation]";
-		mes "Please try again";
-		close;
-	}
 }
-*/
 
-// Daily Quests
+// Daily Quests :: ep13_2_tre
 // - Midgard Ore
 // - Alfheim Perfume
-//============================================================ 
+//============================================================
 man_in01,372,221,5	script	Scientist#lifeguard	449,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Dr. Lifeguard]";
@@ -4844,12 +4792,9 @@ man_in01,372,221,5	script	Scientist#lifeguard	449,{
 				delitem 6078,.@stoneelse_chk; //Stone_Fragments
 				delitem 6076,1; //Portable_Toolbox
 				getitem 6080,3; //Manuk_Coin
+				getexp 0,(checkre(3))?50000:700000; //unconfirmed (RE)
 				changequest 2179+(ep13_2_tre-2),2182;
 				set ep13_2_tre,100;
-				if(checkre(0))
-					close;
-				else
-					getexp 0,700000;
 				close;
 			}
 			else {
@@ -5714,10 +5659,8 @@ spl_in01,30,324,3	script	High Laphine#grenouille	446,{
 					set ep13_2_tre1,6;
 					changequest 2185,2186;
 					getitem 6081,3; //Splendide_Coin
-					if(checkre(0))
-						close;
-					else
-						getexp 0,700000;
+					if (checkre(3) == 0)
+						getexp 0,(checkre(3))?50000:700000; //unconfirmed (RE)
 					close;
 				}
 				else {
@@ -6277,8 +6220,8 @@ OnTimer60000:
 	end;
 }
 
-// Secret note of Bazett
-//============================================================ 
+// Secret note of Bazett :: ep13_2_dailybs
+//============================================================
 mid_camp,283,198,5	script	Bazett Teablack#ep13bs	883,{
 	if (checkweight(1201,1) == 0) {
 		mes " - Hold on!! -";
@@ -6943,8 +6886,8 @@ manuk,193,135,0	script	Worker#ep13bs	454,{
 	}
 }
 
-// Yggdrasil Dungeon Floor 2 puzzle.
-//============================================================ 
+// Yggdrasil Dungeon Floor 2 puzzle :: ny_dun02_puzzle
+//============================================================
 nyd_dun02,178,255,0	script	Strange Device#ep13_out	844,3,3,{
 	mes "There's something strange here.";
 	mes "Maybe that device can be controlled from here.";
@@ -7012,7 +6955,7 @@ nyd_dun02,139,274,0	script	Strange Device#ep13_in	844,3,3,{
 	end;
 
 OnTimer70000:
-	donpcevent "ep13_nd2f_mng::Onreset";
+	donpcevent "ep13_nd2f_mng::OnReset";
 	set $@08_ep13nydun02_in,0;
 	stopnpctimer;
 	end;
@@ -7024,7 +6967,7 @@ OnTouch:
 
 -	script	ep13_warp_s_0	-1,{
 OnEnable:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	initnpctimer;
 OnTimer2000:
 OnTimer4000:
@@ -7038,18 +6981,18 @@ OnTimer8000:
 
 OnTimer10000:
 	specialeffect EF_STEAL;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 
 OnDisable:
 	specialeffect EF_WIND;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 }
 
 -	script	ep13_warp_s_1	-1,{
 OnEnable:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	initnpctimer;
 OnTimer2000:
 OnTimer4000:
@@ -7064,18 +7007,18 @@ OnTimer10000:
 
 OnTimer12000:
 	specialeffect EF_STEAL;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 
 OnDisable:
 	specialeffect EF_WIND;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 }
 
 -	script	ep13_warp_s_2	-1,{
 OnEnable:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	initnpctimer;
 OnTimer2000:
 OnTimer4000:
@@ -7091,12 +7034,12 @@ OnTimer12000:
 
 OnTimer15000:
 	specialeffect EF_STEAL;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 
 OnDisable:
 	specialeffect EF_WIND;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 }
 
@@ -7353,32 +7296,29 @@ OnTouch:
 nyd_dun01,255,142,0	warp	nynm_dun1f_to_2f	1,1,nyd_dun02,61,265
 nyd_dun02,56,264,0	warp	nynm_dun2f_to_1f	1,1,nyd_dun01,249,143
 
-//==============================================================================
 nyd_dun02,1,1,0	script	ep13_nd2f_mng	844,{
+	callfunc "F_GM_NPC";
 	mes "Enter password.";
 	next;
-	input .@input; //,0,4000;
-	if (.@input == 1854) {
-		mes "Reset Puzzle?";
+	if (callfunc("F_GM_NPC",1854,0) == 1) {
+		mes "Reset Control devices?";
 		next;
 		switch(select("Yes:No")) {
 		case 1:
-			donpcevent "ep13_nd2f_mng::Onreset";
+			donpcevent "ep13_nd2f_mng::OnReset";
 			set $@08_ep13nydun02_in,0;
-			mes "Puzzle reset";
+			mes "Done.";
 			close;
 		case 2:
 			mes "Canceled.";
 			close;
 		}
-	}
-	else {
+	} else {
 		mes "Invalid.";
 		close;
 	}
-	end;
 
-Onreset:
+OnReset:
 	donpcevent "ep13_warp_s1::OnEnable";
 	donpcevent "ep13_warp_s3::OnEnable";
 
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 9bf7758dc..af109a71d 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -1,23 +1,21 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Airship Related Quests
-//===== By: ================================================== 
-// Samuray22
-//===== Current Version: ===================================== 
-//= 1.9
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== By: ==================================================
+//= Samuray22
+//===== Current Version: =====================================
+//= 2.1
+//===== Description: =========================================
 //= Quest from the airplane to einbroch and einbech.
 //= Reward: -Free Ticket for Flyship.
 //=	    -Free System to Repair.
 //= Quest about how work the airship
 //= Reward: -Base Experience 200,000
 //=	    -Job Experience 10,000
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Beta.
 //= 1.1 Added Heart Fragment quest. [SinSloth]
 //= 1.2 Change the laboratory code text to make it easier to
-//= understand. [SinSloth]
+//=     understand. [SinSloth]
 //= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.3a Corrected a Typo error ";;". [Samuray22]
 //= 1.4 Fixed incorrect variable type used. [L0ne_W0lf]
@@ -28,16 +26,20 @@
 //=     - Airship Ticket Quest
 //=     - How the Airship Works
 //= 1.9 Fixed missing checks for How the Airship Works quest. [Joseph]
-//============================================================ 
+//= 2.0 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.1 Updated Airship Ticket Quest with some missing parts. [Euphy]
+//============================================================
 
-//=======================================================================================================//
-//					Airship Ticket Quest
-//=======================================================================================================//
+// Airship Ticket Quest :: ein_tre
+//============================================================
 
-//====================Kain Himere=============================
+/* Note: this is an iRO conversion, and does not exactly match the official script. */
 
-airplane,47,61,1	script	Crewman	833,{
-	if(kain_ticket==4) {
+//----------------------------------------------------------------------------
+// Kain Himere
+//----------------------------------------------------------------------------
+airplane,47,61,7	script	Crewman	833,{
+	if (kain_ticket == 4) {
 		mes "[Kain Himere]";
 		mes "Ah...";
 		mes "Here it is!";
@@ -59,8 +61,8 @@ airplane,47,61,1	script	Crewman	833,{
 	mes "[Kain Himere]";
 	mes "Welcome to the Airship. If you have any questions or need any assistnace, please don't hesisitate to let me or one of the other crewman know.";
 	next;
-	if(kain_ticket==0) {
-		switch( select( "About the Airship...", "Leave a Comment" )) {
+	if (kain_ticket == 0) {
+		switch(select("About the Airship...:Leave a Comment")) {
 		case 1:
 			set kain_ticket, 1;
 			mes "[Kain Himere]";
@@ -90,15 +92,22 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "it to the higher ups.";
 			mes "To cancel, press '0'.";
 			next;
-			input @comment$;
-			if (@comment$ == "0") {
+			input .@comment$;
+			if (.@comment$ == "kafra") {
+				mes "[Kain Himere]";
+				mes "K-Kafra...?";
+				mes "Hmm, maybe I better";
+				mes "not send this up after all...";
+				emotion e_an;
+				close;
+			} else if (.@comment$ == "0") {
 				mes "[Kain Himere]";
 				mes "Ah, well, if you";
 				mes "have any helpful criticism about our service, feel free to leave me with your comments at any time.";
 				close;
 			} else {
 				mes "["+strcharinfo(0)+"]";
-				mes @comment$+".";
+				mes .@comment$+".";
 				next;
 				mes "[Kain Himere]";
 				mes "Hmmmm...";
@@ -110,8 +119,8 @@ airplane,47,61,1	script	Crewman	833,{
 				close;
 			}
 		}
-	} else if(kain_ticket==1) {
-		switch( select( "About the Airship...", "Make a remark" )) {
+	} else if (kain_ticket == 1) {
+		switch(select("About the Airship...:Make a remark")) {
 		case 1:
 			set kain_ticket, 2;
 			mes "[Kain Himere]";
@@ -133,15 +142,22 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "it to the higher ups.";
 			mes "To cancel, press '0'.";
 			next;
-			input @comment$;
-			if (@comment$=="0") {
+			input .@comment$;
+			if (.@comment$ == "kafra") {
+				mes "[Kain Himere]";
+				mes "K-Kafra...?";
+				mes "Hmm, maybe I better";
+				mes "not send this up after all...";
+				emotion e_an;
+				close;
+			} else if (.@comment$ == "0") {
 				mes "[Kain Himere]";
 				mes "Ah, well, if you";
 				mes "have any helpful criticism about our service, feel free to leave me with your comments at any time.";
 				close;
 			} else {
 				mes "["+strcharinfo(0)+"]";
-				mes @comment$+".";
+				mes .@comment$+".";
 				next;
 				mes "[Kain Himere]";
 				mes "Hmmmm...";
@@ -153,7 +169,7 @@ airplane,47,61,1	script	Crewman	833,{
 				close;
 			}
 		}
-	} else if(kain_ticket==2) {
+	} else if (kain_ticket == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "About the Airship...";
 		next;
@@ -168,7 +184,7 @@ airplane,47,61,1	script	Crewman	833,{
 		mes "E-excuse me...";
 		mes "^666666*Sniff*^000000";
 		next;
-		switch( select( "What the hell...?", "What's wrong?" )) {
+		switch(select("What the hell...?:What's wrong?")) {
 		case 1:
 			mes "[Kain Himere]";
 			mes "Oh, no there's no";
@@ -251,7 +267,7 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "[Kain Himere]";
 			mes "By the way, where are you heading to?";
 			next;
-			switch( select( "Einbroch", "Juno" )) {
+			switch(select("Einbroch:Juno")) {
 			case 1:
 				set kain_ticket, 4;
 				mes "["+strcharinfo(0)+"]";
@@ -276,12 +292,12 @@ airplane,47,61,1	script	Crewman	833,{
 				close;
 			}
 		}
-	} else if(kain_ticket==3) {
+	} else if (kain_ticket == 3) {
 		mes "[Kain Himere]";
 		mes "Oh, how are you?";
 		mes "Right, there's a favor I have to ask of you. Where are you heading?";
 		next;
-		switch( select( "Einbroch", "Juno" )) {
+		switch(select("Einbroch:Juno")) {
 		case 1:
 			set kain_ticket, 4;
 			mes "["+strcharinfo(0)+"]";
@@ -293,7 +309,6 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "Now, let me find";
 			mes "that thing. Hold on...";
 			close;
-
 		case 2:
 			mes "["+strcharinfo(0)+"]";
 			mes "I am heading to Juno.";
@@ -304,14 +319,14 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "I needed sent to Einbroch. If you're not going there, then don't worry about it.";
 			close;
 		}
-	} else if(kain_ticket > 4 && kain_ticket < 10) {
+	} else if (kain_ticket > 4 && kain_ticket < 10) {
 		mes "[Kain Himere]";
 		mes "Oh hello!";
 		mes "Things are a little busy right now, but did you delive-- Oh! Wait, mister!";
 		next;
 		mes "^3355FFKain seems too busy to speak to you right now...^000000";
 		close;
-	} else if(kain_ticket== 10) {
+	} else if (kain_ticket == 10) {
 		mes "[Kain Himere]";
 		mes "Welcome back to the Airship. So did you deliver that little box safely?";
 		next;
@@ -322,7 +337,7 @@ airplane,47,61,1	script	Crewman	833,{
 		mes "Oh...";
 		mes "What should I do now? Oh well, sorry for putting you through so much trouble.";
 		next;
-		switch( select( "Do you know 'Miner's Song?'", "Do you remember 'Tarsha?'" )) {
+		switch(select("Do you know 'Miner's Song?':Do you remember 'Tarsha?'")) {
 		case 1:
 			mes "[Kain Himere]";
 			mes "'Miner's Song...'";
@@ -377,14 +392,14 @@ airplane,47,61,1	script	Crewman	833,{
 			set kain_ticket, 11;
 			close;
 		}
-	} else if(kain_ticket == 11 || kain_ticket == 12) {
+	} else if (kain_ticket == 11 || kain_ticket == 12) {
 		mes "[Kain Himere]";
 		mes "My wife's journal is buried ^3131FFunderneath a tree in Einbech^000000. Please find it and see if Tarsha is my daughter.";
 		close;
-	} else if(kain_ticket == 13) {
+	} else if (kain_ticket == 13) {
 		mes "^3355FFYou better fulfill Kain's request to find his wife's journal in Einbech before you speak to him again.^000000";
 		close;
-	} else if(kain_ticket == 14) {
+	} else if (kain_ticket == 14) {
 		if (countitem(7276)==1) {
 			mes "^3355FFYou gave Kain his wife's journal and told him that Tarsha really is is daughter, and currently has a job in Einbech.^000000";
 			next;
@@ -418,7 +433,7 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "It would be better if you approached Kain and bring the Doodled Letter that you received.^000000";
 			close;
 		}
-	} else if(kain_ticket >= 15) {
+	} else if (kain_ticket >= 15) {
 		mes "[Kain Himere]";
 		mes "Oh, how are you";
 		mes "lately, my friend?";
@@ -430,9 +445,10 @@ airplane,47,61,1	script	Crewman	833,{
 	}
 }
 
-//====================Empty Room 201==========================
-
-ein_in01,227,279,5	script	door_ein	-1,5,5,{
+//----------------------------------------------------------------------------
+// Empty Room 201
+//----------------------------------------------------------------------------
+ein_in01,227,279,3	script	#door_ein	-1,5,5,{
 OnTouch:
 	if (kain_ticket == 5) {
 		set kain_ticket, 6;
@@ -455,18 +471,19 @@ OnTouch:
 	}
 }
 
-//====================Elle Cherno=============================
-
-ein_in01,261,241,5	script	Elle Cherno	703,3,3,{
+//----------------------------------------------------------------------------
+// Elle Cherno
+//----------------------------------------------------------------------------
+ein_in01,261,241,3	script	Elle Cherno	703,3,3,{
 OnTouch:
 	mes "[Elle Cherno]";
 	mes "Let's get to work";
 	mes "fear-less comraaades~!";
 	mes "Do our best! Nothing";
 	mes "can stop us, lads~!";
-	if(kain_ticket == 6) {
+	if (kain_ticket == 6) {
 		next;
-		switch( select( "Hello!", "What are you singing?")) {
+		switch(select("Hello!:What are you singing?")) {
 		case 1:
 			mes "[Elle Cherno]";
 			mes "Let's get to work";
@@ -502,7 +519,7 @@ OnTouch:
 			mes "Our house is behind the Hotel. So can see my mommy and tell me if she's not feeling good?";
 			close;
 		}
-	} else if(kain_ticket == 7) {
+	} else if (kain_ticket == 7) {
 		next;
 		mes "[Elle Cherno]";
 		mes "Our house is";
@@ -511,10 +528,13 @@ OnTouch:
 		mes "you go and see";
 		mes "my mommy for me?";
 		close;
-	} else if(kain_ticket == 13) {
+	} else if (kain_ticket == 13) {
 		next;
-		//Check if you can carry the Picture Letter.
-		 if (checkweight(7276,1)) {
+		if (checkweight(7276,1) == 0) {
+			mes "[Elle Cherno]";
+			mes "Hey! I have something to give you, but you have too much stuff already. Will you come back later?";
+			close;
+		} else {
 			mes "[Elle Cherno]";
 			mes "You saw my grandpa?";
 			mes "You're his friend,";
@@ -529,37 +549,34 @@ OnTouch:
 			mes "in your hand.^000000";
 			changequest 2084,2085;
 			set kain_ticket, 14;
-			getitem 7276, 1; //Picture Letter,
-			close;
-		} else {
-			mes "[Elle Cherno]";
-			mes "Hey! I have something to give you, but you have too much stuff already. Will you come back later?";
+			getitem 7276, 1; //Picture_Letter
 			close;
 		}
 	}
 	close;
 }
 
-//====================Theo Cherno=============================
-
+//----------------------------------------------------------------------------
+// Theo Cherno
+//----------------------------------------------------------------------------
 ein_in01,123,94,1	script	Theo Cherno	851,{
-	if(kain_ticket == 7) {
-		callfunc "cherno";
+	if (kain_ticket == 7) {
+		callfunc "F_Cherno";
 		set kain_ticket, 8;
 		close;
-	} else if(kain_ticket > 7 && kain_ticket < 10) {
+	} else if (kain_ticket > 7 && kain_ticket < 10) {
 		mes "[Theo Cherno]";
 		mes "You are very kind.";
 		close;
-	} else if(kain_ticket > 9 && kain_ticket < 13) {
+	} else if (kain_ticket > 9 && kain_ticket < 13) {
 		mes "[Theo Cherno]";
 		mes "Are you sure";
 		mes "that you can find";
 		mes "her father? Oh...!";
 		mes "You're a godsend!";
 		close;
-	} else if(kain_ticket > 12) {
-		Emotion 18, "Theo Cherno";
+	} else if (kain_ticket > 12) {
+		emotion e_heh;
 		mes "[Theo Cherno]";
 		mes "I'm so happy";
 		mes "for my wife.";
@@ -577,18 +594,19 @@ ein_in01,123,94,1	script	Theo Cherno	851,{
 	}
 }
 
-//====================Tarsha Cherno===========================
-
+//----------------------------------------------------------------------------
+// Tarsha Cherno
+//----------------------------------------------------------------------------
 ein_in01,125,99,3	script	Tarsha Cherno	850,{
-	if(kain_ticket == 7) {
-		callfunc "cherno";
+	if (kain_ticket == 7) {
+		callfunc "F_Cherno";
 		set kain_ticket, 8;
 		close;
-	} else if(kain_ticket == 8) {
+	} else if (kain_ticket == 8) {
 		mes "[Tarsha Cherno]";
 		mes "Although these contraptions aren't worth showing off, we've put a lot of work into inventing these machines.";
 		close;
-	} else if(kain_ticket == 9) {
+	} else if (kain_ticket == 9) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Ma'am, you have a scar on your shoulder. Is that from an accident?";
 		next;
@@ -623,7 +641,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 		mes "such a robust song";
 		mes "for men! Haha, this";
 		mes "is all your fault, Tarsha.";
-		Emotion 29, "Theo Cherno";
+		emotion e_gg;
 		next;
 		mes "[Tarsha Cherno]";
 		mes "Hoho.";
@@ -653,11 +671,11 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 		changequest 2080,2081;
 		set kain_ticket, 10;
 		close;
-	} else if(kain_ticket == 10 || kain_ticket == 11) {
+	} else if (kain_ticket == 10 || kain_ticket == 11) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I know someone who might be your father! Just wait for me, hopefully I'll bering good news soon!";
 		close;
-	} else if(kain_ticket == 12) {
+	} else if (kain_ticket == 12) {
 		mes "[Tarsha Cherno]";
 		mes "Oh, welcome back.";
 		mes "So did you bring";
@@ -666,7 +684,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 		mes "["+strcharinfo(0)+"]";
 		mes "Yes, speaking of which, allow me to... Check something.";
 		next;
-		switch( select( "Check her neck.", "Check her hands.", "Check her legs.", "Check her forehead.")) {
+		switch(select("Check her neck.:Check her hands.:Check her legs.:Check her forehead.")) {
 		case 1:
 			mes "^3355FFUh oh...";
 			mes "Nothing's there!^000000";
@@ -676,7 +694,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 			mes "Touching another";
 			mes "man's wife...?!";
 			next;
-			specialeffect2 EF_EARTHHIT;
+			specialeffect2 EF_PIERCE;
 			percentheal -30,0;
 			close;
 		case 2:
@@ -730,7 +748,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 			mes "Touching another";
 			mes "man's wife...?!";
 			next;
-			specialeffect2 EF_EARTHHIT;
+			specialeffect2 EF_PIERCE;
 			percentheal -20,0;
 			close;
 		case 4:
@@ -742,11 +760,11 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 			mes "Touching another";
 			mes "man's wife...?!";
 			next;
-			specialeffect2 EF_EARTHHIT;
+			specialeffect2 EF_PIERCE;
 			percentheal -10,0;
 			close;
 		}
-	} else if(kain_ticket > 12) {
+	} else if (kain_ticket > 12) {
 		mes "[Tarsha Cherno]";
 		mes "I've been feeling";
 		mes "great after all you've";
@@ -763,21 +781,23 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 	}
 }
 
-function	script	cherno	{
-	misceffect 2;
+ein_in01,127,94,3	script	#exp_ein	111,{ end; }
+
+function	script	F_Cherno	{
+	specialeffect EF_COMBOATTACK1,AREA,"#exp_ein";
 	mes "^33355F*Bang*^000000";
 	next;
-	misceffect 3;
+	specialeffect EF_COMBOATTACK2,AREA,"#exp_ein";
 	mes "^33355F*Bang*^000000";
 	next;
-	misceffect 4;
+	specialeffect EF_COMBOATTACK3,AREA,"#exp_ein";
 	mes "^33355F*Bang*^000000";
 	next;
-	misceffect 20;
+	specialeffect EF_POISONATTACK,AREA,"#exp_ein";
 	mes "^33355F*Crash!*^000000";
 	mes "....."; 
-	emotion 4,0,"Theo Cherno";
-	Emotion 4,0,"Tarsha Cherno";
+	emotion e_swt,0,"Theo Cherno";
+	emotion e_swt,0,"Tarsha Cherno";
 	next;
 	mes "[Theo Cherno]";
 	mes "Honey...";
@@ -794,13 +814,13 @@ function	script	cherno	{
 	mes "it a day and finish";
 	mes "this tomorrow.";
 	next;
-	Emotion 1, "Tarsha Cherno";
+	emotion e_what,0,"Tarsha Cherno";
 	mes "[Tarsha Cherno]";
 	mes "Elle is playing outside.";
 	mes "Oh, I didn't know we had";
 	mes "a guest? Hello, how are you?";
 	next;
-	switch( select( "Nothing.", "Your daughter asked me to visit you.")) {
+	switch(select("Nothing.:Your daughter asked me to visit you.")) {
 	case 1:
 		mes "[Theo Cherno]";
 		mes "As you see, my wife and I are pretty";
@@ -809,8 +829,8 @@ function	script	cherno	{
 		mes "will you please leave us alone?";
 		close;
 	case 2:
-		Emotion 4, "Tarsha Cherno";
-		Emotion 4, "Theo Cherno";
+		emotion e_swt,0,"Tarsha Cherno";
+		emotion e_swt,0,"Theo Cherno";
 		mes "[Tarsha Cherno]";
 		mes "Excuse me?";
 		mes "What did she say?";
@@ -822,7 +842,7 @@ function	script	cherno	{
 		mes "was sick or sad";
 		mes "...Or something?";
 		next;
-		Emotion 23, "Tarsha Cherno";
+		emotion e_omg,0,"Tarsha Cherno";
 		mes "[Tarsha Cherno]";
 		mes "Oh my god...!";
 		mes "What is she";
@@ -868,15 +888,10 @@ function	script	cherno	{
 	}
 }
 
-//========Unidentified Machine #1 and #2=======================
-
-ein_in01,127,94,5	script	Unidentified Machine#mac	111,{
-	callfunc "Machine";
-}
-ein_in01,122,103,5	script	Unidentified Machine	111,{
-	callfunc "Machine";
-}
-function	script	Machine	{
+//----------------------------------------------------------------------------
+// Unidentified Machine
+//----------------------------------------------------------------------------
+ein_in01,122,103,5	script	Unidentified Machine#ein	111,{
 	mes "^3355FFIt's...";
 	mes "It's a really";
 	mes "strange looking";
@@ -885,19 +900,120 @@ function	script	Machine	{
 	close;
 }
 
-//====================Mirror=============================
-
-ein_in01,121,99,5	script	Mirror	111,{
-	if(kain_ticket==8) {
+//----------------------------------------------------------------------------
+// Mirror
+//----------------------------------------------------------------------------
+ein_in01,121,99,3	script	Mirror#ein	111,{
+	if (kain_ticket == 8) {
 		mes "^3355FFIt's a mirror.";
 		mes "So, of course the";
 		mes "first thing you'll";
 		mes "see is yourself.";
 		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Man...";
-		mes "I didn't know";
-		mes "I was so good looking!";
+		if (Sex) {
+			switch(rand(1,5)) {
+			case 1:
+				mes "["+strcharinfo(0)+"]";
+				mes "Man...";
+				mes "I didn't know";
+				mes "I was so good";
+				mes "looking! Ooh yah~";
+				break;
+			case 2:
+				mes "["+strcharinfo(0)+"]";
+				mes "Whoa...";
+				mes "So that's why the";
+				mes "ladies keep looking";
+				mes "at me. I'm a walking";
+				mes "free gun show!";
+				break;
+			case 3:
+				mes "["+strcharinfo(0)+"]";
+				mes "It's a shame I can't job";
+				mes "change to Male Model.";
+				mes "Clearly, I'd be like, Job";
+				mes "Level 87 or something.";
+				mes "Man, I'm beautiful...";
+				break;
+			case 4:
+				mes "["+strcharinfo(0)+"]";
+				mes "This is my reflection?!";
+				mes "No one can be this good";
+				mes "looking, not without special";
+				mes "effects! I mean, it's not";
+				mes "fair to everyone else...";
+				break;
+			case 5:
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh wow...";
+				mes "I look pretty good.";
+				mes "No wait. Really, really";
+				mes "good. So this must be";
+				mes "why I get such great";
+				mes "service at restaurants...";
+				break;
+			}
+		} else {
+			switch(rand(1,5)) {
+			case 1:
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh. Wow.";
+				mes "I never realized...";
+				mes "Everything is in";
+				mes "perfect proportion!";
+				mes "No wonder people";
+				mes "want to party with me~";
+				break;
+			case 2:
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh my gosh~";
+				mes "How can I look this";
+				mes "good without any makeup?";
+				mes "I-It isn't fair to all the other";
+				mes "girls... Wow, is this really me?";
+				break;
+			case 3:
+				mes "["+strcharinfo(0)+"]";
+				mes "Am I going crazy?";
+				mes "Is that girl in the";
+				mes "mirror really me...?";
+				mes "How did I not realize";
+				mes "how gorgeous I look?";
+				break;
+			case 4:
+				mes "["+strcharinfo(0)+"]";
+				mes "So...";
+				mes "What did you do with";
+				mes "this mirror? Because I'm";
+				mes "looking at my reflection";
+				mes "and I can't seem to find";
+				mes "any flaws with my figure...";
+				next;
+				emotion e_swt2,0,"Tarsha Cherno";
+				mes "[Tarsha Cherno]";
+				mes "Actually...";
+				mes "That's not one";
+				mes "of our inventions.";
+				mes "It's just a normal mirror...";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Well now...!";
+				mes "Are you sure?";
+				mes "Because my face looks";
+				mes "freakin' immaculate! And";
+				mes "it's like, I'm almost too sexy!";
+				break;
+			case 5:
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh wow...";
+				mes "I look pretty good.";
+				mes "No wait. Really, really";
+				mes "good. So this must be";
+				mes "why I get such great";
+				mes "service at restaurants...";
+				break;
+			}
+		}
 		next;
 		mes "^3355FFAfter enjoying that little epiphany, you see a reflection of Tarsha's neck as you set the mirror back down.^000000";
 		next;
@@ -907,10 +1023,11 @@ ein_in01,121,99,5	script	Mirror	111,{
 	}
 }
 
-//====================Tree from Einbech=============================
-
+//----------------------------------------------------------------------------
+// Tree from Einbech
+//----------------------------------------------------------------------------
 einbech,45,113,5	script	Tree#t1-1::Tree	111,{
-	if(kain_ticket==11) {
+	if (kain_ticket == 11) {
 		mes "^3355FFYou crouch down";
 		mes "under the tree and";
 		mes "begin digging into";
@@ -923,27 +1040,31 @@ einbech,45,113,5	script	Tree#t1-1::Tree	111,{
 		mes "......";
 		mes ".........";
 		next;
-		set @find_diary,rand(1,100);
-		if(@find_diary > 10) {
+		set .@find_diary,rand(1,100);
+		if (.@find_diary > 10) {
 			mes "^3355ffUnfortunately,";
 			mes "you weren't able";
 			mes "to find anything.^000000";
 			close;
 		} else {
-			callfunc "diary";
+			mes "^3355ffYou have found a ^3131FFJournal^3355ff among some other articles buried for safekeeping.^000000";
+			next;
+			callsub L_Diary;
+			next;
+			mes "...";
+			mes "......";
+			next;
+			mes "^3355FFThat was the last page of the journal. You picked it up so that you can bring it over to ^3131FFTarsha.^000000";
 			changequest 2082,2083;
 			set kain_ticket, 12;
 			close;
 		}
-	} else if(kain_ticket == 12) {
-		callfunc "diary";
+	} else if (kain_ticket == 12) {
+		callsub L_Diary;
 		close;
 	}
-}
 
-function	script	diary	{
-	mes "^3355ffYou have found a ^3131FFJournal^3355ff among some other articles buried for safekeeping.^000000";
-	next;
+L_Diary:
 	mes "^3355FFYou open";
 	mes "the journal";
 	mes "and begin to read...^000000";
@@ -1015,42 +1136,41 @@ function	script	diary	{
 	mes "^333333Lately Tarsha cries a lot. My poor baby loves her father so much, but he's always so cold. Sometimes I see him smile at Tarsha.^000000";
 	next;
 	mes "^333333But those moments grow fewer the more he drinks. When will he finally overcome his pain?^000000";
-	next;
-	mes "...";
-	mes "......";
-	next;
-	mes "^3355FFThat was the last page of the journal. You picked it up so that you can bring it over to ^3131FFTarsha.^000000";
 	return;
 }
+einbech,36,100,5	duplicate(Tree)	Tree#t1-2	111
+einbech,44,90,5	duplicate(Tree)	Tree#t1-3	111
+einbech,53,94,5	duplicate(Tree)	Tree#t1-4	111
 
-//====================Expert Repairman=============================
-
+//----------------------------------------------------------------------------
+// Expert Repairman
+//----------------------------------------------------------------------------
 ein_in01,117,80,5	script	Unidentified Machine#as	111,{
-	if(kain_ticket > 12) {
+	if (kain_ticket > 12) {
 		mes "["+strcharinfo(0)+"]";
 		mes "This is the";
 		mes "^FF0000Expert Repairman^000000?!";
 		mes "It looks like it";
 		mes "needs repairs itself...";
 		next;
-		if(getbrokenid(1)==NULL) {
+		if (getbrokenid(1) == 0) {
 			mes "[Expert Repairman]";
 			mes "*Beep-*";
 			mes "Please check";
 			mes "your items again.";
 			close;
 		} else {
-			set @choice,select(getitemname(getbrokenid(1)),getitemname(getbrokenid(2)),
+			set .@choice, select(getitemname(getbrokenid(1)),getitemname(getbrokenid(2)),
 			getitemname(getbrokenid(3)),getitemname(getbrokenid(4)),getitemname(getbrokenid(5)),
 			getitemname(getbrokenid(6)),getitemname(getbrokenid(7)),getitemname(getbrokenid(8)),
 			getitemname(getbrokenid(9)),getitemname(getbrokenid(10)));
 			mes "[Expert Repairman]";
-			mes "You're gonna repair " + getitemname(getbrokenid(@choice)) + ".";
+			mes "You're gonna repair " + getitemname(getbrokenid(.@choice)) + ".";
 			mes "Continue?";
 			next;
-			switch( select("Yes","No")) {
+			switch(select("Yes:No")) {
 			case 1:
-				repair(@choice);
+				repair(.@choice);
 				next;
 				mes "[Expert Repairman]";
 				mes "*Beep-*";
@@ -1068,18 +1188,13 @@ ein_in01,117,80,5	script	Unidentified Machine#as	111,{
 		close;
 	}
 }
-//===================Trees From Einbech==========================
-//Tree of the Diary
-einbech,36,100,5	duplicate(Tree)	Tree#t1-2	111
-einbech,44,90,5	duplicate(Tree)	Tree#t1-3	111
-einbech,53,94,5	duplicate(Tree)	Tree#t1-4	111
 
-//=======================================================================================================//
-//				"How Does The Airship Work" Quest
-//=======================================================================================================//
+// "How Does The Airship Work" Quest :: lght_air & lght_ymir
+//============================================================
 
-
-//=============Monsters Attack======================
+//----------------------------------------------------------------------------
+// Monsters Attack :: lght_air
+//----------------------------------------------------------------------------
 airplane_01,1,1,0	script	Airship#airplane02	-1,{
 	end;
 OnEnable:
@@ -1487,7 +1602,9 @@ airplane_01,252,63,0	script	boom8#airplane	139,{ end; }
 airplane_01,234,65,0	script	boom9#airplane	139,{ end; }
 airplane_01,227,67,0	script	boom10#airplane	139,{ end; }
 
-//========Captain Tarlock (Inside the Captain Cabin)=======================
+//----------------------------------------------------------------------------
+// Captain Tarlock :: lght_air
+//----------------------------------------------------------------------------
 airplane_01,238,154,3	script	Airship Captain#01	873,{
 	cutin "fly_felrock",2;
 	mes "[Tarlock]";
@@ -1498,11 +1615,11 @@ airplane_01,238,154,3	script	Airship Captain#01	873,{
 	next;
 	if (lght_air >= 0 && lght_air <= 3 || lght_air == 7) {
 		set .@question$, "How does this Airship fly?";
-	} else if(lght_air == 4) {
+	} else if (lght_air == 4) {
 		set .@question$, "I handed the letter to Captain Ferlock.";
-	} else if(lght_air == 5) {
+	} else if (lght_air == 5) {
 		set .@question$, "You finished reading the letter?";
-	} else if(lght_air == 6) {
+	} else if (lght_air == 6) {
 		set .@question$, "Already finished reading?";
 	}
 	switch (select("Y-you're a reindeer?!", .@question$, "No, not really.")) {
@@ -1719,7 +1836,10 @@ airplane_01,238,154,3	script	Airship Captain#01	873,{
 			mes "letters.";
 			completequest 8035;
 			set lght_air, 7;
-			getexp 20000, 1000;
+			if (checkre(3))
+				getexp 20000,1000;
+			else
+				getexp 200000,10000;
 			close2;
 			cutin "",255;
 			end;
@@ -1765,38 +1885,26 @@ airplane_01,238,154,3	script	Airship Captain#01	873,{
 	}
 }
 
-
-//===========Captain Ferlock=======================
-
+//----------------------------------------------------------------------------
+// Captain Ferlock :: lght_ymir
+//----------------------------------------------------------------------------
 airplane,236,163,5	script	Airship Captain#03	873,{
 	cutin "fly_trock.bmp",2;
-	if(hg_ma1 == 3 || hg_ma1 == 4)
-	{
+	if (hg_ma1 == 3 || hg_ma1 == 4) {
 		mes "[Ferlock]";
 		mes "Welcome to the airship. I am Ferlock, captain of this airship. What do you want from me? ";
 		next;
-		switch( select( "Ask him about Thierry" ) )
-		{
-			case 1:
-				break;
-		}
+		select("Ask him about Thierry");
 		mes "[Ferlock]";
 		mes "Hmm, this is the first time I hear of this name. I'm sure he's not the employee of this place.";
 		next;
-		switch( select( "Request for the passenger list. " ) )
-		{
-			case 1:
-				break;
-		}
+		select("Request for the passenger list.");
 		mes "[Ferlock]";
 		mes "The passenger list is not opened to public unfortunately. Sorry I couldn't help you. ";
-		if(hg_ma1 == 3) close;
+		if (hg_ma1 == 3)
+			close;
 		next;
-		switch( select( "Follow Kaci's request and tell him the story." ) )
-		{
-			case 1:
-				break;
-		}
+		select("Follow Kaci's request and tell him the story.");
 		mes "^3355FFWhen you tell him why you need to find Thierry, the captain listens to you quietly and nods his head.^000000";
 		next;
 		mes "[Ferlock]";
@@ -1843,17 +1951,14 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_ma1 == 5)
-	{
+	} else if (hg_ma1 == 5) {
 		mes "[Ferlock]";
 		mes "You better get going and send the news to the fiance.";
 		close2;
 		cutin "",255;
 		end;
 	}
-	if (lght_air == 7 && lhz_heart == 11)
-	{
+	if (lght_air == 7 && lhz_heart == 11) {
 		mes "[Ferlock]";
 		mes "Ah, thank you for coming.";
 		mes "Now, I wanted to ask you";
@@ -1862,127 +1967,115 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 		mes "merely curious, or did you";
 		mes "have some special reason?";
 		next;
-		switch( select( "Just curious...","Well, there's someone I need to help..." ) )
-		{
-			case 1:
-				mes "[Ferlock]";
-				mes "Just curious...?";
-				mes "I don't know if satisfying";
-				mes "your curiosity is worth the";
-				mes "risks that you have already";
-				mes "taken. You should be more ";
-				mes "careful in the future...";
-				close2;
-				cutin "",255;
-				end;
-			
-			case 2:
-				mes "[Ferlock]";
-				mes "Well, I shouldn't be";
-				mes "trusting you this much,";
-				mes "but since you've helped";
-				mes "me and my brother, I feel";
-				mes "that you must be one of those altruistic adventurers. Very well.";
-				next;
-				mes "[Ferlock]";
-				mes "If you promise that you'll";
-				mes "never tell what I reveal to";
-				mes "you, then I suppose I can";
-				mes "tell you know about the Rune";
-				mes "Stone and Ymir's Heart Piece.";
-				next;
-				switch( select( "I promise..." ) )
-				{
-					case 1:
-						break;
-				}
-				mes "[Ferlock]";
-				mes "Alright, then. I expect you";
-				mes "to keep your word. Now, you";
-				mes "already know that the Airships";
-				mes "are powered by Rune Stones, imitations of Ymir's Heart pieces.";
-				next;
-				mes "[Ferlock]";
-				mes "Although Rune Stones are";
-				mes "inferior to true Ymir Heart";
-				mes "pieces, we can make as many";
-				mes "as want. As for true Ymir Heart";
-				mes "Pieces, they're difficult to find or effectively reproduce.";
-				next;
-				mes "[Ferlock]";
-				mes "You may have already";
-				mes "figured this out, but all";
-				mes "Rune Stones are produced";
-				mes "in the Einbroch Laboratory";
-				mes "for use in the Airships. So";
-				mes "you see what's going on?";
-				next;
-				switch( select( "Wait, what's the Varmunt Project?" ) )
-				{
-					case 1:
-						break;
-				}
-				mes "[Ferlock]";
-				mes "The Varmunt Project is";
-				mes "a continuation of one of";
-				mes "the projects started by the";
-				mes "great Sage, Varmunt. Even as";
-				mes "a child, he was renown as an";
-				mes "incredible genius, a prodigy.";
-				next;
-				mes "[Ferlock]";
-				mes "However, no matter how";
-				mes "much academic success he";
-				mes "enjoyed--he even became a";
-				mes "tenured professor at Juno";
-				mes "University--Varmunt was never able to finance his own research.";
-				next;
-				mes "[Ferlock]";
-				mes "Eventually, he accepted an";
-				mes "offer from Rekenber Co. to";
-				mes "develop an energy source in";
-				mes "exchange for funding. The";
-				mes "result of his work for them is the invention of the Rune Stone.";
-				next;
-				mes "[Ferlock]";
-				mes "However, the public isn't";
-				mes "supposed to know that Varmunt";
-				mes "invented the Rune Stones. Now,";
-				mes "Varmunt disappeared before he";
-				mes "could perfect the Rune Stone";
-				mes "creation process.";
-				next;
-				mes "[Ferlock]";
-				mes "Therefore, the Rune Stones";
-				mes "we have now are unstable and";
-				mes "become useless after a while.";
-				mes "The Varmunt Project aims to";
-				mes "correct these flaws and perfect";
-				mes "the Ymir Heart replication...";
-				next;
-				mes "[Ferlock]";
-				mes "Er, anyway, that's why";
-				mes "I was at the Einbroch";
-				mes "Laboratory today. My Rune";
-				mes "Stone was close to empty,";
-				mes "so I went there to pick up";
-				mes "a fully charged one.";
-				next;
-				mes "[Ferlock]";
-				mes "^333333*Phew...*^000000";
-				mes "Would you give me";
-				mes "a moment to catch";
-				mes "my breath before";
-				mes "I continue? Yes,";
-				mes "there's a little more...";
-				set lhz_heart,12;
-				close2;
-				cutin "",255;
-				end;
+		switch(select("Just curious...:Well, there's someone I need to help...")) {
+		case 1:
+			mes "[Ferlock]";
+			mes "Just curious...?";
+			mes "I don't know if satisfying";
+			mes "your curiosity is worth the";
+			mes "risks that you have already";
+			mes "taken. You should be more ";
+			mes "careful in the future...";
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			mes "[Ferlock]";
+			mes "Well, I shouldn't be";
+			mes "trusting you this much,";
+			mes "but since you've helped";
+			mes "me and my brother, I feel";
+			mes "that you must be one of those altruistic adventurers. Very well.";
+			next;
+			mes "[Ferlock]";
+			mes "If you promise that you'll";
+			mes "never tell what I reveal to";
+			mes "you, then I suppose I can";
+			mes "tell you know about the Rune";
+			mes "Stone and Ymir's Heart Piece.";
+			next;
+			select("I promise...");
+			mes "[Ferlock]";
+			mes "Alright, then. I expect you";
+			mes "to keep your word. Now, you";
+			mes "already know that the Airships";
+			mes "are powered by Rune Stones, imitations of Ymir's Heart pieces.";
+			next;
+			mes "[Ferlock]";
+			mes "Although Rune Stones are";
+			mes "inferior to true Ymir Heart";
+			mes "pieces, we can make as many";
+			mes "as want. As for true Ymir Heart";
+			mes "Pieces, they're difficult to find or effectively reproduce.";
+			next;
+			mes "[Ferlock]";
+			mes "You may have already";
+			mes "figured this out, but all";
+			mes "Rune Stones are produced";
+			mes "in the Einbroch Laboratory";
+			mes "for use in the Airships. So";
+			mes "you see what's going on?";
+			next;
+			select("Wait, what's the Varmunt Project?");
+			mes "[Ferlock]";
+			mes "The Varmunt Project is";
+			mes "a continuation of one of";
+			mes "the projects started by the";
+			mes "great Sage, Varmunt. Even as";
+			mes "a child, he was renown as an";
+			mes "incredible genius, a prodigy.";
+			next;
+			mes "[Ferlock]";
+			mes "However, no matter how";
+			mes "much academic success he";
+			mes "enjoyed--he even became a";
+			mes "tenured professor at Juno";
+			mes "University--Varmunt was never able to finance his own research.";
+			next;
+			mes "[Ferlock]";
+			mes "Eventually, he accepted an";
+			mes "offer from Rekenber Co. to";
+			mes "develop an energy source in";
+			mes "exchange for funding. The";
+			mes "result of his work for them is the invention of the Rune Stone.";
+			next;
+			mes "[Ferlock]";
+			mes "However, the public isn't";
+			mes "supposed to know that Varmunt";
+			mes "invented the Rune Stones. Now,";
+			mes "Varmunt disappeared before he";
+			mes "could perfect the Rune Stone";
+			mes "creation process.";
+			next;
+			mes "[Ferlock]";
+			mes "Therefore, the Rune Stones";
+			mes "we have now are unstable and";
+			mes "become useless after a while.";
+			mes "The Varmunt Project aims to";
+			mes "correct these flaws and perfect";
+			mes "the Ymir Heart replication...";
+			next;
+			mes "[Ferlock]";
+			mes "Er, anyway, that's why";
+			mes "I was at the Einbroch";
+			mes "Laboratory today. My Rune";
+			mes "Stone was close to empty,";
+			mes "so I went there to pick up";
+			mes "a fully charged one.";
+			next;
+			mes "[Ferlock]";
+			mes "^333333*Phew...*^000000";
+			mes "Would you give me";
+			mes "a moment to catch";
+			mes "my breath before";
+			mes "I continue? Yes,";
+			mes "there's a little more...";
+			set lhz_heart,12;
+			close2;
+			cutin "",255;
+			end;
 		}
-	}
-	else if(lght_air == 7 && lhz_heart == 12)
-	{
+	} else if (lght_air == 7 && lhz_heart == 12) {
 		mes "[Ferlock]";
 		mes "Now, "+strcharinfo(0)+",";
 		mes "you must be wondering";
@@ -2062,12 +2155,13 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 		specialeffect2 EF_ABSORBSPIRITS;
 		completequest 8043;
 		set lhz_heart,13;
-		getexp 70000,40000;
+		if (checkre(3))
+			getexp 70000,40000;
+		else
+			getexp 700000,400000;
 		cutin "",255;
 		end;
-	}
-	else if(lght_air == 7 && lhz_heart == 13)
-	{
+	} else if (lght_air == 7 && lhz_heart == 13) {
 		mes "[Ferlock]";
 		mes "I'll be quite busy with my";
 		mes "captaining duties and my";
@@ -2085,16 +2179,16 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 	mes "on this flight. How can";
 	mes "I be of service to you?";
 	next;
-	if(lght_air == 2) {
+	if (lght_air == 2) {
 		set .@question2$, "Give him Tarlock's Letter.";
 		set .@question3$, "Cancel.";
-	} else if(lght_air == 3) {
+	} else if (lght_air == 3) {
 		set .@question2$, "Here are the items I've found.";
 		set .@question3$, "Cancel.";
 	} else {
 		set .@question2$, "Cancel.";
 	}
-	switch( select( "How does this Airship fly?", .@question2$, .@question3$)) {
+	switch(select("How does this Airship fly?", .@question2$, .@question3$)) {
 	case 1:
 		mes "[Ferlock]";
 		mes "I'm sorry, but I can't";
@@ -2106,7 +2200,6 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 		close2;
 		cutin "",255;
 		end;
-		
 	case 2:
 		if (lght_air == 2) {
 			changequest 8032,8033;
@@ -2171,7 +2264,7 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 			close2;
 			cutin "",255;
 			end;
-		} else if(lght_air == 3) {
+		} else if (lght_air == 3) {
 			if (countitem(7340) >= 2 && countitem(576) >= 2) {
 				delitem 7340, 2;
 				delitem 576, 2;
@@ -2227,32 +2320,23 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 	}
 }
 
-//=======================================================================================================//
-//				Heart Fragment Quest
-//=======================================================================================================//
-
+// Heart Fragment Quest :: lght_ymir
+//============================================================
 airplane,236,63,4	script	Hallen	706,{
-
-	if(hg_ma1 == 3)
-	{
+	if (hg_ma1 == 3) {
 		mes "[Hallen]";
 		mes "Sha Sha~ ";
 		next;
 		mes "[Hallen]";
 		mes "Just let me handle this! Hehe. ";
 		next;
-		switch( select( "Ask whether he knows Thierry" ) )
-		{
-			case 1:
-				break;
-		}
+		select("Ask whether he knows Thierry");
 		mes "[Hallen]";
 		mes "Hmm?! Thierry?! I'm not sure. Why don't you ask the crew of the airship.";
 		mes "Kaci might know this person.";
 		close;
 	}
-	if(BaseLevel < 60)
-	{
+	if (BaseLevel < 60) {
 		mes "[Hallen]";
 		mes "If you need me to";
 		mes "do anything, just";
@@ -2260,57 +2344,50 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "Bweh heh... hollah~";
 		close;
 	}
-	if(!lhz_heart)
-	{
+	if (!lhz_heart) {
 		mes "[Hallen]";
 		mes "Howdy, howdy~";
 		mes "Welcome to the Airship.";
 		next;
-		switch( select( "I'm not a passenger.","Hey kid, what are you doing?" ) )
-		{
-			case 1:
-				emotion e_what,0;
-				mes "[Hallen]";
-				mes "Does that mean you're";
-				mes "one of the crewmen, then?";
-				mes "I don't think we've met before,";
-				mes "and I should be familiar with";
-				mes "everyone working here by now...";
-				next;
-				emotion e_gasp,0;
-				mes "[Hallen]";
-				mes "Hey...!";
-				mes "If you're on duty,";
-				mes "shouldn't you be in";
-				mes "uniform? I guess you";
-				mes "don't work here after all!";
-				mes "Heh, figured it out myself~";
-				next;
-				mes "[Hallen]";
-				mes "Eh, I need to finish";
-				mes "sweeping this deck. Then,";
-				mes "on my break, I can play a";
-				mes "little game for Apples with";
-				mes "Kaci. That's how I roll, yo.";
-				next;
-				break;
-				
-			case 2:
-				mes "[Hallen]";
-				mes "Ummm... Isn't it obvious?";
-				mes "I'm sweeping the deck. I'm";
-				mes "the youngest crewman, so";
-				mes "I get stuck with the lamest";
-				mes "jobs. But once I'm done, it's";
-				mes "Dice time with Kaci. Oh yeah~";
-				next;
-				break;
-		}
-		switch( select( "Kaci?" ) )
-		{
-			case 1:
-				break;
+		switch(select("I'm not a passenger.:Hey kid, what are you doing?")) {
+		case 1:
+			emotion e_what,0;
+			mes "[Hallen]";
+			mes "Does that mean you're";
+			mes "one of the crewmen, then?";
+			mes "I don't think we've met before,";
+			mes "and I should be familiar with";
+			mes "everyone working here by now...";
+			next;
+			emotion e_gasp,0;
+			mes "[Hallen]";
+			mes "Hey...!";
+			mes "If you're on duty,";
+			mes "shouldn't you be in";
+			mes "uniform? I guess you";
+			mes "don't work here after all!";
+			mes "Heh, figured it out myself~";
+			next;
+			mes "[Hallen]";
+			mes "Eh, I need to finish";
+			mes "sweeping this deck. Then,";
+			mes "on my break, I can play a";
+			mes "little game for Apples with";
+			mes "Kaci. That's how I roll, yo.";
+			next;
+			break;
+		case 2:
+			mes "[Hallen]";
+			mes "Ummm... Isn't it obvious?";
+			mes "I'm sweeping the deck. I'm";
+			mes "the youngest crewman, so";
+			mes "I get stuck with the lamest";
+			mes "jobs. But once I'm done, it's";
+			mes "Dice time with Kaci. Oh yeah~";
+			next;
+			break;
 		}
+		select("Kaci?");
 		mes "[Hallen]";
 		mes "Kaci... You know, the";
 		mes "dealer of the Dice game?";
@@ -2329,9 +2406,7 @@ airplane,236,63,4	script	Hallen	706,{
 		close2;
 		set lhz_heart,1;
 		end;
-	}
-	else if(lhz_heart == 1)
-	{
+	} else if (lhz_heart == 1) {
 		mes "[Hallen]";
 		mes "Oh hey, it's you~";
 		mes "We talked earlier,";
@@ -2349,49 +2424,45 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "me a favor since I can't";
 		mes "really leave this joint?";
 		next;
-		switch( select( "Sorry, but I'm busy...","What is it?" ) )
-		{
-			case 1:
-				mes "[Hallen]";
-				mes "Eh, alright. I guess";
-				mes "I can understand. But";
-				mes "still, I coulda made it";
-				mes "worth your while, if you";
-				mes "know what I mean~";
-				close;
-
-			case 2:
-				mes "[Hallen]";
-				mes "Don't worry, it's not much";
-				mes "work. I'm supposed to deliver";
-				mes "letters from Juno Airport to";
-				mes "the other crewmen, but I don't";
-				mes "got the time. Now, I have";
-				mes "this letter for Kaci here...";
-				next;
-				mes "[Hallen]";
-				mes "Would you go and";
-				mes "deliver this letter";
-				mes "to her for me? It's";
-				mes "from some guy named";
-				mes "Mr. Mawong, her mentor";
-				mes "or something like that.";
-				next;
-				mes "^3355FFHallen gave you";
-				mes "Mawong's letter to";
-				mes "be delivered to Kaci.^000000";
-				setquest 8036;
-				set lhz_heart,2;
-				next;
-				mes "[Hallen]";
-				mes "Hey, thanks a lot, pal~";
-				mes "You can find Kaci hosting";
-				mes "the Dice game in the Airship.";
-				close;
+		switch(select("Sorry, but I'm busy...:What is it?")) {
+		case 1:
+			mes "[Hallen]";
+			mes "Eh, alright. I guess";
+			mes "I can understand. But";
+			mes "still, I coulda made it";
+			mes "worth your while, if you";
+			mes "know what I mean~";
+			close;
+		case 2:
+			mes "[Hallen]";
+			mes "Don't worry, it's not much";
+			mes "work. I'm supposed to deliver";
+			mes "letters from Juno Airport to";
+			mes "the other crewmen, but I don't";
+			mes "got the time. Now, I have";
+			mes "this letter for Kaci here...";
+			next;
+			mes "[Hallen]";
+			mes "Would you go and";
+			mes "deliver this letter";
+			mes "to her for me? It's";
+			mes "from some guy named";
+			mes "Mr. Mawong, her mentor";
+			mes "or something like that.";
+			next;
+			mes "^3355FFHallen gave you";
+			mes "Mawong's letter to";
+			mes "be delivered to Kaci.^000000";
+			setquest 8036;
+			set lhz_heart,2;
+			next;
+			mes "[Hallen]";
+			mes "Hey, thanks a lot, pal~";
+			mes "You can find Kaci hosting";
+			mes "the Dice game in the Airship.";
+			close;
 		}
-	}
-	else if(lhz_heart == 2)
-	{
+	} else if (lhz_heart == 2) {
 		mes "[Hallen]";
 		mes "^333333*Sigh...*^000000";
 		mes "I'm so sick and";
@@ -2408,9 +2479,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "important, so try not";
 		mes "to take too long, okay?";
 		close;
-	}
-	else if(lhz_heart == 3)
-	{
+	} else if (lhz_heart == 3) {
 		mes "[Hallen]";
 		mes "^333333*Sigh...*^000000";
 		mes "I'm so sick and";
@@ -2419,9 +2488,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "kinda lame cabin boy.";
 		mes "But... I guess I am!";
 		close;
-	}
-	else if(lhz_heart == 4)
-	{
+	} else if (lhz_heart == 4) {
 		mes "[Hallen]";
 		mes "Hey, thanks for delivering";
 		mes "that letter to Kaci for me.";
@@ -2436,49 +2503,44 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "help each other in";
 		mes "times of crisis?";
 		next;
-		switch( select( "Not at all. Every man for himself!","Yes, I do." ) )
-		{
-			case 1:
-				mes "[Hallen]";
-				mes "Wh-what...?";
-				mes "I can't think";
-				mes "that you really";
-				mes "believe that...";
-				set lhz_heart,5;
-				close;
-
-			case 2:
-				mes "[Hallen]";
-				mes "Aww, really?";
-				mes "I knew that you'd";
-				mes "feel the same way";
-				mes "I do. You and me, we're";
-				mes "on the same wavelength~";
-				next;
-				if(checkweight(501,1) != 1)
-				{
-					mes "[Hallen]";
-					mes "Oh... Hey, I was";
-					mes "going to give you";
-					mes "a little something,";
-					mes "but you're carrying";
-					mes "too much stuff right now...";
-					close;
-				}
-				set lhz_heart,5;
-				getitem 501,1;
+		switch(select("Not at all. Every man for himself!:Yes, I do.")) {
+		case 1:
+			mes "[Hallen]";
+			mes "Wh-what...?";
+			mes "I can't think";
+			mes "that you really";
+			mes "believe that...";
+			set lhz_heart,5;
+			close;
+		case 2:
+			mes "[Hallen]";
+			mes "Aww, really?";
+			mes "I knew that you'd";
+			mes "feel the same way";
+			mes "I do. You and me, we're";
+			mes "on the same wavelength~";
+			next;
+			if (checkweight(501,1) != 1) {
 				mes "[Hallen]";
-				mes "I know this isn't";
-				mes "much, but I'd like you";
-				mes "to have it. Besides, you";
-				mes "never know what'll come in";
-				mes "handy during an emergency.";
-				mes "Alright then, see you later~";
+				mes "Oh... Hey, I was";
+				mes "going to give you";
+				mes "a little something,";
+				mes "but you're carrying";
+				mes "too much stuff right now...";
 				close;
+			}
+			set lhz_heart,5;
+			getitem 501,1;
+			mes "[Hallen]";
+			mes "I know this isn't";
+			mes "much, but I'd like you";
+			mes "to have it. Besides, you";
+			mes "never know what'll come in";
+			mes "handy during an emergency.";
+			mes "Alright then, see you later~";
+			close;
 		}
-	}
-	else if(lhz_heart == 5)
-	{
+	} else if (lhz_heart == 5) {
 		mes "[Hallen]";
 		mes "Hey, hey~ How's it going?";
 		mes "I know, I know, I'm supposed";
@@ -2511,11 +2573,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "course, I doubt I can compare";
 		mes "to the great Sage Varmunt.";
 		next;
-		switch( select( "Sage Varmunt?" ) )
-		{
-			case 1:
-				break;
-		}
+		select("Sage Varmunt?");
 		mes "[Hallen]";
 		mes "Yeah, Varmunt... He's like";
 		mes "one of the greatest Sages in";
@@ -2547,22 +2605,15 @@ airplane,236,63,4	script	Hallen	706,{
 		changequest 8038,8039;
 		set lhz_heart,6;
 		close;
-	}
-	else if(lhz_heart == 6)
-	{
+	} else if (lhz_heart == 6) {
 		mes "[Hallen]";
 		mes "Hey, have you learned";
 		mes "what makes such a big,";
 		mes "heavy Airship like this fly";
 		mes "for so long in the sky?";
 		next;
-		if(lght_air == 7)
-		{
-			switch( select( "Umm, yeah, kind of." ) )
-			{
-				case 1:
-					break;
-			}
+		if (lght_air == 7) {
+			select("Umm, yeah, kind of.");
 			mes "[Hallen]";
 			mes "Really...?";
 			mes "Are you serious?";
@@ -2582,11 +2633,7 @@ airplane,236,63,4	script	Hallen	706,{
 			mes "No way, it can't be that simple. Besides, steam has its limits.";
 			mes "Are you sure that's everything?";
 			next;
-			switch( select( "Actually, there's another power source." ) )
-			{
-				case 1:
-					break;
-			}
+			select("Actually, there's another power source.");
 			mes "^3355FFYou reveal what you";
 			mes "learn about the Rune Stone,";
 			mes "an imitation of Ymir's Heart";
@@ -2610,14 +2657,8 @@ airplane,236,63,4	script	Hallen	706,{
 			changequest 8039,8040;
 			set lhz_heart,7;
 			close;
-		}
-		else
-		{
-			switch( select( "Actually..." ) )
-			{
-				case 1:
-					break:;
-			}
+		} else {
+			select("Actually...");
 			mes "[Hallen]";
 			mes "You didn't learn anything";
 			mes "about the Airship yet, huh?";
@@ -2634,9 +2675,7 @@ airplane,236,63,4	script	Hallen	706,{
 			mes "it'll be one of you adventurers. So please help me out here...";
 			close;
 		}
-	}
-	else if(lhz_heart == 7)
-	{
+	} else if (lhz_heart == 7) {
 		mes "[Hallen]";
 		mes "So the Rune Stone";
 		mes "is an imitation of just";
@@ -2653,8 +2692,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "when he plays the Dice";
 		mes "game for Apples!";
 		next;
-		if(Shinokas_Quest > 9)
-		{
+		if (Shinokas_Quest > 9) {
 			mes "["+strcharinfo(0)+"]";
 			mes "(^333333Wait, I met that guy when";
 			mes "I was helping Shinokas. He";
@@ -2671,8 +2709,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "the trouble of learning that";
 		mes "secret information for me...";
 		next;
-		if(checkweight(501,1) != 1)
-		{
+		if (checkweight(501,1) != 1) {
 			mes "[Hallen]";
 			mes "Aw, nuts...";
 			mes "You don't have";
@@ -2682,7 +2719,7 @@ airplane,236,63,4	script	Hallen	706,{
 			mes "in your inventory for me, okay?";
 			close;
 		}
-		if(Shinokas_Quest > 9) set lhz_heart,9;
+		if (Shinokas_Quest > 9) set lhz_heart,9;
 		else set lhz_heart,8;
 		changequest 8040,8041;
 		getitem 501,1;
@@ -2694,9 +2731,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "but hey... It's my thought that";
 		mes "counts, right? See you later~";
 		close;
-	}
-	else if(lhz_heart == 8)
-	{
+	} else if (lhz_heart == 8) {
 		mes "[Hallen]";
 		mes "Hey, why don't you";
 		mes "ask Kaci about that";
@@ -2705,9 +2740,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "You might learn more about";
 		mes "Ymir's Heart Piece, you know?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Hallen]";
 		mes "Thanks for helping me";
 		mes "out that last time. I guess";
@@ -2719,17 +2752,11 @@ airplane,236,63,4	script	Hallen	706,{
 }
 
 airplane,33,69,4	script	Kaci	73,{
-
-	if(hg_ma1 == 3)
-	{
+	if (hg_ma1 == 3) {
 		mes "[Kaci]";
 		mes "Hello there. My name is Kaci. If you feel bored boarding the airship, why don't you play a game of dice with me.";
 		next;
-		switch( select( "Ask whether she knows Thierry" ) )
-		{
-			case 1:
-				break;
-		}
+		select("Ask whether she knows Thierry");
 		mes "[Kaci]";
 		mes "Thierry ....That name sounds familiar...";
 		next;
@@ -2782,26 +2809,18 @@ airplane,33,69,4	script	Kaci	73,{
 		changequest 8044,8045;
 		set hg_ma1,4;
 		close;
-	}
-	else if(hg_ma1 == 4)
-	{
+	} else if (hg_ma1 == 4) {
 		mes "[Kaci]";
 		mes "You can ask the captain for the whereabouts of Thierry. I am sure that the captain will be willing to help if you tell him what happened.";
 		close;
-	}
-	else if(lhz_heart == 2)
-	{
+	} else if (lhz_heart == 2) {
 		mes "[Kaci]";
 		mes "You must be sooo";
 		mes "bored, adventurer~";
 		mes "How would you like";
 		mes "to play a game of Dice?";
 		next;
-		switch( select( "Give her the letter from Hallen." ) )
-		{
-			case 1:
-				break;
-		}
+		select("Give her the letter from Hallen.");
 		mes "[Kaci]";
 		mes "Oh, Hallen must have";
 		mes "asked you to deliver this.";
@@ -2819,9 +2838,7 @@ airplane,33,69,4	script	Kaci	73,{
 		mes "me, feel free to ask me,";
 		mes "alright? See you later~";
 		close;
-	}
-	else if(lhz_heart == 3)
-	{
+	} else if (lhz_heart == 3) {
 		mes "[Kaci]";
 		mes "Oh, hello. Thanks for";
 		mes "delivering that letter from";
@@ -2831,80 +2848,77 @@ airplane,33,69,4	script	Kaci	73,{
 		mes "letter really made my day~";
 		next;
 L_Ask:
-		switch( select( "Ask about Hallen","Ask about Mawong","Ask about the Airship" ) )
-		{
-			case 1:
-				set .@mesa,1;
-				mes "[Kaci]";
-				mes "Hallen? Well, he and I are";
-				mes "pretty close. Did you know";
-				mes "that we're cousins? In fact,";
-				mes "his dad, my uncle, brought";
-				mes "me as a child after my father";
-				mes "passed away 20 years ago.";
-				next;
-				mes "[Kaci]";
-				mes "There was some kind of";
-				mes "mine explosion accident in";
-				mes "Einbech. I don't remember.";
-				mes "Anyway, me and Hallen are";
-				mes "like sister and brother, and";
-				mes "we always stick together.";
-				next;
-				mes "[Kaci]";
-				mes "When Captain Ferlock saw me";
-				mes "host a Dice game by coincidence";
-				mes "and then hired me to work on his Airship, Hallen insisted on coming";
-				mes "along. He's stubborn like that,";
-				mes "but he's also very sweet.";
-				next;
-				break;
-				
-			case 2:
-				set .@mesb,1;
-				mes "[Kaci]";
-				mes "Mr. Mawong? Oh, don't get";
-				mes "the wrong idea! He's my";
-				mes "mentor, the one who taught";
-				mes "me how to play all of these";
-				mes "wonderful games. He's pretty";
-				mes "famous around Juno, you know.";
-				next;
-				mes "[Kaci]";
-				mes "I used to be so depressed,";
-				mes "not caring about the world";
-				mes "at all, after my father died.";
-				mes "Then, I ran into Mr. Mawong,";
-				mes "and he taught me how to find";
-				mes "the joy in life once again.";
-				next;
-				mes "[Kaci]";
-				mes "Because of him, I decided";
-				mes "to learn his games and to";
-				mes "help people forget their";
-				mes "worries and just enjoy";
-				mes "themselves, even if it's";
-				mes "just for a little while.";
-				next;
-				break;
-				
-			case 3:
-				set .@mesc,1;
-				mes "[Kaci]";
-				mes "The Airship? It's so";
-				mes "huge and beautiful, and";
-				mes "I'm always amazed that it";
-				mes "can fly so gracefully through";
-				mes "the air. I've always wanted to live someplace close to the sky...";
-				next;
-				mes "[Kaci]";
-				mes "A place where I can see";
-				mes "the clouds and bask in the";
-				mes "sun. So, when Captain Ferlock";
-				mes "invited me to work here, it was";
-				mes "like a dream come true~";
-				next;
-				break;
+		switch(select("Ask about Hallen:Ask about Mawong:Ask about the Airship")) {
+		case 1:
+			set .@mesa,1;
+			mes "[Kaci]";
+			mes "Hallen? Well, he and I are";
+			mes "pretty close. Did you know";
+			mes "that we're cousins? In fact,";
+			mes "his dad, my uncle, brought";
+			mes "me as a child after my father";
+			mes "passed away 20 years ago.";
+			next;
+			mes "[Kaci]";
+			mes "There was some kind of";
+			mes "mine explosion accident in";
+			mes "Einbech. I don't remember.";
+			mes "Anyway, me and Hallen are";
+			mes "like sister and brother, and";
+			mes "we always stick together.";
+			next;
+			mes "[Kaci]";
+			mes "When Captain Ferlock saw me";
+			mes "host a Dice game by coincidence";
+			mes "and then hired me to work on his Airship, Hallen insisted on coming";
+			mes "along. He's stubborn like that,";
+			mes "but he's also very sweet.";
+			next;
+			break;
+		case 2:
+			set .@mesb,1;
+			mes "[Kaci]";
+			mes "Mr. Mawong? Oh, don't get";
+			mes "the wrong idea! He's my";
+			mes "mentor, the one who taught";
+			mes "me how to play all of these";
+			mes "wonderful games. He's pretty";
+			mes "famous around Juno, you know.";
+			next;
+			mes "[Kaci]";
+			mes "I used to be so depressed,";
+			mes "not caring about the world";
+			mes "at all, after my father died.";
+			mes "Then, I ran into Mr. Mawong,";
+			mes "and he taught me how to find";
+			mes "the joy in life once again.";
+			next;
+			mes "[Kaci]";
+			mes "Because of him, I decided";
+			mes "to learn his games and to";
+			mes "help people forget their";
+			mes "worries and just enjoy";
+			mes "themselves, even if it's";
+			mes "just for a little while.";
+			next;
+			break;
+		case 3:
+			set .@mesc,1;
+			mes "[Kaci]";
+			mes "The Airship? It's so";
+			mes "huge and beautiful, and";
+			mes "I'm always amazed that it";
+			mes "can fly so gracefully through";
+			mes "the air. I've always wanted to live someplace close to the sky...";
+			next;
+			mes "[Kaci]";
+			mes "A place where I can see";
+			mes "the clouds and bask in the";
+			mes "sun. So, when Captain Ferlock";
+			mes "invited me to work here, it was";
+			mes "like a dream come true~";
+			next;
+			break;
 		}
 		mes "[Kaci]";
 		mes "Please don't hesitate";
@@ -2913,7 +2927,7 @@ L_Ask:
 		mes "or if you're just curious";
 		mes "about me in general~";
 		next;
-		if(!.@mesa || !.@mesb || !.@mesc) goto L_Ask;
+		if (!.@mesa || !.@mesb || !.@mesc) goto L_Ask;
 		mes "[Kaci]";
 		mes "By the way, if Hallen";
 		mes "bothers you with another";
@@ -2930,20 +2944,14 @@ L_Ask:
 		changequest 8037,8038;
 		set lhz_heart,4;
 		close;
-	}
-	else if(lhz_heart == 8)
-	{
+	} else if (lhz_heart == 8) {
 		mes "[Kaci]";
 		mes "Hello, "+strcharinfo(0)+".";
 		mes "It's nice to see you again.";
 		mes "So is there anything I can";
 		mes "help you with today?";
 		next;
-		switch( select( "Who's that drunk over there?" ) )
-		{
-			case 1:
-				break;
-		}
+		select("Who's that drunk over there?");
 		mes "[Kaci]";
 		mes "Oh, him? He's one of my";
 		mes "regulars, some guy who's";
@@ -2994,9 +3002,9 @@ L_Ask:
 }
 
 ein_in01,279,25,0	script	#lab01_heart	139,1,1,{
-
+	end;
 OnTouch:
-	if(lhz_heart == 9)
+	if (lhz_heart == 9)
 	{
 		mes "["+strcharinfo(0)+"]";
 		mes "(^333333I've... I've just";
@@ -3009,9 +3017,9 @@ OnTouch:
 }
 
 ein_in01,264,17,0	script	#lab02_heart	139,1,1,{
-
+	end;
 OnTouch:
-	if(lhz_heart == 9)
+	if (lhz_heart == 9)
 	{
 		mes "["+strcharinfo(0)+"]";
 		mes "What the...";
@@ -3049,17 +3057,16 @@ OnTimer120000:
 }
 
 ein_in01,261,35,0	script	lab03#heart	139,1,1,{
-
+	end;
 OnTouch:
-	if(lhz_heart == 9) {
+	if (lhz_heart == 9) {
 		mes "[Security System]";
 		mes "^FF0000Unauthorized person";
 		mes "detected. Password";
 		mes "Checker not detected.";
 		mes "Access denied.^000000";
 		close;
-	}
-	else if(lhz_heart == 10) {
+	} else if (lhz_heart == 10) {
 		mes "[Security System]";
 		mes "^FF0000Enter the 3 digit password.";
 		mes "You will be allowed 5 tries";
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 6dc4fd0ad..961fdbca0 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -1,10 +1,10 @@
-//===== Hercules Script ====================================== 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Alberta
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
-//= 2.5
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.6
+//===== Description: =========================================
 //= [Official Conversion]
 //= Dolls Quest
 //= Boy's Cap Quest
@@ -13,24 +13,25 @@
 //= Hat of Sun God, Sunday Hat, Mage Hat, Magician Hat Quests
 //= Turtle Island Quests
 //= Alberta Boy
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed Spore Doll exploit, Gramp's Tiger skin label bug
 //= 1.3 Fixed item ID 7031 -> 7013
 //= 1.4 Fixed a bug, Fixed Exploits, Optimized [Lupus]
 //= 1.6 TEMPESTRA quest uses common quests variable MISC_QUEST 
-//=	Condition if done: (MISC_QUEST & 2) [Lupus]
+//=     Condition if done: (MISC_QUEST & 2) [Lupus]
 //= 1.7 Moved quest from cities/albera.txt [Evera]
 //= 1.8 Re-made the Doll Quest, now with official dialogs. [DZeroX]
 //= 1.8a Removed .GATs [Lupus]
 //= 1.9 Updated Turtle Quest to official. [L0ne_W0lf]
 //= 2.0 Turtle Island quest now clears TURTLE var and set 
-//= MISC_QUEST bit (MISC_QUEST & 65536) [Lupus]
+//=     MISC_QUEST bit (MISC_QUEST & 65536) [Lupus]
 //= 2.1 Added missing close. [L0ne_W0lf]
 //= 2.2 Updated Gotan to be compliant with misc_quiest var. [L0ne_W0lf]
 //= 2.3 Updated heardgear Quest NPCs. [L0ne_W0lf]
 //= 2.4 Updated 'Doll Quest' to match AEGIS script. [Kisuka]
 //= 2.5 Moved Alberta NPC to pre-re/re paths. [Euphy]
-//============================================================ 
+//= 2.6 Updated RE/Pre-RE EXP. [Euphy]
+//============================================================
 
 // Doll Quest
 //============================================================
@@ -51,337 +52,336 @@ alberta,117,135,0	script	Elin	96,{
 	mes "[Elin]";
 	mes "You know, I really really want a new doll! I hope my daddy will give me one on my birthday...!";
 	next;
-	switch(select("Um, I hope your daddy gives you one too.","How about I give you one now?")) {
-		case 1:
+	switch(select("Um, I hope your daddy gives you one too.:How about I give you one now?")) {
+	case 1:
+		mes "[Elin]";
+		mes "Yeah, I'm hoping";
+		mes "he gives me a Yoyo";
+		mes "doll. They're so cute!";
+		close;
+	case 2:
+		if (MaxWeight - Weight < 1000) {
 			mes "[Elin]";
-			mes "Yeah, I'm hoping";
-			mes "he gives me a Yoyo";
-			mes "doll. They're so cute!";
+			if (Sex == 1) {
+				mes "Maybe you should put some of your stuff away first, you look like you're carrying too much, hee hee~";
+			} else {
+				mes "Do you always carry so much with you? Put some of your things away first, okay?";
+			}
 			close;
+		}
+		mes "[Elin]";
+		if (Sex == 1) {
+			mes "Oh my goodness!";
+			mes "Really? You're";
+			mes "such a sweetie~!";
+		} else {
+			mes "Will you really?";
+			mes "You're gonna give";
+			mes "me a doll? Yaaaay~";
+		}
+		next;
+		mes "[Elin]";
+		mes "What kind of doll are you going to give me? Are you really gonna give me one?";
+		next;
+		switch(select("Poring Doll:Chonchon Doll:Puppet:Rocker Doll:Spore Doll:Osiris Doll:Baphomet Doll:Raccoon Doll:Yoyo Doll:I'm as adorable as a doll.")) {
+		case 1:
+			if (countitem(741) >= 1) {
+				delitem 741,1; //Poring_Doll
+				mes "[Elin]";
+				mes "Aww...";
+				mes "I have a lot";
+				mes "of Poring dolls...";
+				next;
+				mes "[Elin]";
+				if (Sex == 1) {
+					mes "But since a cute boy is giving it to me, I'll happily take it! Hee hee, soft and fluffy Poring doll~";
+				} else {
+					mes "But since a nice girl is giving it to me, I'll take it! Hee he, soft and fluffy Poring doll~";
+				}
+				next;
+				mes "[Elin]";
+				mes "Ooh, let me give you something as a little thank you. You see, I hid some candy so I can eat it without telling mommy.";
+				next;
+				getitem 529,1; //Candy
+				mes "[Elin]";
+				if (Sex == 1) {
+					mes "I don't know if you're too old to like candy, but I guess it's okay.";
+				} else {
+					mes "So, try not to eat too much, okay? Otherwise, you might get in trouble!";
+				}
+				next;
+				mes "[Elin]";
+				mes "Thank you";
+				mes "so much for";
+				mes "the Poring doll!";
+				close;
+			} else {
+				mes "[Elin]";
+				if (Sex == 1) {
+					mes "Aww...?";
+					mes "Were you only teasing me?";
+				} else {
+					mes "Aww...";
+					mes "You're not making fun of me are you?";
+				}
+				next;
+				mes "[Elin]";
+				mes "I guess you forgot it somewhere...";
+				close;
+			}
 		case 2:
-			set .@weight,MaxWeight-Weight;
-			if ((.@weight) < 1000) {
+			if (countitem(742) >= 1) {
+				delitem 742,1; //Chonchon_Doll
+				mes "[Elin]";
+				mes "Agh--!";
+				mes "A Ch-Ch, Chonchon doll?!";
+				next;
 				mes "[Elin]";
 				if (Sex == 1) {
-					mes "Maybe you should put some of your stuff away first, you look like you're carrying too much, hee hee~";
+					mes "But since... You're... Such a nice guy... I better take it...!";
 				} else {
-					mes "Do you always carry so much with you? Put some of your things away first, okay?";
+					mes "But since... Since it's a gift... I guess I'll take it...";
 				}
+				next;
+				mes "[Elin]";
+				mes "Mmm~";
+				mes "Let me give you";
+				mes "something in return...";
+				next;
+				getitem 530,1; //Candy_Striper
+				mes "[Elin]";
+				mes "If you eat too much, your teeth will start to rot... at least, that's what Mommy says.";
+				next;
+				mes "[Elin]";
+				mes "And..";
+				mes "Uh...";
+				mes "Thank you";
+				mes "for the doll?";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Chonchon dolls are ugly anyways, but you still lied to me! How can you be so mean?!";
+				next;
+				mes "[Elin]";
+				mes "Waaaaaaaaah~~";
 				close;
 			}
-			mes "[Elin]";
-			if (Sex == 1) {
-				mes "Oh my goodness!";
-				mes "Really? You're";
-				mes "such a sweetie~!";
+		case 3:
+			if (countitem(740) >= 1) {
+				delitem 740,1; //Stuffed_Doll
+				mes "[Elin]";
+				mes "Wow...!";
+				mes "It looks like a bunny!";
+				next;
+				mes "[Elin]";
+				mes "I really like this Puppet~ Heh hehe! Thank you so much~";
+				next;
+				mes "[Elin]";
+				mes "Ooh ooh!";
+				mes "I have something";
+				mes "for you too!";
+				mes "Um, where";
+				mes "did it... Ah!";
+				next;
+				getitem 530,1; //Candy_Striper
+				mes "[Elin]";
+				mes "Here it is! It's some of the candy Santa gave me. Go ahead and try some! Oh, and thank you so much for the doll!";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Awww, you were only kidding? W-W-Why are you teasing me like that?";
+				next;
+				mes "[Elin]";
+				mes "^666666*Sniff...*^000000";
+				next;
+				mes "[Elin]";
+				mes "Waaaaaaaaah~~";
+				close;
+			}
+		case 4:
+			if (countitem(752) >= 1) {
+				delitem 752,1; //Grasshopper_Doll
+				mes "[Elin]";
+				mes "Ooh! Rocker Doll!";
+				mes "It's the Rocker that likes singing and dancing! I don't like grasshoppers, but I like this because it's cute~";
+				next;
+				mes "[Elin]";
+				mes "Hmmm, I should give you something too, huh? Let's see, I have what my grandpa gave me...";
+				next;
+				getitem 532,7; //Banana_Juice
+				mes "[Elin]";
+				mes "Here you go! We have a lot of this at home, so I'll give it to you, okay? Oh, and thank you so much for the doll~ I love cute dolls!";
+				close;
 			} else {
-				mes "Will you really?";
-				mes "You're gonna give";
-				mes "me a doll? Yaaaay~";
+				mes "[Elin]";
+				mes "Awww...";
+				next;
+				mes "[Elin]";
+				mes "You don't";
+				mes "really have a doll...?";
+				mes "I was so excited about it, too...";
+				close;
 			}
+		case 5:
+			if (countitem(743) >= 1) {
+				delitem 743,1; //Spore_Doll
+				mes "[Elin]";
+				mes "It's a mushroom?";
+				mes "Ewwwwwwwww, yucky!";
+				mes "Mommy made me eat";
+				mes "mushrooms today, too...";
+				next;
+				mes "[Elin]";
+				mes "But this doll is cute, so I'll take it. But I'm still not gonna eat mushrooms! Heh heh~";
+				next;
+				getitem 538,5; //Well_Baked_Cookie
+				mes "[Elin]";
+				mes "Hehe~ My mommy made this! It's really yummy. I love cookies, too. So try it, you'll like it! Hee hee!";
+				next;
+				mes "[Elin]";
+				mes "Thanks for";
+				mes "the doll! I'll";
+				mes "take good care of it!";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Eh...?";
+				mes "You don't";
+				mes "have a doll?";
+				next;
+				mes "[Elin]";
+				mes "Awww...";
+				mes "It's not nice";
+				mes "to tease people";
+				mes "like that. ^666666*Sniff, sniff*^000000";
+				close;
+			}
+		case 6:
+			if (countitem(751) >= 1) {
+				delitem 751,1; //Osiris_Doll
+				mes "[Elin]";
+				mes "Ahhhhh!";
+				mes "What is this";
+				mes "thing?! It's so scary!";
+				next;
+				mes "[Elin]";
+				mes "I've never seen a doll like this before. Where it's from? Hmm? Since I've never seen this kind of doll before, I'm gonna show it to my daddy, too. Hehe~! He'll be surprised!";
+				next;
+				mes "[Elin]";
+				mes "Here, since you gave me such a nicely made doll, I better give you something good too.";
+				next;
+				getitem 522,2; //Fruit_Of_Mastela
+				mes "[Elin]";
+				mes "I found it when I secretly went to the forest. I took it because it has pretty colors!";
+				if (Sex == 1) {
+					mes "Since there's two, you can share it with your girlfriend. Hee hee~!";
+				} else {
+					mes "Since there's two, you can share it with your boyfriend. Hee hee~!";
+				}
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Awww...";
+				mes "Why do you have";
+				mes "to make fun of me?";
+				close;
+			}
+		case 7:
+			if (countitem(750) >= 1) {
+				delitem 750,1; //Baphomet_Doll
+				mes "[Elin]";
+				mes "Huh?";
+				mes "It's a little goat...";
+				next;
+				mes "[Elin]";
+				mes "It's so weird. It's cute but it's also scary at the same time. Well, since you gave me a pretty doll, I wanna give you something, too.";
+				next;
+				getitem 525,5; //Panacea
+				mes "[Elin]";
+				mes "My daddy gave me this when I was really sick. I'm not sick anymore so you can use it when you need to. Hehehe~";
+				next;
+				mes "[Elin]";
+				mes "Hee hee~";
+				mes "Thank you for";
+				mes "the doll. I won't lose it!";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "You big liar! Why are you pretending to be nice?!";
+				close;
+			}
+		case 8:
+			if (countitem(754) >= 1) {
+				delitem 754,1; //Raccoondog_Doll
+				mes "[Elin]";
+				mes "Hehe, it's a";
+				mes "raccoon doll.";
+				mes "It's very very cute~";
+				next;
+				mes "[Elin]";
+				mes "I don't like";
+				mes "Smokies in real life,";
+				mes "but this doll is nice!";
+				next;
+				getitem 539,3; //Piece_Of_Cake
+				mes "[Elin]";
+				mes "Here, let me give you some cake my grandma made. It's really yummy. I don't know if you like sweets or not, but it's really good! Please try some!";
+				next;
+				mes "[Elin]";
+				mes "Hee hee~";
+				mes "Thanks for the doll.";
+				mes "I'm gonna keep it";
+				mes "in my room!";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Hey! How come you have to say things like that? Are you making fun of me?!";
+				close;
+			}
+		case 9:
+			if (countitem(753) >= 1) {
+				delitem 753,1; //Monkey_Doll
+				mes "[Elin]";
+				mes "Woooooooow~!";
+				next;
+				mes "[Elin]";
+				mes "A Yoyo doll! It's so pretty! You're really gonna give it to me?! Yay! Thank you so much! I really like it! Hee hee!";
+				next;
+				mes "[Elin]";
+				mes "Since you gave";
+				mes "me such a pretty doll,";
+				mes "I wanna give you";
+				mes "something, too!";
+				next;
+				getitem 608,1; //Seed_Of_Yggdrasil
+				mes "[Elin]";
+				mes "My daddy picked it up on his way to another town. It looks like some kind of seed. I tried planting it in front of our house but it won't grow. Do you want to try?";
+				next;
+				mes "[Elin]";
+				mes "Hehe~";
+				mes "Thanks for";
+				mes "the doll. I'll hug";
+				mes "it before I go";
+				mes "to sleep!";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Hey...";
+				mes "How come you're making fun of me?!";
+				close;
+			}
+		case 10:
+			mes "["+strcharinfo(0)+"]";
+			mes "I'm as adorable as a doll...";
 			next;
 			mes "[Elin]";
-			mes "What kind of doll are you going to give me? Are you really gonna give me one?";
+			mes "Whaaaaaaaaaaat...?";
 			next;
-			switch(select("Poring Doll","Chonchon Doll","Puppet","Rocker Doll","Spore Doll","Osiris Doll","Baphomet Doll","Raccoon Doll","Yoyo Doll","I'm as adorable as a doll.")) {
-				case 1:
-					if (countitem(741) >= 1) {
-						delitem 741,1;	// Poring_Doll
-						mes "[Elin]";
-						mes "Aww...";
-						mes "I have a lot";
-						mes "of Poring dolls...";
-						next;
-						mes "[Elin]";
-						if (Sex == 1) {
-							mes "But since a cute boy is giving it to me, I'll happily take it! Hee hee, soft and fluffy Poring doll~";
-						} else {
-							mes "But since a nice girl is giving it to me, I'll take it! Hee he, soft and fluffy Poring doll~";
-						}
-						next;
-						mes "[Elin]";
-						mes "Ooh, let me give you something as a little thank you. You see, I hid some candy so I can eat it without telling mommy.";
-						next;
-						getitem 529,1;	// Candy
-						mes "[Elin]";
-						if (Sex == 1) {
-							mes "I don't know if you're too old to like candy, but I guess it's okay.";
-						} else {
-							mes "So, try not to eat too much, okay? Otherwise, you might get in trouble!";
-						}
-						next;
-						mes "[Elin]";
-						mes "Thank you";
-						mes "so much for";
-						mes "the Poring doll!";
-						close;
-					} else {
-						mes "[Elin]";
-						if (Sex == 1) {
-							mes "Aww...?";
-							mes "Were you only teasing me?";
-						} else {
-							mes "Aww...";
-							mes "You're not making fun of me are you?";
-						}
-						next;
-						mes "[Elin]";
-						mes "I guess you forgot it somewhere...";
-						close;
-					}
-				case 2:
-					if (countitem(742) >= 1) {
-						delitem 742,1;	// Chonchon_Doll
-						mes "[Elin]";
-						mes "Agh--!";
-						mes "A Ch-Ch, Chonchon doll?!";
-						next;
-						mes "[Elin]";
-						if (Sex == 1) {
-							mes "But since... You're... Such a nice guy... I better take it...!";
-						} else {
-							mes "But since... Since it's a gift... I guess I'll take it...";
-						}
-						next;
-						mes "[Elin]";
-						mes "Mmm~";
-						mes "Let me give you";
-						mes "something in return..."	;
-						next;
-						getitem 530,1;	// Candy_Striper
-						mes "[Elin]";
-						mes "If you eat too much, your teeth will start to rot... at least, that's what Mommy says.";
-						next;
-						mes "[Elin]";
-						mes "And..";
-						mes "Uh...";
-						mes "Thank you";
-						mes "for the doll?";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Chonchon dolls are ugly anyways, but you still lied to me! How can you be so mean?!";
-						next;
-						mes "[Elin]";
-						mes "Waaaaaaaaah~~";
-						close;
-					}
-				case 3:
-					if (countitem(740) >= 1) {
-						delitem 740,1;	// Stuffed_Doll
-						mes "[Elin]";
-						mes "Wow...!";
-						mes "It looks like a bunny!";
-						next;
-						mes "[Elin]";
-						mes "I really like this Puppet~ Heh hehe! Thank you so much~";
-						next;
-						mes "[Elin]";
-						mes "Ooh ooh!";
-						mes "I have something";
-						mes "for you too!";
-						mes "Um, where";
-						mes "did it... Ah!";
-						next;
-						getitem 530,1;	// Candy_Striper
-						mes "[Elin]";
-						mes "Here it is! It's some of the candy Santa gave me. Go ahead and try some! Oh, and thank you so much for the doll!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Awww, you were only kidding? W-W-Why are you teasing me like that?";
-						next;
-						mes "[Elin]";
-						mes "^666666*Sniff...*^000000";
-						next;
-						mes "[Elin]";
-						mes "Waaaaaaaaah~~";
-						close;
-					}
-				case 4:
-					if (countitem(752) >= 1) {
-						delitem 752,1;	// Grasshopper_Doll
-						mes "[Elin]";
-						mes "Ooh! Rocker Doll!";
-						mes "It's the Rocker that likes singing and dancing! I don't like grasshoppers, but I like this because it's cute~";
-						next;
-						mes "[Elin]";
-						mes "Hmmm, I should give you something too, huh? Let's see, I have what my grandpa gave me...";
-						next;
-						getitem 532,7;	// Banana_Juice
-						mes "[Elin]";
-						mes "Here you go! We have a lot of this at home, so I'll give it to you, okay? Oh, and thank you so much for the doll~ I love cute dolls!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Awww...";
-						next;
-						mes "[Elin]";
-						mes "You don't";
-						mes "really have a doll...?";
-						mes "I was so excited about it, too...";
-						close;
-					}
-				case 5:
-					if (countitem(743) >= 1) {
-						delitem 743,1;	// Spore_Doll
-						mes "[Elin]";
-						mes "It's a mushroom?";
-						mes "Ewwwwwwwww, yucky!";
-						mes "Mommy made me eat";
-						mes "mushrooms today, too...";
-						next;
-						mes "[Elin]";
-						mes "But this doll is cute, so I'll take it. But I'm still not gonna eat mushrooms! Heh heh~";
-						next;
-						getitem 538,5;	// Well_Baked_Cookie
-						mes "[Elin]";
-						mes "Hehe~ My mommy made this! It's really yummy. I love cookies, too. So try it, you'll like it! Hee hee!";
-						next;
-						mes "[Elin]";
-						mes "Thanks for";
-						mes "the doll! I'll";
-						mes "take good care of it!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Eh...?";
-						mes "You don't";
-						mes "have a doll?";
-						next;
-						mes "[Elin]";
-						mes "Awww...";
-						mes "It's not nice";
-						mes "to tease people";
-						mes "like that. ^666666*Sniff, sniff*^000000";
-						close;
-					}
-				case 6:
-					if (countitem(751) >= 1) {
-						delitem 751,1;	// Osiris_Doll
-						mes "[Elin]";
-						mes "Ahhhhh!";
-						mes "What is this";
-						mes "thing?! It's so scary!";
-						next;
-						mes "[Elin]";
-						mes "I've never seen a doll like this before. Where it's from? Hmm? Since I've never seen this kind of doll before, I'm gonna show it to my daddy, too. Hehe~! He'll be surprised!";
-						next;
-						mes "[Elin]";
-						mes "Here, since you gave me such a nicely made doll, I better give you something good too.";
-						next;
-						getitem 522,2;	// Fruit_Of_Mastela
-						mes "[Elin]";
-						mes "I found it when I secretly went to the forest. I took it because it has pretty colors!";
-						if (Sex == 1) {
-							mes "Since there's two, you can share it with your girlfriend. Hee hee~!";
-						} else {
-							mes "Since there's two, you can share it with your boyfriend. Hee hee~!";
-						}
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Awww...";
-						mes "Why do you have";
-						mes "to make fun of me?";
-						close;
-					}
-				case 7:
-					if (countitem(750) >= 1) {
-						delitem 750,1;	// Baphomet_Doll
-						mes "[Elin]";
-						mes "Huh?";
-						mes "It's a little goat...";
-						next;
-						mes "[Elin]";
-						mes "It's so weird. It's cute but it's also scary at the same time. Well, since you gave me a pretty doll, I wanna give you something, too.";
-						next;
-						getitem 525,5;	// Panacea
-						mes "[Elin]";
-						mes "My daddy gave me this when I was really sick. I'm not sick anymore so you can use it when you need to. Hehehe~";
-						next;
-						mes "[Elin]";
-						mes "Hee hee~";
-						mes "Thank you for";
-						mes "the doll. I won't lose it!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "You big liar! Why are you pretending to be nice?!";
-						close;
-					}
-				case 8:
-					if (countitem(754) >= 1) {
-						delitem 754,1;	// Raccoondog_Doll
-						mes "[Elin]";
-						mes "Hehe, it's a";
-						mes "raccoon doll.";
-						mes "It's very very cute~";
-						next;
-						mes "[Elin]";
-						mes "I don't like";
-						mes "Smokies in real life,";
-						mes "but this doll is nice!";
-						next;
-						getitem 539,3;	// Piece_Of_Cake
-						mes "[Elin]";
-						mes "Here, let me give you some cake my grandma made. It's really yummy. I don't know if you like sweets or not, but it's really good! Please try some!";
-						next;
-						mes "[Elin]";
-						mes "Hee hee~";
-						mes "Thanks for the doll.";
-						mes "I'm gonna keep it";
-						mes "in my room!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Hey! How come you have to say things like that? Are you making fun of me?!";
-						close;
-					}
-				case 9:
-					if (countitem(753) >= 1) {
-						delitem 753,1;	// Monkey_Doll
-						mes "[Elin]";
-						mes "Woooooooow~!";
-						next;
-						mes "[Elin]";
-						mes "A Yoyo doll! It's so pretty! You're really gonna give it to me?! Yay! Thank you so much! I really like it! Hee hee!";
-						next;
-						mes "[Elin]";
-						mes "Since you gave";
-						mes "me such a pretty doll,";
-						mes "I wanna give you";
-						mes "something, too!";
-						next;
-						getitem 608,1;	// Seed_Of_Yggdrasil
-						mes "[Elin]";
-						mes "My daddy picked it up on his way to another town. It looks like some kind of seed. I tried planting it in front of our house but it won't grow. Do you want to try?";
-						next;
-						mes "[Elin]";
-						mes "Hehe~";
-						mes "Thanks for";
-						mes "the doll. I'll hug";
-						mes "it before I go";
-						mes "to sleep!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Hey...";
-						mes "How come you're making fun of me?!";
-						close;
-					}
-				case 10:
-					mes "["+strcharinfo(0)+"]";
-					mes "I'm as adorable as a doll...";
-					next;
-					mes "[Elin]";
-					mes "Whaaaaaaaaaaat...?";
-					next;
-					mes "[Elin]";
-					mes "^3355FFWhat did^000000";
-					mes "^3355FFyou just say?!^000000";
-					close;
-			}
+			mes "[Elin]";
+			mes "^3355FFWhat did^000000";
+			mes "^3355FFyou just say?!^000000";
+			close;
+		}
 	}
 }
 
@@ -714,14 +714,14 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 							next;
 							mes "^3355FF*Beeeeeeeh~~~*^000000";
 							next;
-							delitem 1059,250;  //Transparent_Cloth
-							delitem 2221,1;  //Hat_
-							delitem 2227,1;  //Cap_
-							delitem 7063,600;  //Soft_Feather
+							delitem 1059,250; //Transparent_Cloth
+							delitem 2221,1; //Hat_
+							delitem 2227,1; //Cap_
+							delitem 7063,600; //Soft_Feather
 							mes "[Tempestra]";
 							mes "Here it is, tee hee~";
 							mes "How about that? Do you like it?";
-							getitem 5032,1; // Picnic_Hat
+							getitem 5032,1; //Picnic_Hat
 							next;
 							mes "[Tempestra]";
 							mes "Once again, thank you for your favour. I'll see you later~";
@@ -778,15 +778,15 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 							next;
 							mes "^3355FF*Beeeeeeeh~~~*^000000";
 							next;
-							delitem 2252,1;  //Star_Sparkling
-							delitem 1036,400;  //Dragon_Scale
-							delitem 4052,1;  //Elder_Wilow_Card
-							delitem 7001,50;  //Mould_Powder
+							delitem 2252,1; //Star_Sparkling
+							delitem 1036,400; //Dragon_Scale
+							delitem 4052,1; //Elder_Wilow_Card
+							delitem 7001,50; //Mould_Powder
 							mes "[Tempestra]";
 							mes "Here it is, tee hee~";
 							mes "How about that?";
 							mes "Do you like it?";
-							getitem 5027,1; // Wizardry_Hat
+							getitem 5027,1; //Wizardry_Hat
 							next;
 							mes "[Tempestra]";
 							mes "Once again, thank you for your favour. I'll see you later~";
@@ -843,14 +843,14 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 							next;
 							mes "^3355FF*Beeeeeeeh~~~*^000000";
 							next;
-							delitem 2252,1;  //Star_Sparkling
-							delitem 1054,450;  //Lip_Of_Ancient_Fish
-							delitem 943,1200;  //Solid_Shell
+							delitem 2252,1; //Star_Sparkling
+							delitem 1054,450; //Lip_Of_Ancient_Fish
+							delitem 943,1200; //Solid_Shell
 							mes "[Tempestra]";
 							mes "Here it is, tee hee~";
 							mes "How about that?";
 							mes "Do you like it?";
-							getitem 5045,1; // Magician_Hat
+							getitem 5045,1; //Magician_Hat
 							next;
 							mes "[Tempestra]";
 							mes "Once again, thank you for your favour. I'll see you later~";
@@ -896,11 +896,11 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 					mes "Heh heh...";
 					mes "I think I'll make you a Hat of the Sun God~";
 					next;
-					delitem 7086,1;  //Symbol_Of_Sun
-					delitem 969,10;  //Gold
-					delitem 999,40;  //Steel
-					delitem 1003,50;  //Coal
-					delitem 984,2;  //Oridecon
+					delitem 7086,1; //Symbol_Of_Sun
+					delitem 969,10; //Gold
+					delitem 999,40; //Steel
+					delitem 1003,50; //Coal
+					delitem 984,2; //Oridecon
 					mes "[Tempestra]";
 					mes "See! Here it is!!";
 					mes "Haha, I made this quicker than the speed of light!";
@@ -1196,7 +1196,7 @@ alberta_in,23,104,4	script	Grandpa Turtle#tur	120,{
 					mes "You've made your choice! With my experience, we will arrive without fail! I appreciate your spirit!";
 					next;
 					mes "^3355FF*Choo Choo*^000000";
-					set zeny,zeny-10000;
+					set Zeny, Zeny-10000;
 					warp "tur_dun01",157,39;
 					close;
 				}
@@ -2312,7 +2312,7 @@ tur_dun03,67,130,4	script	Knight#tur4	105,{
 }
 
 // Alberta Boy
-//============================================================ 
+//============================================================
 alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 	if (ep13_2_hiki == 13) {
 		mes "[Iromo]";
@@ -2379,7 +2379,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 		next;
 		set ep13_2_hiki,13;
 		completequest 10089;
-		getexp 8000,0;
+		getexp (checkre(3))?8000:80000,0;
 		mes "[Iromo]";
 		mes "The world is big, there are many things...";
 		mes "I have not seen yet. Yes... I want to...";
@@ -2508,7 +2508,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 			next;
 			set ep13_2_hiki,11;
 			changequest 10087,10088;
-			getexp 6700,0;
+			getexp (checkre(3))?6700:67000,0;
 			mes "[Iromo]";
 			mes "Nevermind... it's not unexpected...";
 			mes "To go on an adventure with my friends,";
@@ -2576,7 +2576,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 		next;
 		set ep13_2_hiki,10;
 		changequest 10086,10087;
-		getexp 5700,0;
+		getexp (checkre(3))?5700:57000,0;
 		mes "[Iromo]";
 		mes "...I'm not in a good mood, get out...";
 		close;
@@ -2635,7 +2635,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 			next;
 			set ep13_2_hiki,8;
 			changequest 10084,10085;
-			getexp 4700,0;
+			getexp (checkre(3))?4700:47000,0;
 			mes "[Iromo]";
 			mes "Thank you for being helpful.";
 			mes "But, no thanks.";
@@ -2691,7 +2691,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 		delitem 501,1; //Red_Potion
 		set ep13_2_hiki,7;
 		changequest 10083,10084;
-		getexp 3750,0;
+		getexp (checkre(3))?3750:37500,0;
 		mes "[Iromo]";
 		mes "I don't want to see the cat again.";
 		mes "If I go out, I will see him. It is scary.";
diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt
index 5e087e724..6075933da 100644
--- a/npc/quests/quests_aldebaran.txt
+++ b/npc/quests/quests_aldebaran.txt
@@ -4,14 +4,14 @@
 //= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= 'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quests.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
 //= 1.1 Fixed Doctor Band items [Lupus]
 //= 1.2 Removed Duplicates [Silent]
 //= 1.3 Updated headgear NPC. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 // 'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quest
 //============================================================
@@ -38,16 +38,16 @@ aldeba_in,152,166,4	script	Trader#01	86,{
 	switch(select(" Doctor Band : Feather Bonnet : Phantom of Opera : Sakkat ")) {
 	case 1:
 		if ((countitem(2275) > 0) && (countitem(998) > 49) && (countitem(733) > 0) && (Zeny > 3499)) {
-			delitem 2275,1;  //Red_Bandana
-			delitem 998,50;  //Iron
-			delitem 733,1;  //Crystal_Jewel___
-			set Zeny,Zeny-3500;
+			delitem 2275,1; //Red_Bandana
+			delitem 998,50; //Iron
+			delitem 733,1; //Crystal_Jewel___
+			set Zeny, Zeny-3500;
 			mes "[Trader]";
 			mes "Hm! You don't have a medical license, do you? It's alright, I've heard about a rogue, unlicensed physician who performed medical miracles! But... That might have been a comic book.";
 			next;
 			mes "[Trader]";
 			mes "Oh whatever. Just don't get caught.";
-			getitem 2273,1; // Doctor_Cap
+			getitem 2273,1; //Doctor_Cap
 			close;
 		}
 		else {
@@ -59,12 +59,12 @@ aldeba_in,152,166,4	script	Trader#01	86,{
 		}
 	case 2:
 		if ((countitem(2247) > 0) && (countitem(916) > 299) && (Zeny > 499)) {
-			delitem 2247,1;  //Oldman's_Romance
-			delitem 916,300;  //Feather_Of_Birds
-			set Zeny,Zeny-500;
+			delitem 2247,1; //Oldman's_Romance
+			delitem 916,300; //Feather_Of_Birds
+			set Zeny, Zeny-500;
 			mes "[Trader]";
 			mes "Ooh~! You have good fashion sense. I know you've had a hard time collecting this stuff, but this hat is worth it. Take it. All you need now is a fur coat and a cane!";
-			getitem 5018,1; // Feather_Bonnet
+			getitem 5018,1; //Feather_Bonnet
 			close;
 		}
 		else {
@@ -75,12 +75,12 @@ aldeba_in,152,166,4	script	Trader#01	86,{
 		}
 	case 3:
 		if ((countitem(998) > 19) && (countitem(707) > 0) && (Zeny > 4999)){ //Iron Singing_Plant 
-			delitem 998,20;  //Iron
-			delitem 707,1;  //Singing_Plant
-			set Zeny,Zeny-5000;
+			delitem 998,20; //Iron
+			delitem 707,1; //Singing_Plant
+			set Zeny, Zeny-5000;
 			mes "[Trader]";
 			mes "This one? It's a little bit scary, though it has some sort of romantic quality. What do you think? You like it? Alright, take it, it's yours!";
-			getitem 2281,1; // Phantom_Of_Opera
+			getitem 2281,1; //Phantom_Of_Opera
 			close;
 		}
 		else {
@@ -90,14 +90,14 @@ aldeba_in,152,166,4	script	Trader#01	86,{
 		}
 	case 4:
 		if ((countitem(1019) > 119) && (Zeny > 9999)){ //Wooden_Block 
-			delitem 1019,120;  //Wooden_Block
-			set Zeny,Zeny-10000;
+			delitem 1019,120; //Wooden_Block
+			set Zeny, Zeny-10000;
 			mes "[Trader]";
 			mes "If you have a chance to visit the Uplander Village, Payon, please go and meet the Sakkat Craftsman.";
 			next;
 			mes "[Trader]";
 			mes "He's never sold Sakkat to Traders other than me, since only I can recognize its quality. Due to its rarity, Sakkat has become a very unique and exceptional product. Okay! Take it, it's yours!";
-			getitem 2280,1; // Sahkkat
+			getitem 2280,1; //Sahkkat
 			close;
 		}
 		else {
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 0e931aca7..921d00123 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -1,22 +1,23 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Amatsu
-//===== By: ================================================== 
-//= rAthena team & others? & MasterOfMuppets
-//===== Current Version: ===================================== 
-//= 1.4a
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== By: ==================================================
+//= rAthena Dev Team & MasterOfMuppets
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
 //= Momotaro Event
 //= Sushi Quest
 //= Dungeon Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
 //= 1.4 Added missing checkweight. [L0ne_W0lf]
 //= 1.4a Fixed typo in condition check [Gepard]
-//============================================================ 
+//= 1.5 Added questlog support. [Euphy]
+//============================================================
 
-// Momotaro Event
-//============================================================ 
+// Momotaro Event :: japan_momo_q
+//============================================================
 amatsu,223,236,3	script	Publisher#ama	763,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment!! -";
@@ -134,8 +135,12 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 		mes "This is your reward for you.";
 		mes "Please continue to enjoy stories~";
 		mes " ";
-		if (event_momo == 3) {
-			set event_momo,4;
+		set .@event_momo, event_momo;
+		set event_momo,4;
+		completequest 8128;
+		completequest 8129;
+		completequest 8130;
+		if (.@event_momo == 3) {
 			set .@gift_1,rand(1,10);
 			if (.@gift_1 == 1) {
 				getitem 659,1; //Heart_Of_Her
@@ -169,7 +174,6 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 			}
 		}
 		else {
-			set event_momo,4;
 			set .@gift_2,rand(1,10);
 			if (.@gift_2 == 1) {
 				getitem 622,1; //Rainbow_Carrot
@@ -205,7 +209,7 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 		close;
 	}
 }
-	
+
 ama_test,52,44,3	script	Assistant#ama	109,{
 	if (event_momo == 0) {
 		mes "[Satoshi]";
@@ -365,9 +369,9 @@ OnInit:
 
 OnStartArena:
 	disablenpc "Coach#ama";
-	donpcevent "Am Mut#ama::Onreset";
-	donpcevent "Dokebi#ez::Onreset";
-	donpcevent "Dokebi#hd::Onreset";
+	donpcevent "Am Mut#ama::OnReset";
+	donpcevent "Dokebi#ez::OnReset";
+	donpcevent "Dokebi#hd::OnReset";
 	enablenpc "Grandma#ama1";
 	enablenpc "Grandpa#ama";
 	warpwaitingpc "ama_test",50,83;
@@ -375,7 +379,7 @@ OnStartArena:
 	disablewaitingroomevent "Assistant#ama";
 	end;
 
-Onreset:
+OnReset:
 	enablewaitingroomevent "Assistant#ama";
 	end;
 }
@@ -396,7 +400,7 @@ OnTouch:
 	mes ".....or bl-ue toilet paper.... ";
 	close;
 }
-	
+
 ama_test,49,93,4	script	Grandpa#ama	766,{
 	end;
 
@@ -404,7 +408,7 @@ OnInit:
 	disablenpc "Grandpa#ama";
 	end;
 }
-	
+
 ama_test,50,93,4	script	Grandma#ama1	761,10,10,{
 	end;
 
@@ -422,6 +426,7 @@ OnTouch:
 	mes "[Grandpa]";
 	mes "Hmm. The Chief said Dokebi earned 20 million zeny by hacking others' accounts...";
 	next;
+	setquest 8127;
 	mes "[Grandma]";
 	mes "Dohhhhhhh!!!! ";
 	next;
@@ -460,7 +465,7 @@ OnTouch:
 	}
 	end;
 }
-	
+
 ama_test,34,15,0	script	Dokebi#ez	-1,{
 OnInit:
 	disablenpc "Dokebi#ez";
@@ -480,7 +485,7 @@ OnEnable:
 	monster "ama_test",49,91,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Dokebi#ez::OnMyMobDead";
 	end;
 
@@ -508,7 +513,7 @@ OnMyMobDead:
 	}
 	end;
 }
-	
+
 ama_test,34,16,0	script	Dokebi#hd	-1,{
 OnInit:
 	disablenpc "Dokebi#hd";
@@ -528,7 +533,7 @@ OnEnable:
 	monster "ama_test",49,91,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Dokebi#hd::OnMyMobDead";
 	end;
 
@@ -556,7 +561,7 @@ OnMyMobDead:
 	}
 	end;
 }
-	
+
 ama_test,50,100,3	script	Coach#ama	762,15,15,{
 	mes "[Coach]";
 	mes "Hoho~ Good.";
@@ -582,6 +587,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "...Don't give me that look.";
 		mes "I was just joking. Hmmhmm.";
 		next;
+		changequest 8127,8128;
 		mes "[Coach]";
 		mes "Now, the Momotaro story is over.";
 		mes "You can get your reward when you talk to the Publisher lady you saw first.";
@@ -593,7 +599,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		donpcevent "Timer#ama::OnDisable";
 		warp "amatsu",223,230;
 		disablenpc "Coach#ama";
-		donpcevent "Assistant#ama::Onreset";
+		donpcevent "Assistant#ama::OnReset";
 		end;
 	case 2:
 		mes "[Coach]";
@@ -603,6 +609,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "Alright, hot stuff.";
 		mes "Do you want to listen to my proposal?";
 		next;
+		changequest 8127,8129;
 		mes "[Coach]";
 		mes "At this point I'm supposed to send you back...BUT!";
 		mes "I really want to know";
@@ -616,6 +623,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "Also, this mission will be pretty hard.";
 		next;
 		if (select("Nah.. I'm good.:Bring it on, foo'!") == 1) {
+			erasequest 8129;
 			mes "[Coach]";
 			mes "Hoho~I understand...";
 			mes "You must be exhausted from the previous battle. It would have been a grand battle, though...";
@@ -630,10 +638,11 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 			mes "Don't lose your high self-esteem";
 			mes "in the future. Farewell.";
 			next;
+			setquest 8128;
 			warp "amatsu",223,230;
 			disablenpc "Coach#ama";
 			donpcevent "Timer#ama::OnDisable";
-			donpcevent "Assistant#ama::Onreset";
+			donpcevent "Assistant#ama::OnReset";
 			end;
 		}
 		mes "[Coach]";
@@ -657,7 +666,7 @@ OnTouch:
 	mes "Tada~~~ !";
 	close;
 }
-	
+
 ama_test,34,17,0	script	Am Mut#ama	-1,{
 OnInit:
 	disablenpc "Am Mut#ama";
@@ -671,7 +680,7 @@ OnEnable:
 	monster "ama_test",56,108,"Am Mut",1301,1,"Am Mut#ama::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Am Mut#ama::OnMyMobDead";
 	end;
 
@@ -694,7 +703,7 @@ OnMyMobDead:
 	}
 	end;
 }
-	
+
 ama_test,50,100,3	script	Coach#after	762,5,5,{
 	end;
 
@@ -718,13 +727,14 @@ OnTouch:
 	mes "Don't forget to get your reward~";
 	close2;
 	set event_momo,3;
+	changequest 8129,8130;
 	warp "amatsu",223,230;
 	disablenpc "Coach#after";
 	donpcevent "Timer#ama::OnDisable";
-	donpcevent "Assistant#ama::Onreset";
+	donpcevent "Assistant#ama::OnReset";
 	end;
 }
-	
+
 ama_test,34,18,0	script	Timer#ama	-1,{
 OnInit:
 	disablenpc "Timer#ama";
@@ -762,11 +772,11 @@ OnTimer362000:
 	end;
 
 OnTimer362500:
-	donpcevent "Assistant#ama::Onreset";
+	donpcevent "Assistant#ama::OnReset";
 	donpcevent "Timer#ama::OnDisable";
 	end;
 }
-	
+
 ama_test,50,100,0	script	backwarp#ama	-1,25,25,{
 OnInit:
 	disablenpc "backwarp#ama";
@@ -777,11 +787,10 @@ OnTouch:
 	end;
 }
 
-// Sushi Quest
-//============================================================ 
+// Sushi Quest :: japan_sushi
+//============================================================
 ama_in01,162,17,1	script	Sushi Master#ama	765,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 5000) {
+	if (MaxWeight - Weight < 5000) {
 		mes "[Magumagu]";
 		mes "Hey. You look really heavy.";
 		mes "Don't you have trouble walking?";
@@ -814,6 +823,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you my shop's special cuisine, Fish Slice, in return.";
 			next;
 			set fish_r,0;
+			erasequest 10036;
 			delitem 529,10; //Candy
 			getitem 544,15; //Fish_Slice
 			mes "[Magumagu]";
@@ -845,6 +855,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you two sets of Sushi in return.";
 			next;
 			set fish_r,0;
+			erasequest 10037;
 			delitem 964,10; //Crap_Shell
 			getitem 551,20; //Shusi
 			mes "[Magumagu]";
@@ -876,6 +887,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you several sets of Sushi in return.";
 			next;
 			set fish_r,0;
+			erasequest 10038;
 			delitem 961,10; //Conch
 			getitem 551,30; //Shusi
 			mes "[Magumagu]";
@@ -906,8 +918,9 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "Thanks. It is nothing but";
 			mes "I will give you a large amount of food in return.";
 			next;
-			delitem 1023,10; //Fish_Tail
 			set fish_r,0;
+			erasequest 10039;
+			delitem 1023,10; //Fish_Tail
 			getitem 544,20; //Fish_Slice
 			getitem 551,30; //Shusi
 			mes "[Magumagu]";
@@ -940,6 +953,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			next;
 			delitem 736,1; //White_Platter
 			set fish_r,0;
+			erasequest 10040;
 			getitem 551,20; //Shusi
 			mes "[Magumagu]";
 			mes "Share it with your friends";
@@ -998,6 +1012,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				next;
 				delitem 950,100; //Heart_Of_Mermaid
 				set ama_sushi,4;
+				completequest 10041;
 				getitem 1144,1; //Sasimi
 				mes "[Magumagu]";
 				mes "Here, take my knife.";
@@ -1061,6 +1076,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				next;
 				set ama_sushi,ama_sushi+1;
 				set fish_r,0;
+				erasequest 10041;
 				mes "[Magumagu]";
 				mes "Thanks a lot for today! Haha!";
 				mes "Come back again when you feel like helping. Take care...!!!";
@@ -1111,7 +1127,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "If you want to eat delicious fish slices, you better bring more money.";
 				close;
 			}
-			set zeny,zeny-700;
+			set Zeny, Zeny-700;
 			getitem 551,10; //Shusi
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1124,7 +1140,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "you better bring more money.";
 				close;
 			}
-			set zeny,zeny-74;
+			set Zeny, Zeny-74;
 			getitem 551,1; //Shusi
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1152,7 +1168,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "If you want to eat delicious fish slices, you better bring more money.";
 				close;
 			}
-			set zeny,zeny-350;
+			set Zeny, Zeny-350;
 			getitem 544,10; //Fish_Slice
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1165,7 +1181,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "";
 				close;
 			}
-			set zeny,zeny-37;
+			set Zeny, Zeny-37;
 			getitem 544,1; //Fish_Slice
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1198,6 +1214,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			set .@fish_m1,rand(1,10);
 			if (.@fish_m1 == 1 || .@fish_m1 == 2) {
 				set fish_r,1;
+				setquest 10036;
 				mes "[Magumagu]";
 				mes "I need some candies to make";
 				mes "a dessert for the customers.";
@@ -1207,6 +1224,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 3 || .@fish_m1 == 4) {
 				set fish_r,2;
+				setquest 10037;
 				mes "[Magumagu]";
 				mes "I need some crab shells to make";
 				mes "a sauce for my cuisine...";
@@ -1216,6 +1234,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 5 || .@fish_m1 == 6) {
 				set fish_r,3;
+				setquest 10038;
 				mes "[Magumagu]";
 				mes "I have used all of my conches.";
 				mes "I need it to make an appetizer...";
@@ -1225,6 +1244,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 7 || .@fish_m1 == 8) {
 				set fish_r,4;
+				setquest 10039;
 				mes "[Magumagu]";
 				mes "Decorative fish tails are out of";
 				mes "stock. This is urgent...";
@@ -1234,6 +1254,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 9) {
 				set fish_r,5;
+				setquest 10040;
 				mes "[Magumagu]";
 				mes "We are missing a platter to serve";
 				mes "fish slices to customers.";
@@ -1244,6 +1265,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			else {
 				if (rand(1,10) == 1) {
 					set fish_r,6;
+					setquest 10041;
 					mes "[Magumagu]";
 					mes "Don't ask me why...";
 					mes "But, I need something special...";
@@ -1257,6 +1279,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				}
 				else {
 					set fish_r,5;
+					setquest 10040;
 					mes "[Magumagu]";
 					mes "We are missing a platter to serve";
 					mes "fish slices to customers.";
@@ -1280,8 +1303,8 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 	}
 }
 
-// Dungeon Quest
-//============================================================ 
+// Dungeon Quest :: japan_mono
+//============================================================
 amatsu,112,164,4	script	Gate Soldier#ama1	767,{
 	mes "[Gate Soldier]";
 	mes "This is the great palace,";
@@ -1347,6 +1370,7 @@ amatsu,164,174,4	script	Gate Soldier#ama5	767,{
 		mes "The mother of our lord is resting in here. She needs her rest.";
 		next;
 		set event_amatsu,1;
+		setquest 8131;
 		mes "[Gate Soldier]";
 		mes "She has been sick for months.";
 		mes "That is why she is staying in here.";
@@ -1450,7 +1474,7 @@ ama_in02,170,62,4	script	Soldier#ama2	767,{
 			mes "to issue another Transit Permit.";
 			next;
 			if (select("Issue one:Talk to you later") == 1) {
-				set zeny,zeny-10000;
+				set Zeny, Zeny-10000;
 				getitem 7160,1; //Lord's_Passable_Ticket
 				mes "[Jiro]";
 				mes "There you go.";
@@ -1779,6 +1803,7 @@ ama_in02,200,176,4	script	Lord of Palace#ama	768,{
 			mes "may be able to cure my mother's disease. I will reward you well if you succeed...";
 			next;
 			set event_amatsu,2;
+			changequest 8131,8132;
 			mes "[Ishida Yoshinaga]";
 			mes "I beg you...Please.";
 			mes "My mother is living in a house outside of the palace.";
@@ -1836,6 +1861,7 @@ ama_in02,200,176,4	script	Lord of Palace#ama	768,{
 			mes "with this ticket.";
 			next;
 			set event_amatsu,6;
+			completequest 8135;
 			delitem 1022,1; //Fox_Tail
 			getitem 7160,1; //Lord's_Passable_Ticket
 			mes "[Ishida Yoshinaga]";
@@ -1921,6 +1947,7 @@ ama_in01,22,111,0	script	Grandma#ama2	761,{
 			monster "ama_in01",22,111,"Nine Tails",1180,1;
 			killmonsterall "ama_in01";
 			set event_amatsu,5;
+			changequest 8134,8135;
 			getitem 1022,1; //Fox_Tail
 			mes "[....]";
 			mes "^FF6060Everything that";
@@ -2049,6 +2076,7 @@ amatsu,189,166,5	script	Kouji#ama	764,{
 		mes "A fox is following me!";
 		mes "If he doesn't leave when I scream and shout!";
 		mes "The North Shrine Priest should help me out~";
+		changequest 8132,8133;
 	}
 	else if (event_amatsu == 4) {
 		mes "Priest, priest~";
@@ -2144,6 +2172,7 @@ ama_in01,180,173,3	script	Kitsune Mask#ama	762,{
 		mes "Good. Show that spiritual";
 		mes "energy to the fox several times.";
 		mes "Sooner or later, you'll be successful.";
+		changequest 8133,8134;
 		close;
 	}
 	else if (event_amatsu == 4) {
@@ -2169,12 +2198,12 @@ ama_in01,180,173,3	script	Kitsune Mask#ama	762,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Rewrote parts of other/momotaro.txt to make it work.
-//=	I'm sorry for the mess, I couldn't do much better with
-//=	the current code I had.
+//=     I'm sorry for the mess, I couldn't do much better with
+//=     the current code I had.
 //= 1.1 Added Sushi Quest and Amatsu Event from cities/ [Evera]
 //= 1.2 Fixed Momotaro Quest, thanks to .~Abism0~. [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 37d8d774b..af7df5f6c 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Quest NPCs related to Ayothaya
 //===== By ===================================================
 //= Fredzilla, MasterOfMuppets
 //===== Version ==============================================
-//= 2.3
-//===== Compatible With ======================================
-//= rAthena SVN
+//= 2.5
 //===== Description ==========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Ayothaya Ring Quest
 //= Ayothaya Dungeon Quest
 //= Tom Yum Goong Quest
@@ -16,27 +14,27 @@
 //= 1.1 Added anti-novice protection [Lupus]
 //= 1.3 Fixed exploit [Lupus]
 //= 1.4 Updated, more close to the official. Thanks to birkiczd
-//=	Also optimized it again, remove unused global variable [Lupus]
+//=     Also optimized it again, remove unused global variable [Lupus]
 //= 1.5 Removed Duplicates [Silent]
 //= 1.6 Moved quests from cities/ to here:
-//= Shrimp, Dungeon, Tom Yum Goong [Evera]
+//=     Shrimp, Dungeon, Tom Yum Goong [Evera]
 //= 1.7 Updated the Ayothaya Ring quest to the official one [MasterOfMuppets]
 //= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.0 Rescripted Tom Yum Goong and Dungeon quest to Aegis [L0ne_W0lf]
-//=	10.3 standards.
+//=     10.3 standards.
 //= 2.0a Corrected a Typo error ";;". [Samuray22]
 //= 2.1 Added missing checkweights. [L0ne_W0lf]
 //= 2.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 2.3 Replaced effect numerics with constants. [Samuray22]
+//= 2.4 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.5 Added questlog support. [Euphy]
 //============================================================
 
-// Ayothaya Ring Quest
+// Ayothaya Ring Quest :: ayo_ring
 //============================================================
 ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
-
-	if(thai_find == 14)
-	{
+	if (thai_find == 14) {
 		mes "[Shuda]";
 		mes "Have you";
 		mes "found Annon?";
@@ -60,9 +58,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 		mes "He will be ^660000punished^000000...";
 		mes "^666666*grinds teeth*^000000";
 		close;
-	}
-	else if(thai_find > 2 && thai_find < 14)
-	{
+	} else if (thai_find > 2 && thai_find < 14) {
 		mes "[Shuda]";
 		mes "^666666*Sigh...*^000000";
 		mes "You haven't";
@@ -74,11 +70,8 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 		mes "And by 'us,' I mean '^660000you^000000.' I don't care about your plans or whatever else you may have scheduled, because you're going to make";
 		mes "time for me! Oho ho ho ho ho!";
 		close;
-	}
-	else if(thai_find == 2)
-	{
-		if(countitem(7288)) //Engagement Ring
-		{
+	} else if (thai_find == 2) {
+		if (countitem(7288)) {
 			mes "[Shuda]";
 			mes "Ah... Is it...?!!";
 			mes "Yes, that's it!";
@@ -110,8 +103,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 			mes "^3355FFShuda gazes directly";
 			mes "at you with a puppy eyed look.^000000";
 			next;
-			switch( select( "D-Don't look at me that way!:Alright, alright." ) )
-			{
+			switch(select("D-Don't look at me that way!:Alright, alright.")) {
 			case 1:
 				mes "[Shuda]";
 				mes "Oh come on, you know everything that happened, and I know you're gonna continue adventuring";
@@ -134,10 +126,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "(Why am I always";
 				mes "doing things for other";
 				mes "people anyway?!)";
-				delitem 7288,1; //Engagement Ring
-				set thai_find,3;
-				close;
-			break;
+				break;
 			case 2:
 				mes "[Shuda]";
 				mes "Yes, I knew I could count on you! So find Annon! It's my destiny to make him ^660000mine^000000. Hoo ho ho ho ho!";
@@ -148,14 +137,13 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "[Shuda]";
 				mes "Will you please tell Annon that";
 				mes "I got my ring back so he can come back to me now? I hope you'll remember that for me, adventurer.";
-				delitem 7288,1; //Engagement Ring
-				set thai_find,3;
-				close;
-			break;
+				break;
 			}
-		}
-		else
-		{
+			delitem 7288,1; //Thai_Ring
+			changequest 12030,12031;
+			set thai_find,3;
+			close;
+		} else {
 			mes "[Shuda]";
 			mes "Huh...?";
 			mes "Did you find my ring?";
@@ -172,11 +160,11 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 			mes "my ring. I'll be waiting";
 			mes "here for the good news.";
 			mes "Oho ho ho ho ho~!";
+			if (checkquest(12029) == -1)
+				setquest 12029;
 			close;
 		}
-	}
-	else if(thai_find == 1)
-	{
+	} else if (thai_find == 1) {
 		mes "[Shuda]";
 		mes "I feel a little bad asking you this, especially since you're";
 		mes "an outsider.";
@@ -189,15 +177,12 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 		mes "Please bring my ring back to me.";
 		mes "I want to live with Annon as a happy couple forever. Can't you understand that?!";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Powerful-Looking Woman]";
 		mes "Umm...?";
 		mes "Ah, you must be one of the tourists. I'd guide you around and listen to your stories about the outside world, but...";
 		next;
-		if(rand(0,1))
-		{
+		if (rand(0,1)) {
 			mes "[Powerful-Looking Woman]";
 			mes "I'm reeeally";
 			mes "busy right now.";
@@ -213,8 +198,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 			mes "my fiancee hadn't";
 			mes "thrown it...";
 			next;
-			switch( select( "What...?:Lies~!" ) )
-			{
+			switch(select("What...?:Lies~!")) {
 			case 1:
 				mes "[Powerful-Looking Woman]";
 				mes "What 'what?'";
@@ -234,7 +218,6 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "Wh-who are you to say";
 				mes "something so rude to such a nice lady like myself. Go away, I don't wanna talk to you!";
 				close;
-			break;
 			case 2:
 				mes "[Powerful-Looking Woman]";
 				mes "What lies?";
@@ -272,18 +255,15 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "Why are you staring at me?";
 				mes "Don't you have anything to do?";
 				next;
-				switch( select( "No.:No~ and you are an interesting girl." ) )
-				{
+				switch(select("No.:No~ and you are an interesting girl.")) {
 				case 1:
 					mes "[Powerful-Looking Woman]";
 					mes "I see. Hmmm...";
 					mes "You're kind of my type.";
-					if(sex)
-					{
+					if (Sex) {
 						mes "No no, that doesn't mean I'm interested in you. Plus I'm";
 						mes "already engaged.";
-					}
-					else
+					} else
 						mes "Before you think of anything weird, I meant that I think you and me are a lot alike.";
 					next;
 					mes "[Powerful-Looking Woman]";
@@ -343,7 +323,6 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 					emotion e_heh;
 					set thai_find,1;
 					close;
-				break;
 				case 2:
 					mes "[Powerful-Looking Woman]";
 					mes "^666666*Sigh...*^000000";
@@ -407,15 +386,14 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 					next;
 					mes "[Shuda]";
 					mes "So go and look under the water! There's no water current, so I'm sure it's still there! What are you waiting for, it's should be an easy swim for you! Oho ho ho ho ho!";
+					if (checkquest(12029) == -1)
+						setquest 12029;
 					set thai_find,1;
 					close;
-				break;
 				}
 			break;
 			}
-		}
-		else
-		{
+		} else {
 			mes "[Powerful-Looking Woman]";
 			mes "^666666*Sigh...*^000000";
 			mes "Why isn't it coming up from the water? Maybe if I stirred around with a wooden stick...?";
@@ -438,8 +416,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 	}
 
 OnTouch:
-	if(thai_find == 0)
-	{
+	if (thai_find == 0) {
 		mes "[Powerful-Looking Woman]";
 		mes "^666666*Sigh...*^000000";
 		mes "Where the";
@@ -451,15 +428,11 @@ OnTouch:
 		mes "Haven't you ever seen a delicate damsel sigh before? Leave me the hell alone!";
 		close;
 	}
-	
 }
-	
-ayo_dun02,91,263,0	script	#Annonblood	111,2,3,{
 
-if(!$annonactive)
-{
-	if(thai_find == 13)
-	{
+ayo_dun02,91,263,0	script	#Annonblood	111,2,3,{
+if (!$@annonactive) {
+	if (thai_find == 13) {
 		mes "["+strcharinfo(0)+"]";
 		mes "A blood stain?";
 		mes "What's going on?";
@@ -477,11 +450,9 @@ if(!$annonactive)
 		mes "[" +strcharinfo(0)+ "]";
 		mes "Hmmm....";
 		next;
-		switch( select( "Scatter the bushes.:Dig up the bushes." ) )
-		{
+		switch(select("Scatter the bushes.:Dig up the bushes.")) {
 		case 1:
-			if(!rand(0,2))
-			{
+			if (!rand(0,2)) {
 				mes "[" +strcharinfo(0)+ "]";
 				mes "^666666*Cough cough*^000000";
 				mes "It's so dusty!";
@@ -502,7 +473,7 @@ if(!$annonactive)
 				mes "^3355FFshrubbery, you find";
 				mes "a small burrow.^000000";
 				next;
-				set $annonactive,1;
+				set $@annonactive,1;
 				enablenpc "Haggard Man";
 				mes "[Haggard Man]";
 				mes "^666666*Cough cough!*^000000";
@@ -511,18 +482,16 @@ if(!$annonactive)
 				mes "stay back, or I'll kill myself!";
 				emotion e_omg,1;
 				next;
-				switch( select( "What are you doing here?:I'm not Shuda!" ) )
-				{
+				switch(select("What are you doing here?:I'm not Shuda!")) {
 				case 1:
 					mes "["+strcharinfo(0)+"]";
 					mes "Hey...";
 					mes "What are you doi--";
 					next;
-					set $annonactive,0;
+					set $@annonactive,0;
 					disablenpc "Haggard Man";
 					mes "^3355FFHe vanished!^000000";
 					close;
-				break;
 				case 2:
 					mes "[Haggard Man]";
 					mes "Hmmm...?";
@@ -531,11 +500,8 @@ if(!$annonactive)
 					mes "[Haggard Man]";
 					mes "You are unfamiliar to me, outsider. I'm unsure of how you found my hiding place, but if you have something to say, make it short!";
 					close;
-				break;
 				}
-			}
-			else
-			{
+			} else {
 				mes "^3355FFYou dig up the bushes, stirring";
 				mes "up a large, choking cloud of dust.^000000";
 				next;
@@ -546,22 +512,18 @@ if(!$annonactive)
 				mes "of dust!";
 				close;
 			}
-		break;
 		case 2:
 			mes "^3355FFAs you dig up the bushes, the ground beneath one of the bushes crumbles and you hear a scream";
 			mes "from beneath.^000000";
 			next;
-			if(!rand(0,2))
-			{
-				set $annonactive,1;
+			if (!rand(0,2)) {
+				set $@annonactive,1;
 				enablenpc "Haggard Man";
 				mes "[?]";
 				mes "^666666*Cough cough*^000000";
 				mes "...M-my legs!";
 				close;
-			}
-			else
-			{
+			} else {
 				mes "[" +strcharinfo(0)+ "]";
 				mes "Hmmm...?";
 				mes "What was that noise?";
@@ -570,25 +532,18 @@ if(!$annonactive)
 				mes "^666666*cough cough cough*^000000";
 				close;
 			}
-		break;
 		}
-	}
-	else if(thai_find == 14)
-	{
+	} else if (thai_find == 14) {
 		mes "^3355FFYou find that the burrow is empty. It seems Annon has found a new hiding place.^000000";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "^3355FFYou find a pile of dead bushes under a large tree. The area around the bushes seems awfully dusty.^000000";
 		close;
 	}
 
-	OnTouch:
-	if(thai_find == 12)
-	{
-		if(!rand(0,2))
-		{
+OnTouch:
+	if (thai_find == 12) {
+		if (!rand(0,2)) {
 			emotion e_gasp,1;
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Huh...?";
@@ -607,18 +562,17 @@ if(!$annonactive)
 			mes "a blood stain in";
 			mes "this kind of place...";
 			set thai_find,13;
+			changequest 12033,12034;
 			close;
 		}
 	}
-
 }
-	
+
 }
-	
-ayo_dun02,91,264,3	script	Haggard Man	841,{
 
-	if(thai_find == 13)
-	{
+ayo_dun02,91,264,3	script	Haggard Man	841,{
+	//completequest 12034;
+	if (thai_find == 13) {
 		mes "[Haggard Man]";
 		mes "^666666*...Cough cough*^000000";
 		mes "No...! My hiding place!";
@@ -629,19 +583,17 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 		mes "Oh, how did this happen?";
 		mes "My spiritual training wasn't supposed to go like this...!";
 		next;
-		switch( select( "Treat his wound first.:Is that you, Annon?" ) )
-		{
+		switch(select("Treat his wound first.:Is that you, Annon?")) {
 		case 1:
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Anyway, I think you need to be treated. Let me check if I have some potions.";
 			next;
-			if(countitem(504)) //White potion
-			{
+			if (countitem(504)) {
 				mes "["+strcharinfo(0)+"]";
 				mes "Ah...";
 				mes "Here we are,";
 				mes "a White Potion.";
-				delitem 504,1; //White potion
+				delitem 504,1; //White_Potion
 				next;
 				mes "[Haggard Man]";
 				mes "You mean the White Potion,";
@@ -689,8 +641,7 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				mes "It looks like you wish to know more. If you promise me that you will not mention my whereabouts";
 				mes "to Shuda, then I'll explain.";
 				next;
-				switch( select( "You think the world revolves around you?:What do you want me to do?" ) )
-				{
+				switch(select("You think the world revolves around you?:What do you want me to do?")) {
 				case 1:
 					mes "[" +strcharinfo(0)+ "]";
 					mes "You think the world";
@@ -717,74 +668,11 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 					mes "[Annon]";
 					mes "Of course, if you reveal to her that you've found me, I'll repay your favor. I implore you, just pretend you haven't found me, please?";
 					next;
-					menu "...Alright, alright.",-;
+					select("...Alright, alright.");
 					mes "[Annon]";
 					mes "Thank you so much!";
 					mes "Now, to pay you back, let me use one of the skills I've learned in my spiritual training.";
-					next;
-					mes "[Annon]";
-					mes "Let's see...";
-					mes "Let me twist your";
-					mes "arm this way, and";
-					mes "apply pressure here...";
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Wahhh~!";
-					mes "What the hell";
-					mes "are you doing!";
-					mes "You're hurting me, man!";
-					next;
-					mes "[Annon]";
-					mes "Oh, this is a special kind of massage. Don't worry, it'll relieve you of fatigue. It's quite heavenly, actually. You'll see~";
-					next;
-					mes "^3355FF*Snap snap snap*";
-					mes "*Snap snap snap*";
-					mes "*Crack crack crack*";
-					mes "*Crack crack crack*^000000";
-					next;
-					mes "^3355FFYou feel as though Annon";
-					mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
-					set thai_find,14;
-					if(BaseLevel < 56)
-						getexp 900,0;
-					else if(BaseLevel > 55 && BaseLevel < 61)
-						getexp 1050,0;
-					else if(BaseLevel > 60 && BaseLevel < 66)
-						getexp 1868,0;
-					else if(BaseLevel > 65 && BaseLevel < 71)
-						getexp 2741,0;
-					else if(BaseLevel > 70 && BaseLevel < 76)
-						getexp 7076,0;
-					else if(BaseLevel > 75 && BaseLevel < 81)
-						getexp 13025,0;
-					else if(BaseLevel > 80 && BaseLevel < 86)
-						getexp 15034,0;
-					else if(BaseLevel > 85 && BaseLevel < 91)
-						getexp 18205,0;
-					else if(BaseLevel > 90)
-						getexp 40679,0;
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Whoa...?";
-					mes "That felt was so great~";
-					mes "It even feels like my mind";
-					mes "has been cleansed too!";
-					mes "You've got a deal!";
-					next;
-					mes "[Annon]";
-					mes "Thank you, thank you so much.";
-					mes "Now I can avoid being tied to Shuda, at least for a little longer.";
-					next;
-					mes "[Annon]";
-					mes "Now, if you'll excuse me,";
-					mes "I must make good my escape";
-					mes "before others find me.";
-					mes "Good day~!";
-					close2;
-					set $annonactive,0;
-					disablenpc "Haggard Man";
-					end;
-				break;
+					break;
 				case 2:
 					mes "[Annon]";
 					mes "Of course, what I want you to do is to keep me a secret from Shuda. Just forget that you've ever met me, and let Shuda know it was impossible to find me.";
@@ -795,76 +683,78 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 					mes "[Annon]";
 					mes "Now, you must be wondering";
 					mes "how I would repay you for your silence. Well, let me show you one of the skills I've learned in my spiritual training.";
-					next;
-					mes "[Annon]";
-					mes "Let's see...";
-					mes "Let me twist your";
-					mes "arm this way, and";
-					mes "apply pressure here...";
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Wahhh~!";
-					mes "What the hell";
-					mes "are you doing!";
-					mes "You're hurting me, man!";
-					next;
-					mes "[Annon]";
-					mes "Oh, this is a special kind";
-					mes "of massage. Don't worry, it'll";
-					mes "relieve you of fatigue. It's quite heavenly, actually. You'll see~";
-					next;
-					mes "^3355FF*Snap snap snap*";
-					mes "*Snap snap snap*";
-					mes "*Crack crack crack*";
-					mes "*Crack crack crack*^000000";
-					next;
-					mes "^3355FFYou feel as though Annon";
-					mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
-					set thai_find,14;
-					if(BaseLevel < 56)
-						getexp 900,0;
-					else if(BaseLevel > 55 && BaseLevel < 61)
-						getexp 1050,0;
-					else if(BaseLevel > 60 && BaseLevel < 66)
-						getexp 1868,0;
-					else if(BaseLevel > 65 && BaseLevel < 71)
-						getexp 2741,0;
-					else if(BaseLevel > 70 && BaseLevel < 76)
-						getexp 7076,0;
-					else if(BaseLevel > 75 && BaseLevel < 81)
-						getexp 13025,0;
-					else if(BaseLevel > 80 && BaseLevel < 86)
-						getexp 15034,0;
-					else if(BaseLevel > 85 && BaseLevel < 91)
-						getexp 18205,0;
-					else if(BaseLevel > 90)
-						getexp 40679,0;
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Whoa...?";
-					mes "That felt was so great~";
-					mes "It even feels like my mind";
-					mes "has been cleansed too!";
-					mes "You've got a deal!";
-					next;
-					mes "[Annon]";
-					mes "Thank you, thank you so much.";
-					mes "Now I can avoid being tied to Shuda, at least for a little longer.";
-					next;
-					mes "[Annon]";
-					mes "Now, if you'll excuse me,";
-					mes "I must make good my escape";
-					mes "before others find me.";
-					mes "Good day~!";
-					close2;
-					set $annonactive,0;
-					disablenpc "Haggard Man";
-					end;
-				break;
+					break;
 				}
-			}
-			else
-			{
+				next;
+				mes "[Annon]";
+				mes "Let's see...";
+				mes "Let me twist your";
+				mes "arm this way, and";
+				mes "apply pressure here...";
+				next;
+				mes "[" +strcharinfo(0)+ "]";
+				mes "Wahhh~!";
+				mes "What the hell";
+				mes "are you doing!";
+				mes "You're hurting me, man!";
+				next;
+				mes "[Annon]";
+				mes "Oh, this is a special kind";
+				mes "of massage. Don't worry, it'll";
+				mes "relieve you of fatigue. It's quite heavenly, actually. You'll see~";
+				next;
+				mes "^3355FF*Snap snap snap*";
+				mes "*Snap snap snap*";
+				mes "*Crack crack crack*";
+				mes "*Crack crack crack*^000000";
+				next;
+				mes "^3355FFYou feel as though Annon";
+				mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
+				set thai_find,14;
+				completequest 12034;
+				if (checkre(3)) {
+					if (BaseLevel < 56) getexp 900,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 1050,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 1868,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 2741,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 7075,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 13024,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 15034,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 18205,0;
+					else getexp 40678,0;
+				} else {
+					if (BaseLevel < 56) getexp 9000,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 10500,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 18684,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 27411,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 70757,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 130246,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 150340,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 182052,0;
+					else getexp 406786,0;
+				}
+				next;
+				mes "[" +strcharinfo(0)+ "]";
+				mes "Whoa...?";
+				mes "That felt was so great~";
+				mes "It even feels like my mind";
+				mes "has been cleansed too!";
+				mes "You've got a deal!";
+				next;
+				mes "[Annon]";
+				mes "Thank you, thank you so much.";
+				mes "Now I can avoid being tied to Shuda, at least for a little longer.";
+				next;
+				mes "[Annon]";
+				mes "Now, if you'll excuse me,";
+				mes "I must make good my escape";
+				mes "before others find me.";
+				mes "Good day~!";
+				close2;
+				set $@annonactive,0;
+				disablenpc "Haggard Man";
+				end;
+			} else {
 				mes "[" +strcharinfo(0)+ "]";
 				mes "No way, no way.";
 				mes "He's too seriously";
@@ -887,7 +777,7 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				mes "me back inside!";
 				mes "Wahhhhhh~!";
 				next;
-				set $annonactive,0;
+				set $@annonactive,0;
 				disablenpc "Haggard Man";
 				mes "[" +strcharinfo(0)+ "]";
 				mes "Okay, it's time";
@@ -899,7 +789,6 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				emotion e_no1,1;
 				close;
 			}
-		break;
 		case 2:
 			mes "[Haggard Man]";
 			mes "Annon...?";
@@ -923,34 +812,28 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 			mes "hide from Shuda.";
 			mes "^666666*Cries*^000000";
 			close2;
-			set $annonactive,0;
+			set $@annonactive,0;
 			disablenpc "Haggard Man";
 			end;
-		break;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Haggard Man]";
 		mes "Huh? Who are you?";
 		mes "This isn't a safe place for a tourists! You should leave right away!";
 		close2;
-		set $annonactive,0;
+		set $@annonactive,0;
 		disablenpc "Haggard Man";
 		end;
 	}
-	
+
 OnInit:
-	set $annonactive,0;
+	set $@annonactive,0;
 	disablenpc "Haggard Man";
 	end;
-	
 }
 		
 ayothaya,253,99,3	script	Fisherman	843,{
-
-	if(thai_find == 1)
-	{
+	if (thai_find == 1) {
 		mes "[Dannai]";
 		mes "This place is known to be";
 		mes "teeming with fish. The fish here tend to eat anything they find,";
@@ -964,11 +847,9 @@ ayothaya,253,99,3	script	Fisherman	843,{
 		mes "Would you";
 		mes "like to try?";
 		next;
-		switch( select( "Yes.:No, thanks." ) )
-		{
+		switch(select("Yes.:No, thanks.")) {
 		case 1:
-			if(countitem(528) && Zeny > 49) //Monster food
-			{
+			if (countitem(528) && Zeny > 49) {
 				mes "^3355FFYou cast your";
 				mes "fishing line";
 				mes "into the water.^000000";
@@ -980,61 +861,48 @@ ayothaya,253,99,3	script	Fisherman	843,{
 				next;
 				mes "^3355FFYou've hooked a Phen!^000000";
 				next;
-				delitem 528,1; //Monster food
-				set Zeny,Zeny-50;
-				set @randfish,rand(1,100);
-				if(@randfish > 0 && @randfish < 40)
-				{
+				delitem 528,1; //Monster's_Feed
+				set Zeny, Zeny-50;
+				set .@randfish,rand(1,100);
+				if (.@randfish > 0 && .@randfish < 40) {
 					mes "^3355FFWhile cooking the Phen, you";
 					mes "find that it's swallowed a Stone.^000000";
 					close2;
 					getitem 7049,1; //Stone
 					end;
-				}
-				else if(@randfish > 39 && @randfish < 60)
-				{
+				} else if (.@randfish > 39 && .@randfish < 60) {
 					mes "^3355FFInside of the Phen,";
 					mes "you find a Red Potion.^000000";
 					close2;
-					getitem 501,1; //Red potion
+					getitem 501,1; //Red_Potion
 					end;
-				}
-				else if(@randfish > 59 && @randfish < 70)
-				{
+				} else if (.@randfish > 59 && .@randfish < 70) {
 					mes "^3355FFInside of the Phen,";
 					mes "you find a Yellow Potion.^000000";
 					close2;
-					getitem 503,1; //Yellow potion
+					getitem 503,1; //Yellow_Potion
 					end;
-				}
-				else if(@randfish > 69 && @randfish < 80)
-				{
+				} else if (.@randfish > 69 && .@randfish < 80) {
 					mes "^3355FFThere's nothing inside...";
 					mes "But now you can eat Sushi!^000000";
 					close2;
-					getitem 551,1; //Sushi
+					getitem 551,1; //Shusi
 					end;
-				}
-				else if(@randfish > 79 && @randfish < 90)
-				{
+				} else if (.@randfish > 79 && .@randfish < 90) {
 					mes "^3355FFYou find";
 					mes "a Flower Ring";
 					mes "inside the Phen.^000000";
 					close2;
-					getitem 2612,1; //Flower ring
+					getitem 2612,1; //Flower_Ring
 					end;
-				}
-				else if(@randfish == 90)
-				{
+				} else if (.@randfish == 90) {
 					mes "^3355FFYou find";
 					mes "a Diamond Ring";
 					mes "inside the Phen.^000000";
 					close2;
-					getitem 2613,1; //Diamond ring
+					getitem 2613,1; //Diamond_Ring
 					end;
-				}
-				else if(@randfish > 90 && @randfish < 101)
-				{
+				} else if (.@randfish > 90 && .@randfish < 101) {
 					mes "^3355FFYou find a ring";
 					mes "with a name engraved";
 					mes "inside the band.^000000";
@@ -1043,17 +911,15 @@ ayothaya,253,99,3	script	Fisherman	843,{
 					mes "engagement ring.^000000";
 					close2;
 					set thai_find,2;
-					getitem 7288,1; //Engagement ring
+					changequest 12029,12030;
+					getitem 7288,1; //Thai_Ring
 					end;
 				}
-			}
-			else
-			{
+			} else {
 				mes "[Dannai]";
 				mes "Remember, you need ^3355FF1 Monster's Feed^000000 to use as bait and ^3355FF50 zeny^000000 to rend a rod.";
 				close;
 			}
-		break;
 		case 2:
 			mes "[Dannai]";
 			mes "No problem,";
@@ -1062,12 +928,9 @@ ayothaya,253,99,3	script	Fisherman	843,{
 			mes "the mind and makes you";
 			mes "feel at peace...";
 			close;
-		break;
 		}
 		close;
-	}
-	else if(thai_find < 1)
-	{
+	} else if (thai_find < 1) {
 		mes "[Dannai]";
 		mes "The fish here tend";
 		mes "to eat anything they find.";
@@ -1079,9 +942,7 @@ ayothaya,253,99,3	script	Fisherman	843,{
 		mes "why don't you sit down, relax";
 		mes "and enjoy some quiet fishing?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Dannai]";
 		mes "Welcome, long time no see!";
 		mes "It seems people learned that you found some kind of fortune from fishing here. After word got around, I've been getting lots";
@@ -1100,30 +961,26 @@ ayothaya,253,99,3	script	Fisherman	843,{
 		mes "own fortunes.";
 		close;
 	}
-	
 }
-	
+
 ayo_dun01,255,62,0	script	AyoFootprint1	139,2,0,{
 OnTouch:
-	if(thai_find == 4)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 4) {
+		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
 			mes "^3355FFYou find footprints heading to the ^5C3317North^3355FF. It looks like somebody was in quite a hurry, just like the villager said!^000000";
 			set thai_find,5;
+			changequest 12032,12033;
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun01,74,142,0	script	AyoFootprint2	139,2,0,{
 OnTouch:
-	if(thai_find == 5)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 5) {
+		if (rand(1,3) < 2) {
 			emotion e_dots,1;
 			mes "^3355FFYou find another set of footprints. It seems that somebody was running away from something. These prints are heading to the ^5C3317East^3355FF. You'd better follow them to see what";
 			mes "you can find.^000000";
@@ -1131,15 +988,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun01,244,256,2	script	AyoFootprint3	139,2,0,{
 OnTouch:
-	if(thai_find == 6)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 6) {
+		if (rand(1,3) < 2) {
 			emotion e_no,1;
 			mes "^3355FFThe footprints end around this area. Whoever was running must";
 			mes "have been exhausted and stumbled on something. Perhaps the owner of the footprints is nearby...^000000";
@@ -1147,15 +1002,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun01,17,257,0	script	AyoFootprint4	139,2,0,{
 OnTouch:
-	if(thai_find == 7)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 7) {
+		if (rand(1,3) < 2) {
 			emotion e_ic,1;
 			mes "^3355FFAs you follow the footprints,";
 			mes "you arrive at the '^5C3317Entrance of the Shrine^3355FF.' Whoever this person was, he just ran into the second level.^000000";
@@ -1163,15 +1016,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun02,145,120,0	script	AyoFootprint5	139,2,0,{
 OnTouch:
-	if(thai_find == 8)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 8) {
+		if (rand(1,3) < 2) {
 			mes "^3355FFYou find the same footprints";
 			mes "in this place. It seems pretty";
 			mes "dangerous, and you wonder why";
@@ -1182,16 +1033,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
-	
+
 ayo_dun02,135,168,0	script	AyoFootprint6	139,0,2,{
 OnTouch:
-	if(thai_find == 9)
-	{
-		if (rand(1,3) == 1)
-		{
+	if (thai_find == 9) {
+		if (rand(1,3) == 1) {
 			emotion e_gasp,1;
 			mes "^3355FFThe trail of footprints";
 			mes "continue here, and seem";
@@ -1200,18 +1048,15 @@ OnTouch:
 			mes "^3355FFHmm...?";
 			mes "There's something here...^000000";
 			next;
-			switch( select( "Ignore.:^5C3317Investigate.^000000" ) )
-			{
+			switch(select("Ignore.:^5C3317Investigate.^000000")) {
 			case 1:
 				mes "["+strcharinfo(0)+"]";
 				mes "Well, it's probably nothing. But which way should I go now?";
 				set thai_find,10;
 				close;
-			break;
 			case 2:
-				set @randayo,rand(1,10);
-				if(@randayo < 2)
-				{
+				set .@randayo,rand(1,10);
+				if (.@randayo < 2) {
 					mes "["+strcharinfo(0)+"]";
 					mes "Why, this is a pack of White Potions. Whoever owned these must have dropped these by accident. Hmm, I could use these for later...";
 					next;
@@ -1223,11 +1068,9 @@ OnTouch:
 					mes "I better look";
 					mes "into this.";
 					set thai_find,10;
-					getitem 504,10; //White potion
+					getitem 504,10; //White_Potion
 					close;
-				}
-				else if(@randayo > 2 && @randayo < 5)
-				{
+				} else if (.@randayo > 2 && .@randayo < 5) {
 					mes "["+strcharinfo(0)+"]";
 					mes "Why, this is a pack of Yellow Potions. Whoever owned these must have dropped these by accident. Hmm, I could use these for later...";
 					next;
@@ -1241,9 +1084,7 @@ OnTouch:
 					set thai_find,10;
 					getitem 503,10; //Yellow potion
 					close;
-				}
-				else
-				{
+				} else {
 					mes "[Rat]";
 					mes "^FF0000Squeak!";
 					mes "^FF0000Squeak Squeak!^000000";
@@ -1262,20 +1103,17 @@ OnTouch:
 					set thai_find,10;
 					close;
 				}
-			break;
 			}
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun02,77,213,0	script	AyoFootprint7	139,1,1,{
 OnTouch:
-	if(thai_find == 10)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 10) {
+		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
 			mes "^3355FFWhere is he...?";
 			mes "He seems to have gone";
@@ -1286,28 +1124,25 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun02,86,254,0	script	AyoFootprint8	139,1,1,{
 OnTouch:
-	if(thai_find == 11)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 11) {
+		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
 			mes "^3355FFYou find traces of blood. Whoever was running in this direction may have been wounded. The trail of blood leads to the ^5C3317North^3355FF.^000000";
+			changequest 12032,12033;
 			set thai_find,12;
 			close;
 		}
 	}
-	
+	end;
 }
-	
-ayothaya,193,171,3	script	Old Man#02	842,{
 
-	if(thai_find == 3)
-	{
+ayothaya,193,171,3	script	Old Man#02	842,{
+	if (thai_find == 3) {
 		mes "[Tham]";
 		mes "Weird...";
 		mes "Why was that guy";
@@ -1336,13 +1171,11 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 		mes "[Tham]";
 		mes "Oh well, don't worry. All of our villagers aren't like that. Anyway, I hope you enjoy your travels in Ayotaya.";
 		set thai_find,4;
+		changequest 12031,12032;
 		close;
-	}
-	else
-	{
-		set @randayo,rand(1,7);
-		if(@randayo < 5)
-		{
+	} else {
+		set .@randayo,rand(1,7);
+		if (.@randayo < 5) {
 			mes "[Tham]";
 			mes "Oh hello~";
 			mes "I can tell from your clothes that you must be from Rune-Midgard.";
@@ -1370,9 +1203,7 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 			mes "[Tham]";
 			mes "Anyway, I'm sure that you'll like it. I hope that you come visit Ayotaya as often as you can~";
 			close;
-		}
-		else if(@randayo > 4 && @randayo < 7)
-		{
+		} else if (.@randayo > 4 && .@randayo < 7) {
 			mes "[Tham]";
 			mes "Ah~";
 			mes "I've got this craving for Ms. Mali the Spicy's food, especially her 'Tom Yum Goong.'";
@@ -1382,9 +1213,7 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 			mes "most delicious dish";
 			mes "in the entire world!";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Tham]";
 			mes "Oh hello~";
 			mes "I can tell from your clothes that you must be from Rune-Midgard.";
@@ -1394,10 +1223,9 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 			close;
 		}
 	}
-	
 }
 
-// Ayothaya Dungeon Quest
+// Ayothaya Dungeon Quest :: ayo_tiger
 //============================================================
 ayothaya,83,132,0	script	Dusit#thai	843,{
 	if (ayodunquest == 0) {
@@ -1475,6 +1303,7 @@ ayothaya,83,132,0	script	Dusit#thai	843,{
 			mes "[Dusit]";
 			mes "Ah well, you'll see what I'm talking about. I hope he'll help you learn more about that evil creature.";
 			set ayodunquest,1;
+			setquest 12035;
 			close;
 		}
 		mes "[Dusit]";
@@ -1482,8 +1311,7 @@ ayothaya,83,132,0	script	Dusit#thai	843,{
 		mes "Then be careful!";
 		mes "It'll eat you alive!";
 		close;
-	}
-	else if (ayodunquest > 0) {
+	} else if (ayodunquest > 0) {
 		mes "[Dusit]";
 		mes "How are you?";
 		mes "If you're interested";
@@ -1602,8 +1430,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 				mes "Even if you can";
 				mes "wield the power of";
 				mes "holiness, you will still need the spiritual security of our land.";
-			}
-			else {
+			} else {
 				mes "[Boonthom]";
 				mes "There are many ghosts and";
 				mes "demons within the cave, and they will attack people who do not possess holy power... Like you.";
@@ -1625,6 +1452,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "when you prepare all";
 			mes "the materials.";
 			set ayodunquest,2;
+			changequest 12035,12036;
 			close;
 		}
 		mes "[Boonthom]";
@@ -1636,8 +1464,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "............";
 		mes "............";
 		close;
-	}
-	else if (ayodunquest == 2) {
+	} else if (ayodunquest == 2) {
 		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
 			mes "[Boonthom]";
 			mes "Excellent!";
@@ -1664,6 +1491,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			delitem 7190,1; //Solid_Peeling
 			delitem 523,1; //Holy_Water
 			set ayodunquest,3;
+			changequest 12036,12037;
 			getitem 7285,1; //Thread_Skein
 			next;
 			mes "[Boonthom]";
@@ -1688,8 +1516,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "See you later.";
 		close;
-	}
-	else if (ayodunquest == 3) {
+	} else if (ayodunquest == 3) {
 		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
 			mes "[Boonthom]";
 			mes "Excellent! Now you have brought everything I need, let me make the thing for you as I promised...";
@@ -1730,8 +1557,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "See you later.";
 		close;
-	}
-	else if (ayodunquest > 3 && ayodunquest < 9) {
+	} else if (ayodunquest > 3 && ayodunquest < 9) {
 		mes "[Boonthom]";
 		mes "You finally started seeking the tiger. I hope that you will be safe from harm.";
 		next;
@@ -1739,8 +1565,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "Feel free to ask";
 		mes "me for help at anytime.";
 		close;
-	}
-	else if (ayodunquest == 9) {
+	} else if (ayodunquest == 9) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I copied down this";
 		mes "message while exploring";
@@ -1777,14 +1602,14 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "^3366992 Needle Packet^000000 and";
 		mes "^3366992 Spool^000000.";
 		set ayodunquest,10;
+		changequest 12037,12038;
 		next;
 		mes "[Boonthom]";
 		mes "Return to me";
 		mes "once you have";
 		mes "gathered everything.";
 		close;
-	}
-	else if (ayodunquest == 10) {
+	} else if (ayodunquest == 10) {
 		if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1) {
 			mes "[Boonthom]";
 			mes "Hmm~";
@@ -1813,6 +1638,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			delitem 523,2; //Holy_Water
 			set ayodunquest,11;
 			getitem 7287,1; //Thread_Skein_
+			changequest 12038,12039;
 			next;
 			mes "[Boonthom]";
 			mes "Even if you lose this, don't worry. Just bring me the materials, and";
@@ -1839,8 +1665,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "more powerful holy";
 		mes "threads for you.";
 		close;
-	}
-	else if (ayodunquest == 11) {
+	} else if (ayodunquest == 11) {
 		if (countitem(7287) > 0) {
 			mes "[Boonthom]";
 			mes "Those threads";
@@ -1850,8 +1675,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "to you to defend yourself";
 			mes "from monster attacks, okay?";
 			close;
-		}
-		else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
 			mes "[Boonthom]";
 			mes "Ooooohmmmmm...";
 			next;
@@ -1886,8 +1710,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "^3366992 Needle Packet^000000 and";
 		mes "^3366992 Spool^000000.";
 		close;
-	}
-	else if (ayodunquest == 12) {
+	} else if (ayodunquest == 12) {
 		mes "[Boonthom]";
 		mes "Huh...!";
 		mes "You must have seen something.";
@@ -1914,17 +1737,16 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "If you wish to explore the building again, but you don't have any holy thread, feel free to ask me at anytime.";
 		set ayodunquest,13;
+		completequest 12039;
 		close;
-	}
-	else if (ayodunquest > 12) {
+	} else if (ayodunquest > 12) {
 		if (countitem(7287) > 0) {
 			mes "[Boonthom]";
 			mes "Best of luck on your";
 			mes "expeditions, brave";
 			mes "adventurer~";
 			close;
-		}
-		else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
 			mes "[Boonthom]";
 			mes "Lost the";
 			mes "holy threads";
@@ -2210,6 +2032,7 @@ ayo_dun01,99,118,0	script	 #hun_thai_5	111,{
 ayo_dun01,16,188,0	script	 #hun_thai_6	111,{
 	if (ayodunquest == 8) {
 		set ayodunquest,9;
+		setquest 12036;
 		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the last part of the slate.^000000";
 		next;
 		mes "^3355FFIt reads '^0000FFOtherwise, it's impossible...^3355FF' You are unable to read the rest of the message.^000000";
@@ -2231,8 +2054,7 @@ ayo_dun01,24,283,0	script	 #2_dun_in	111,{
 			close2;
 			if (rand(1,10) > 5) {
 				warp "ayo_dun02",23,26;
-			}
-			else {
+			} else {
 				warp "ayo_dun02",275,26;
 			}
 			end;
@@ -2259,12 +2081,13 @@ ayo_dun02,268,108,0	script	 #reward_tiger	111,{
 		mes "^3355FFYou pick";
 		mes "up the box.^000000";
 		set ayodunquest,12;
+		completequest 12039;
 		getitem 603,1; //Old_Blue_Box
 		close;
 	}
 }
 
-// Tom Tung Goong Quest
+// Tom Tung Goong Quest :: ayo_tom
 //============================================================
 ayothaya,196,265,3	script	Einon#ayo	842,{
 	if (tomyumgoong == 0) {
@@ -2305,6 +2128,7 @@ ayothaya,196,265,3	script	Einon#ayo	842,{
 			next;
 			emotion e_no1;
 			set tomyumgoong,1;
+			setquest 8123;
 			mes "[Einon]";
 			mes "She is the best cook when it";
 			mes "comes to Tom Yum Goong!";
@@ -2318,8 +2142,7 @@ ayothaya,196,265,3	script	Einon#ayo	842,{
 		mes "change your mind,";
 		mes "please come back.";
 		close;
-	}
-	else if (tomyumgoong == 1) {
+	} else if (tomyumgoong == 1) {
 		mes "[Einon]";
 		mes "Ah, you wanna know";
 		mes "where ^3131FFMali the Spicy^000000 is?";
@@ -2340,7 +2163,7 @@ ayothaya,196,265,3	script	Einon#ayo	842,{
 	mes "Wouldn't you agree with me?";
 	close;
 }
-	
+
 ayo_in01,145,163,3	script	Cook#ayo	839,{
 	if (tomyumgoong < 2) {
 		mes "[Mali the Spicy]";
@@ -2356,8 +2179,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "it's my fate to cook the greatest Tom Yum Goong ever.";
 		if (tomyumgoong == 0) {
 			close;
-		}
-		else {
+		} else {
 			next;
 			mes "[Mali the Spicy]";
 			mes "Oh I see...";
@@ -2397,6 +2219,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				mes "my name, that guy";
 				mes "might give you a discount.";
 				set tomyumgoong,2;
+				changequest 8123,8124;
 				next;
 				mes "[Mali the Spicy]";
 				mes "His name is ^3131FFThongpool^000000.";
@@ -2408,8 +2231,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 			mes "a try if you really want to taste the best Tom Yum Goong.";
 			close;
 		}
-	}
-	else if (tomyumgoong > 1 && tomyumgoong < 4) {
+	} else if (tomyumgoong > 1 && tomyumgoong < 4) {
 		if (tomyumgoong == 2 && countitem(567) > 19) {
 			mes "[Mali the Spicy]";
 			mes "Errr...";
@@ -2428,8 +2250,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 			mes "and ask him to give you the freshest Shrimp to cook the best";
 			mes "Tom Yum Goong?";
 			close;
-		}
-		else if (tomyumgoong == 3) {
+		} else if (tomyumgoong == 3) {
 			if (countitem(567) > 19) {
 				mes "[Mali the Spicy]";
 				mes "Ah, you came back!";
@@ -2456,6 +2277,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				next;
 				if (select("Where can I find Lemons?:I hate sour food. I'd better quit!") == 1) {
 					set tomyumgoong,4;
+					changequest 8124,8125;
 					mes "[Mali the Spicy]";
 					mes "A few days ago, I saw a good";
 					mes "Lemon tree while taking a walk.";
@@ -2493,8 +2315,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "you 20 Shrimps.";
 		mes "Now hurry~";
 		close;
-	}
-	else if (tomyumgoong > 3 && tomyumgoong < 6) {
+	} else if (tomyumgoong > 3 && tomyumgoong < 6) {
 		if (tomyumgoong == 4 && countitem(568) > 9) {
 			mes "[Mali the Spicy]";
 			mes "You think these are";
@@ -2508,8 +2329,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 			mes "fresh! They're just";
 			mes "common Lemons!";
 			close;
-		}
-		else if (tomyumgoong == 5) {
+		} else if (tomyumgoong == 5) {
 			if (countitem(568) > 9) {
 				emotion e_gasp;
 				mes "[Mali the Spicy]";
@@ -2538,6 +2358,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				if (select("Okay, I'll be right back.:Ah, I'm tired now. Let me take a rest first...") == 1) {
 					delitem 568,10; //Lemon
 					set tomyumgoong,6;
+					changequest 8125,8126;
 					mes "[Mali the Spicy]";
 					mes "See you in a bit~";
 					close;
@@ -2569,8 +2390,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "Lemons so that I can make";
 		mes "some Tom Yum Goong!";
 		close;
-	}
-	else if (tomyumgoong == 6) {
+	} else if (tomyumgoong == 6) {
 		if (countitem(7286) > 29) {
 			mes "[Mali the Spicy]";
 			mes "I don't understand...";
@@ -2587,10 +2407,8 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "[Malli the Spicy]";
 		mes "Please go take a look in the Market. I don't doubt that it will be a good experience. After all, my fantastic Tom Yum Goong is waiting for you!";
 		close;
-	}
-	else if (tomyumgoong == 7) {
-		set .@now_weight,MaxWeight-Weight;
-		if (.@now_weight > 1499) {
+	} else if (tomyumgoong == 7) {
+		if (MaxWeight - Weight > 1499) {
 			if (countitem(7286) > 29) {
 				delitem 7286,30; //Chilli
 				emotion e_gasp;
@@ -2638,6 +2456,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				mes " .........";
 				next;
 				set tomyumgoong,8;
+				completequest 8126;
 				getitem 566,10; //Tomyumkung
 				emotion e_no1;
 				mes "[Mali the Spicy]";
@@ -2686,7 +2505,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 	mes "Heh heh heh~!";
 	close;
 }
-	
+
 ayothaya,153,86,5	script	Thongpool#ayo	843,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -2726,9 +2545,8 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 			next;
 			if (select("I will take them.:I could get 100 Jellopies for that much!") == 1) {
 				if (Zeny > 10999) {
-					set .@now_weight,MaxWeight-Weight;
-					if (.@now_weight > 3999) {
-						set zeny,zeny-11000;
+					if (MaxWeight - Weight > 3999) {
+						set Zeny, Zeny-11000;
 						set tomyumgoong,3;
 						getitem 567,20; //Prawn
 						emotion e_no1;
@@ -2761,8 +2579,7 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 		mes "of Tom Yum Goong";
 		mes "is priceless!";
 		close;
-	}
-	else if (tomyumgoong == 3) {
+	} else if (tomyumgoong == 3) {
 		mes "[Thongpool]";
 		mes "Mmm...?";
 		mes "Did you need";
@@ -2772,9 +2589,8 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 		next;
 		if (select("Yes!:No, thanks.") == 1) {
 			if (Zeny > 10999) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight > 3999) {
-					set zeny,zeny-11000;
+				if (MaxWeight - Weight > 3999) {
+					set Zeny, Zeny-11000;
 					getitem 567,20; //Prawn
 					mes "[Thongpool]";
 					mes "There you go~";
@@ -2802,9 +2618,9 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 	mes "I've got the best Shrimp caught in the cleanest waters in the world~!";
 	close;
 }
-	
+
 ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
-	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -2852,7 +2668,7 @@ ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
 	close;
 
 OnTouch:
-	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -3124,9 +2940,8 @@ ayothaya,213,94,7	script	Merchant#ayo	841,{
 		if (select("Thanks, I'll take it.:It's a rip-off, man!") == 1) {
 			emotion e_thx;
 			if (Zeny > 1999) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight > 1199) {
-					set zeny,zeny-2000;
+				if (MaxWeight - Weight > 1199) {
+					set Zeny, Zeny-2000;
 					set tomyumgoong,7;
 					getitem 7286,30; //Chilli
 					mes "[Merchant Thongdum]";
@@ -3163,8 +2978,7 @@ ayothaya,213,94,7	script	Merchant#ayo	841,{
 		mes "reasonable. I want you to know";
 		mes "that I'm a respectable Merchant.";
 		close;
-	}
-	else if (tomyumgoong == 7) {
+	} else if (tomyumgoong == 7) {
 		mes "[Merchant Thongdum]";
 		mes "I thought I provided you";
 		mes "with enough ingredients, but";
@@ -3182,9 +2996,8 @@ ayothaya,213,94,7	script	Merchant#ayo	841,{
 			close;
 		}
 		if (Zeny > 1999) {
-			set .@now_weight,MaxWeight-Weight;
-			if (.@now_weight > 1199) {
-				set zeny,zeny-2000;
+			if (MaxWeight - Weight > 1199) {
+				set Zeny, Zeny-2000;
 				getitem 7286,30; //Chilli
 				mes "[Merchant Thongdum]";
 				mes "Thank you,";
diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt
index 710bd1d42..5fa68c77e 100644
--- a/npc/quests/quests_comodo.txt
+++ b/npc/quests/quests_comodo.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Comodo
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5b
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= Headgear Quests 1 [Aegis Conversion]:
+//===== Description: =========================================
+//= Headgear Quests 1 [Official Conversion]:
 //= - 'Cross Hat', 'Bulb Hairband'
 //= - 'Striped Hairband', 'Blue Hairband'
 //= Headgear Quests 2:
@@ -18,7 +16,7 @@
 //= - Part 2: Found in Quests_Yuno.txt
 //= - Part 3: Found in Doomed_Swords.txt
 //= - Variable in use: dmdswrd_Q (Max 45)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed exploits [Lupus]
 //= 1.2 Added more quest from cities/comodo.txt [Evera]
 //= 1.2a missing label [Lupus]
@@ -28,11 +26,11 @@
 //= 1.5a Fixed a bad countitem. (bugreport:840) [Samuray22]
 //= 1.5b Fixed stripped hairband and blue hairband checking the wrong amount of items, bugreport:1674 [Brainstorm]
 //= 1.6 Updated headgear quest NPCs. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 // Headgear Quests 1
 // Cross Hat, Bulb Hairband, Striped Hairband, Blue Hairband
-//============================================================ 
+//============================================================
 comodo,228,159,3	script	Hair Ornament Girl	700,{
 	mes "[Hair Ornament Girl]";
 	if (Sex == 1) {
@@ -229,7 +227,7 @@ comodo,228,159,3	script	Hair Ornament Girl	700,{
 
 // Headgear Quests 2
 // 'Mine Helmet', 'Parcel Hat', 'Money Loser's Grief', 'Phantom of the Opera Mask'
-//============================================================ 
+//============================================================
 comodo,273,137,4	script	Traveler#head	702,{
 	mes "[Isac Mari]";
 	mes "I travel around the world, and collect many interesting stories from people. Sometimes they teach me how to make special items.";
@@ -472,7 +470,7 @@ comodo,273,137,4	script	Traveler#head	702,{
 }
 
 // Doomed Swords - Comodo Portion. (Continued in Juno)
-//============================================================ 
+//============================================================
 comodo,206,310,4	script	Campground Boy#cmd	704,{
 	switch (dmdswrd_Q) {
 	case 0:
@@ -1579,7 +1577,7 @@ comodo,187,153,4	script	Hullaris#cmd	701,{
 		mes "Love together~";
 		mes "Love! Love!";
 		mes "Love togeth-hm?";
-		if (sex) {
+		if (Sex) {
 			mes "Boy, you're ruining";
 			mes "my groove! Now beat it!";
 		}
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index 299922954..a0717be84 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -1,11 +1,11 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Einbroch and Einbech
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Evera and The rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.6
-//===== Description: ========================================= 
-//= [Aegis conversion]
+//===== Current Version: =====================================
+//= 2.7
+//===== Description: =========================================
+//= [Official Conversion]
 //= Oridecon/Mineral Quest
 //= - Variable in use: ein_gear1 (max 2)
 //= - Variable in use: $ein_amano (max 60)
@@ -18,11 +18,11 @@
 //= - Variable in use: Shinokas_Quest (max 11)
 //= Lovers Quest
 //= - Variable in use: EIN_LOVERQ (max 17)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Initial Release [Evera]
 //= 1.1 Added more quests [Evera]
 //= 1.2 Added quest bits from Einbech and renamed file to
-//=	quests_ein.txt [Evera]
+//=     quests_ein.txt [Evera]
 //= 1.3 Implemented the polution quest. [MasterOfMuppets]
 //= 1.4.1 Massive bugfix. Fixed Pollution exploit [Lupus]
 //= 1.4.2 Fixed Khowropher bug [Lupus]
@@ -47,13 +47,14 @@
 //= 2.5 Added quest log entries for:
 //=     - Factory Quest
 //=     - Murder Quest
-//= 2.6 Added renewal checks for exp distribution [Streusel]
-//============================================================ 
+//= 2.6 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.7 Added GM management function. [Euphy]
+//============================================================
 
-// Oridecon Stone OR Mineral Stone Quest
-//============================================================ 
+// Oridecon Stone OR Mineral Stone Quest :: ein_amano
+//============================================================
 einbech,97,167,5	script	Cavitar	847,{
-	if (ein_gear1 == 2){
+	if (ein_gear1 == 2) {
 		mes "[Cavitar]";
 		mes "It's been a long";
 		mes "time, my friend. With";
@@ -68,7 +69,7 @@ einbech,97,167,5	script	Cavitar	847,{
 		mes "come visit my town.";
 		close;
 	}
-	else if(ein_gear1 == 1){
+	else if (ein_gear1 == 1) {
 		mes "[Cavitar]";
 		mes "Oh, welcome.";
 		mes "So did you bring";
@@ -469,7 +470,7 @@ einbech,97,167,5	script	Cavitar	847,{
 	}
 }
 
-// Uwe Kleine
+// Uwe Kleine :: ein_anoz
 //============================================================
 einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 	set EinUwe,0;
@@ -2308,7 +2309,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 					mes "In fact, I still use the old knife I used back when I was just";
 					mes "a little novice chef~";
 					next;
-					mes "[Uwe]"							;
+					mes "[Uwe]";
 					mes "Well, that was";
 					mes "a fun talk. Come";
 					mes "back and visit, 'kay?";
@@ -2541,7 +2542,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 						mes "In fact, I still use the old knife I used back when I was just";
 						mes "a little novice chef~";
 						next;
-						mes "[Uwe]"							;
+						mes "[Uwe]";
 						mes "Well, that was";
 						mes "a fun talk. Come";
 						mes "back and visit, 'kay?";
@@ -2817,7 +2818,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 						mes "In fact, I still use the old knife I used back when I was just";
 						mes "a little novice chef~";
 						next;
-						mes "[Uwe]"							;
+						mes "[Uwe]";
 						mes "Well, that was";
 						mes "a fun talk. Come";
 						mes "back and visit, 'kay?";
@@ -3208,7 +3209,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 	}
 }
 
-// Factory Quest
+// Factory Quest :: ein_factory
 //============================================================
 einbroch,1,1,0	script	Einbroch Smog Alert	-1,{
 	end;
@@ -3554,50 +3555,22 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 			set $EinPolution,$EinPolution+1;
 			completequest 8031;
 			set EinFactory,16;
-			if(checkre(0)) {
-				if (BaseLevel < 41) {
-					getexp 61,0;
-				}
-				else if (BaseLevel < 51) {
-					getexp 307,0;
-				}
-				else if (BaseLevel < 61) {
-					getexp 660,0;
-				}
-				else if (BaseLevel < 71) {
-					getexp 1850,0;
-				}
-				else if( BaseLevel < 81) {
-					getexp 3206,0;
-				}
-				else if (BaseLevel < 91) {
-					getexp 7602,0;
-				}
-				else if (BaseLevel < 99) {
-					getexp 29067,0;
-				}
-			}else {
-				if (BaseLevel < 41) {
-					getexp 615,0;
-				}
-				else if (BaseLevel < 51) {
-					getexp 3075,0;
-				}
-				else if (BaseLevel < 61) {
-					getexp 6604,0;
-				}
-				else if (BaseLevel < 71) {
-					getexp 18508,0;
-				}
-				else if( BaseLevel < 81) {
-					getexp 32062,0;
-				}
-				else if (BaseLevel < 91) {
-					getexp 76026,0;
-				}
-				else if (BaseLevel < 99) {
-					getexp 290675,0;
-				}			
+			if (checkre(3)) {
+				if (BaseLevel < 41) getexp 61,0;
+				else if (BaseLevel < 51) getexp 307,0;
+				else if (BaseLevel < 61) getexp 660,0;
+				else if (BaseLevel < 71) getexp 1850,0;
+				else if (BaseLevel < 81) getexp 3206,0;
+				else if (BaseLevel < 91) getexp 7602,0;
+				else getexp 29067,0;
+			} else {
+				if (BaseLevel < 41) getexp 615,0;
+				else if (BaseLevel < 51) getexp 3075,0;
+				else if (BaseLevel < 61) getexp 6604,0;
+				else if (BaseLevel < 71) getexp 18508,0;
+				else if (BaseLevel < 81) getexp 32066,0;
+				else if (BaseLevel < 91) getexp 76026,0;
+				else getexp 290675,0;
 			}
 			next;
 			mes "[Zelmeto]";
@@ -4194,21 +4167,24 @@ ein_in01,95,239,3	script	Conveyor#ins2	111,{
 }
 
 // Administrator NPC used to rig the invasion in Einbroch.
-/**/
 sec_in02,127,86,3	script	Factory Quest Test	851,{
-	input .@input; //,0,9000;
-	if ((.@input < 0) || (.@input > 9000)) {
+	set .@i, callfunc("F_GM_NPC",8028,0,0,9000);
+	if (.@i == -2) {
 		mes "[Test1]";
 		mes "Boo~ya.";
 		close;
-	}
-	else if (.@input == 0) {
+	} else if (.@i == -1) {
 		mes "[Test1]";
 		mes "Do you want";
 		mes "to cancel~?";
 		close;
-	}
-	else if (.@input == 8028) {
+	} else if (.@i == 0) {
+		mes "[Test1]";
+		mes "Whoa...";
+		mes "That is";
+		mes "sooo wrong!";
+		close;
+	} else {
 		mes "[Test1]";
 		mes "The current value";
 		mes "of the global variable";
@@ -4236,18 +4212,10 @@ sec_in02,127,86,3	script	Factory Quest Test	851,{
 			close;
 		}
 	}
-	else {
-		mes "[Test1]";
-		mes "Whoa...";
-		mes "That is";
-		mes "sooo wrong!";
-		close;
-	}
 }
-/**/
 
-// Murder Quest
-//============================================================ 
+// Murder Quest :: ein_main_tre
+//============================================================
 einbech,165,105,7	script	Buender Hikeman#ein	847,{
 	cutin "ein_hicman",2;
 	if (Shinokas_Quest == 0) {
@@ -4697,32 +4665,16 @@ einbech,165,105,7	script	Buender Hikeman#ein	847,{
 			cutin "ein_hicman",255;
 			completequest 2078;
 			set Shinokas_Quest,11;
-			if(checkre(0)) {
-				if (BaseLevel < 70) {
-					getexp 10000,8000;
-				}
-				else if ((BaseLevel > 69) && (BaseLevel < 80)) {
-					getexp 30000,10000;
-				}
-				else if ((BaseLevel > 79) && (BaseLevel < 90)) {
-					getexp 50000,30000;
-				}
-				else if ((BaseLevel > 89) && (BaseLevel < 100)) {
-					getexp 70000,50000;
-				}
+			if (checkre(3)) {
+				if (BaseLevel < 70) getexp 30000,30000;
+				else if ((BaseLevel > 69) && (BaseLevel < 80)) getexp 40000,40000;
+				else if ((BaseLevel > 79) && (BaseLevel < 90)) getexp 70000,70000;
+				else getexp 90000,90000;
 			} else {
-				if (BaseLevel < 70) {
-					getexp 100000,80000;
-				}
-				else if ((BaseLevel > 69) && (BaseLevel < 80)) {
-					getexp 300000,100000;
-				}
-				else if ((BaseLevel > 79) && (BaseLevel < 90)) {
-					getexp 500000,300000;
-				}
-				else if ((BaseLevel > 89) && (BaseLevel < 100)) {
-					getexp 700000,500000;
-				}
+				if (BaseLevel < 70) getexp 100000,80000;
+				else if ((BaseLevel > 69) && (BaseLevel < 80)) getexp 300000,100000;
+				else if ((BaseLevel > 79) && (BaseLevel < 90)) getexp 500000,300000;
+				else getexp 700000,500000;
 			}
 			end;
 		case 2:
@@ -5045,7 +4997,7 @@ ein_in01,231,163,7	script	Sick Old Man#ein	849,{
 		mes "anything from the";
 		mes "Kapellthaines?";
 		next;
-		mes "["+strcharinfo(0)+"]"	;
+		mes "["+strcharinfo(0)+"]";
 		mes "Well, Mr. Kapellthaine";
 		mes "is kind of violent, but";
 		mes "I didn't find anything";
@@ -5719,7 +5671,8 @@ einbech,57,210,3	script	Young Man#Shinokas_Quest	855,{
 	close;
 }
 
-
+// Typing Test :: ein_main_ma1
+//============================================================
 einbroch,51,52,0	script	Security#ein	45,1,1,{
 	end;
 
@@ -5872,8 +5825,8 @@ OnTouch:
 	}
 }
 
-// Lovers Quest
-//============================================================ 
+// Lovers Quest :: ein_ryu
+//============================================================
 ein_in01,31,138,3	script	Calla#ein	90,{
 	if (checkweight(908,70) == 0) {
 		mes "^3355FFWait a second!";
@@ -5984,38 +5937,17 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 		mes "feel goooood~";
 		percentheal 100,0;
 		set EIN_LOVERQ,17;
-		if(checkre(0)) {
-			if (BaseLevel < 41) {
-				getexp 61,0;
-			}
-			else if (BaseLevel < 61) {
-				getexp 600,0;
-			}
-			else if (BaseLevel < 81) {
-				getexp 3000,0;
-			}
-			else if (BaseLevel < 99) {
-				getexp 20000,0;
-			}
+		if (checkre(3)) {
+			if (BaseLevel < 41) getexp 61,0;
+			else if (BaseLevel < 61) getexp 600,0;
+			else if (BaseLevel < 81) getexp 3000,0;
+			else if (BaseLevel < 99) getexp 20000,0;
+			else getexp 30000,0;
 		} else {
-			if (BaseLevel < 41) {
-				getexp 3712,0;
-			}
-			else if (BaseLevel < 61) {
-				getexp 7425,0;
-			}
-			else if (BaseLevel < 71) {
-				getexp 14850,0;
-			}
-			else if (BaseLevel < 81) {
-				getexp 29700,0;
-			}
-			else if (BaseLevel < 91) {
-				getexp 59400,0;
-			}
-			else if (BaseLevel < 99) {
-				getexp 118800,0;
-		}
+			if (BaseLevel < 41) getexp 610,0;
+			else if (BaseLevel < 61) getexp 6000,0;
+			else if (BaseLevel < 81) getexp 30000,0;
+			else getexp 200000,0;
 		}
 		next;
 		mes "[Calla]";
@@ -6032,6 +5964,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 		mes "I'll always pray for";
 		mes "your safety on your";
 		mes "your adventures~";
+		completequest 8088;
 		close;
 	}
 	if ((EIN_LOVERQ == 5) && (countitem(712) > 0)) {
@@ -6071,6 +6004,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 			mes "^333333*Sob Sob...*^000000";
 			delitem 712,1; //Flower
 			set EIN_LOVERQ,6;
+			changequest 8079,808;
 			close;
 		}
 		else {
@@ -6104,6 +6038,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 		mes "this time? Thank you";
 		mes "for your help~";
 		set EIN_LOVERQ,3;
+		changequest 8078,8077;
 		getitem 1901,1; //Violin
 		close;
 	}
@@ -6146,6 +6081,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 		mes "all the time...";
 		next;
 		set EIN_LOVERQ,3;
+		changequest 8076,8077;
 		getitem 1901,1; //Violin
 		mes "[Calla]";
 		mes "I'm sorry to trouble you,";
@@ -6236,6 +6172,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 			mes "even be useful to you later~";
 			delitem 7170,1; //Tuxedo
 			set EIN_LOVERQ,16;
+			changequest 8087,8088;
 			switch(rand(1,7)) {
 			case 1:
 				getitem 7289,1; //Olivine
@@ -6333,6 +6270,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 		mes "W-what should I do?";
 		next;
 		set EIN_LOVERQ,14;
+		changequest 8085,8086;
 		mes "[Klitzer]";
 		mes "This monkey suit";
 		mes "that I've got on just";
@@ -6381,6 +6319,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 			mes "my regards if you help me.";
 			next;
 			set EIN_LOVERQ,7;
+			changequest 8080,8081;
 			mes "[Klitzer]";
 			mes "I feel so much";
 			mes "better now. Oh!";
@@ -6473,38 +6412,18 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 		percentheal 100,0;
 		delitem 1901,1; //Violin
 		set EIN_LOVERQ,5;
-		if(checkre(0)) {
-			if (BaseLevel < 41) {
-				getexp 61,0;
-			}
-			else if (BaseLevel < 61) {
-				getexp 600,0;
-			}
-			else if (BaseLevel < 81) {
-				getexp 3000,0;
-			}
-			else if (BaseLevel < 99) {
-				getexp 20000,0;
-			}
+		changequest 8077,8079;
+		if (checkre(3)) {
+			if (BaseLevel < 41) getexp 61,0;
+			else if (BaseLevel < 61) getexp 600,0;
+			else if (BaseLevel < 81) getexp 3000,0;
+			else if (BaseLevel < 99) getexp 20000,0;
+			else getexp 30000,0;
 		} else {
-			if (BaseLevel < 41) {
-				getexp 3712,0;
-			}
-			else if (BaseLevel < 61) {
-				getexp 7425,0;
-			}
-			else if (BaseLevel < 71) {
-				getexp 14850,0;
-			}
-			else if (BaseLevel < 81) {
-				getexp 29700,0;
-			}
-			else if (BaseLevel < 91) {
-				getexp 59400,0;
-			}
-			else if (BaseLevel < 99) {
-				getexp 118800,0;
-		}
+			if (BaseLevel < 41) getexp 610,0;
+			else if (BaseLevel < 61) getexp 6000,0;
+			else if (BaseLevel < 81) getexp 30000,0;
+			else getexp 200000,0;
 		}
 		next;
 		mes "[Klitzer]";
@@ -6556,6 +6475,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 		mes "give anything to see her...";
 		next;
 		set EIN_LOVERQ,2;
+		setquest 8076;
 		mes "[Klitzer]";
 		mes "Just...";
 		mes "Just don't listen";
@@ -6634,6 +6554,7 @@ OnTouch:
 		mes "wakes up, it won't be today!";
 		delitem 1901,1; //Violin
 		set EIN_LOVERQ,4;
+		changequest 8077,8078;
 		percentheal -90,0;
 		close2;
 		warp "einbroch",112,245;
@@ -6748,6 +6669,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 			next;
 			delitem 1003,10; //Coal
 			set EIN_LOVERQ,13;
+			changequest 8084,8085;
 			mes "[Satra]";
 			mes "Anyway, when you next";
 			mes "meet Klitzer, please tell";
@@ -6859,7 +6781,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 		mes "here for sight seeing,";
 		mes "or perhaps you're running";
 		mes "some sort of adventurer's";
-		mes "errand. Am I right?"	;
+		mes "errand. Am I right?";
 		next;
 		mes "[Satra]";
 		mes "I know you well enough";
@@ -6973,6 +6895,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 		next;
 		delitem 1003,10; //Coal
 		set EIN_LOVERQ,10;
+		changequest 8083,8084;
 		mes "[Satra]";
 		mes "Well, I shall try to";
 		mes "find some use for these.";
@@ -7123,6 +7046,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 		mes "this kind of task will require";
 		mes "some effort on your part.";
 		set EIN_LOVERQ,9;
+		changequest 8082,8083;
 		next;
 		mes "[Satra]";
 		mes "Tah tah,";
@@ -7197,6 +7121,7 @@ ein_in01,191,102,5	script	Kaijeta#ein	846,{
 		mes "He gets so nervous about it!";
 		next;
 		set EIN_LOVERQ,15;
+		changequest 8086,8087;
 		mes "[Kaijeta]";
 		mes "A man should wear nice";
 		mes "clothes, like a Formal Suit";
@@ -7211,6 +7136,7 @@ ein_in01,191,102,5	script	Kaijeta#ein	846,{
 		mes "petty hatred between our";
 		mes "two towns stop my son from";
 		mes "seeing the woman he loves...";
+		changequest 8081,8082;
 		close;
 	}
 	if (EIN_LOVERQ == 7) {
diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt
index b7f4550d7..a220fd654 100644
--- a/npc/quests/quests_geffen.txt
+++ b/npc/quests/quests_geffen.txt
@@ -1,20 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Geffen
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88 & Samuray22
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena 7.15 +
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
 //= Welding Mask and Headset Quests.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed exploits [Lupus]
 //= 1.2 Removed Duplicates [Silent]
 //= 1.3 Updated "Welding Mask" Quest to the Official one. [Samuray22]
 //= 1.3a replaced item "names" with item id. Added missing [Lupus]
 //= 1.4 Updated welding mask and headset quests. [L0ne_W0lf]
-//============================================================ 
+//= 1.5 Added Number Match Game. [Euphy]
+//============================================================
 
 // Blacksmith: 'Welding Mask' Quest
 //============================================================
@@ -162,3 +161,268 @@ geffen_in,30,71,4	script	Eric	83,{
 		close;
 	}
 }
+
+// Number Match Game :: gef_yagu
+//============================================================
+geffen,122,77,4	script	Nia#yagu	700,{
+	mes "[Nia]";
+	mes "Hello, I'm Nia, the fifth";
+	mes "disciple of Mawong, the";
+	mes "gaming mastermind. Now,";
+	mes "how would you like to play a";
+	mes "Number Match game with me?";
+	next;
+	switch(select("Number Match Game?:Practice Number Match:Play Number Match:Record Holder:Cancel")) {
+	case 1:
+		mes "[Nia]";
+		mes "Ah, well, the objective of";
+		mes "the Number Match game is to";
+		mes "guess the number I'm thinking";
+		mes "of. Of course, there are a few";
+		mes "rules that limit the numbers";
+		mes "that I can choose from.";
+		next;
+		mes "[Nia]";
+		mes "All the numbers that I make";
+		mes "up must be 3 digits, I can't";
+		mes "use 0 for any of the digits,";
+		mes "and I can't use the same";
+		mes "number for any of the digits";
+		mes "more than once.";
+		next;
+		mes "[Nia]";
+		mes "So, for example, I can't";
+		mes "use the numbers 103, 112,";
+		mes "252, or 701. Those numbers";
+		mes "either have a 0, or they use";
+		mes "the same number in the digits";
+		mes "more than once. Got it now?";
+		next;
+		mes "[Nia]";
+		mes "Now, you only get 5 guesses,";
+		mes "and after each guess, I'll tell";
+		mes "you how many digits you guessed";
+		mes "correctly, followed by the number of correctly guessed digits in";
+		mes "the correct digit place.";
+		next;
+		mes "[Nia]";
+		mes "For example, let's say the";
+		mes "number I come up with is 168.";
+		mes "If your first guess is 678, then you guessed two of the digits,";
+		mes "6 and 8, correctly. However,";
+		mes "only 8 is in the correct place.";
+		next;
+		mes "[Nia]";
+		mes "You know, it'd be a good idea";
+		mes "if you try the Practice Mode";
+		mes "first. Then, when you're more";
+		mes "comfortable, play the actual";
+		mes "Number Match game. Don't forget that speed counts for your score!";
+		next;
+		mes "[Nia]";
+		mes "Ah, if you happen to";
+		mes "make a new record in the";
+		mes "Number Match game, you'll";
+		mes "have your name recorded,";
+		mes "so don't miss this chance for";
+		mes "fame and maybe even fortune~";
+		close;
+	case 2:
+		mes "[Nia]";
+		mes "Great, let's do a practice";
+		mes "Number Match game. Please";
+		mes "try to guess my number, okay?";
+		mes "If you want to cancel, then please enter a number greater than 1,000.";
+		set .@practice,1;
+		break;
+	case 3:
+		mes "[Nia]";
+		mes "Great, let's play Number Match!";
+		mes "You will have 5 chances to guess the number that I'm thinking of.";
+		mes "If you want to cancel, then please enter a number greater than 1,000.";
+		set .@practice,0;
+		break;
+	case 4:
+		set .@name_record$, $050908_minus1_yagu$;
+		if (.@name_record$ == "") //custom
+			set .@name_record$,"(null)";
+		set .@score_record, $050908_minus1_yagu;
+		set .@score_min, .@score_record / 60;
+		set .@score_sec, .@score_record % 60;
+		mes "[Nia]";
+		mes "^ff0000" + .@name_record$ + "^000000 is the";
+		mes "record holder for the Number";
+		mes "Match game with a time of";
+		mes "^ff0000" + .@score_min + " minutes, " + .@score_sec + " seconds^000000.";
+		close;
+	case 5:
+		mes "[Nia]";
+		mes "Take care of yourself,";
+		mes "adventurer. If you ever";
+		mes "feel like playing a Number";
+		mes "Match game, come and talk";
+		mes "to me, alright? See you~";
+		close;
+	}
+	next;
+
+	// Generate 3 digits of a number.
+	while(1) {
+		set .@yagu100, rand(1,9);
+		set .@yagu10, rand(1,9);
+		set .@yagu1, rand(1,9);
+		if ((.@yagu100 != .@yagu10) && (.@yagu100 != .@yagu1) && (.@yagu10 != .@yagu1)) {
+			// Store the actual number (unofficial).
+			set .@yagu, (100*.@yagu100) + (10*.@yagu10) + .@yagu1;
+			break;
+		}
+	}
+
+	// The official time calculation is based on ServerTime,
+	// an int HHMMSS equivalent to atoi(gettimestr("%H%M%S",7)).
+	// UNIX time is really a better way to do this.
+	set .@start_time, gettimetick(2);
+
+	while(1) {
+
+		// Guess a number that meets all conditions.
+		while(1) {
+			if (input(.@input,100,999) != 0) {
+				mes "[Nia]";
+				mes "You've canceled the";
+				mes "Number Match game.";
+				close;
+			}
+			set .@input100, .@input / 100;
+			set .@input10, (.@input % 100) / 10;
+			set .@input1, .@input % 10;
+			if ((.@input100 > 0) && (.@input10 > 0) && (.@input1 > 0)) {
+				if ((.@input100 != .@input10) && (.@input100 != .@input1) && (.@input10 != .@input1))
+					break;
+			}
+			mes "[Nia]";
+			mes "You entered one of the";
+			mes "digits as 0, or input the";
+			mes "same numerical value in";
+			mes "the digits more than once.";
+			mes "Please enter another guess.";
+			next;
+		}
+
+		set .@retry, .@retry+1;
+		mes "[Nia]";
+		mes "^ff0000"+strcharinfo(0)+"^000000,";
+		mes "your guess is ^0000ff"+.@input+"^000000.";
+		mes "Give me a moment to";
+		mes "come up with your results.";
+		next;
+
+		// Correct digits in correct locations.
+		set .@strike,0;
+		if (.@yagu100 == .@input100)
+			set .@strike, .@strike+1;
+		if (.@yagu10 == .@input10)
+			set .@strike, .@strike+1;
+		if (.@yagu1 == .@input1)
+			set .@strike, .@strike+1;
+
+		// Correct digits in incorrect locations.
+		set .@ball,0;
+		if ((.@yagu100 == .@input10) || (.@yagu100 == .@input1))
+			set .@ball, .@ball+1;
+		if ((.@yagu10 == .@input100) || (.@yagu10 == .@input1))
+			set .@ball, .@ball+1;
+		if ((.@yagu1 == .@input100) || (.@yagu1 == .@input10))
+			set .@ball, .@ball+1;
+
+		if (.@strike == 3) {
+			if (.@practice) {
+				mes "[Nia]";
+				mes "Yes, the number that";
+				mes "I guessed was ^ff0000"+.@yagu+"^000000!";
+				mes "Congratulations, you";
+				mes "just won this practice";
+				mes "game! Now you should be";
+				mes "ready for the real thing~";
+				close;
+			} else {
+
+				// Calculate final time and check against the previous record.
+				set .@end_time, gettimetick(2);
+				if (.@end_time < .@start_time)
+					set .@end_time, .@end_time + 3600;
+				set .@total_time, .@end_time - .@start_time;
+				set .@total_min, .@total_time / 60;
+				set .@total_sec, .@total_time % 60;
+				set .@name_record$, $050908_minus1_yagu$;
+				if (.@name_record$ == "") //custom
+					set .@name_record$,"(null)";
+				set .@score_record, $050908_minus1_yagu;
+				set .@score_min, .@score_record / 60;
+				set .@score_sec, .@score_record % 60;
+
+				if (.@score_record >= .@total_time || !.@score_record) { //custom (second condition)
+					set $050908_minus1_yagu$, strcharinfo(0);
+					set $050908_minus1_yagu, .@total_time;
+					mes "[Nia]";
+					mes "Great! You guessed";
+					mes "my number, which was";
+					mes "^ff0000" + .@yagu + "^000000. You finished in";
+					mes "^ff0000" + .@total_min + " minutes, " + .@total_sec + " seconds^000000,";
+					mes "breaking the previous record";
+					mes "of ^ff0000" + .@score_min + " minutes, " + .@score_sec + " seconds^000000.";
+					next;
+					mes "[Nia]";
+					mes "^ff0000" + .@name_record$ + "^000000";
+					mes "set that old record,";
+					mes "but now you are the";
+					mes "new person to beat in the";
+					mes "Match Game. Congratulations";
+					mes "for setting a new record!";
+					close;
+				}
+				mes "[Nia]";
+				mes "Nice work, you guessed";
+				mes "my number! The answer, of";
+				mes "course, was ^ff0000" + .@yagu + "^000000. You managed";
+				mes "to guess this number correctly";
+				mes "in ^ff0000" + .@total_min + " minutes, " + .@total_sec + " seconds^000000.";
+				next;
+				mes "[Nia]";
+				mes "^ff0000" + .@name_record$ + "^000000 is";
+				mes "the current Number Match";
+				mes "record holder with a time";
+				mes "of ^ff0000" + .@score_min + " minutes, " + .@score_sec + " seconds^000000.";
+				mes "Good luck, and hopefully you";
+				mes "can break this record someday~";
+				close;
+			}
+		} else {
+			if (.@practice) {
+				mes "[Nia]";
+				mes "Your guess has ^ff0000" + .@ball + "^000000 of the";
+				mes "correct numbers. ^ff0000" + .@strike + "^000000 of the";
+				mes "digits in your guess have";
+				mes "the correct number in the";
+				mes "correct digit placement.";
+				mes "Alright, try it again~";
+				next;
+			} else {
+				mes "[Nia]";
+				mes "Your last guess had ^ff0000" + .@ball + "^000000";
+				mes "of the correct numbers,";
+				mes "and ^ff0000" + .@strike + "^000000 digits in your guess";
+				mes "had the correct number in";
+				mes "the correct digit placement.";
+				switch(.@retry) {
+					case 1: mes "You have four guesses left."; break;
+					case 2: mes "You have three guesses left."; break;
+					case 3: mes "You have two guesses left."; break;
+					case 4: mes "You only have one guess left..."; break;
+					case 5: mes "The answer was ^ff0000" + .@yagu + "^000000."; close;
+				}
+				next;
+			}
+		}
+	}
+}
diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt
index ec7142c70..a2e575a90 100644
--- a/npc/quests/quests_gonryun.txt
+++ b/npc/quests/quests_gonryun.txt
@@ -1,26 +1,24 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Gonryun
 //===== By: ==================================================
 //= KarLaeda
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Broken Sword Quest (Kept old mechanics)
 //= Lost Knife Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Added Lost Knife, updated dialog for Broken Sword
-//=	dungeon quest mechanics aportion is still the same.
+//=     Added Lost Knife, updated dialog for Broken Sword
+//=     dungeon quest mechanics aportion is still the same.
 //= 1.2a Bugfixes (bugreport:2404) [Paradox924X]
 //= 1.2b More Bugfixes (bugreport:2407) [Paradox924X]
-//============================================================ 
+//============================================================
 
-// Broken Sword
-//============================================================ 
+// Broken Sword :: broken_sword
+//============================================================
 gon_in,17,93,5	script	Chief#gon	775,{
 	if (BaseLevel > 50) {
 		if (b_sword == 0) {
@@ -788,57 +786,57 @@ gon_in,165,16,4	script	Man in hangover#gon	748,{
 }
 
 gon_dun01,148,156,0	script	start01#gnbs	-1,{
-	OnInit:
-		sleep 10000;
-	OnCommandOn:
-		donpcevent "trace1-"+rand(1,5)+"#gnbs::OnCommandOn";
-		end;
+OnInit:
+	sleep 10000;
+OnCommandOn:
+	donpcevent "trace1-"+rand(1,5)+"#gnbs::OnCommandOn";
+	end;
 }
 
 gon_dun01,201,25,0	script	trace1-1#gnbs	139,1,1,{
 	if (b_sword == 7) donpcevent "timer1-1::OnCommandOn";
 	end;
 
-	OnTimer10000:
-		stopnpctimer;
-		disablenpc "trace1-1#gnbs";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnTimer10000:
+	stopnpctimer;
+	disablenpc "trace1-1#gnbs";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace1-1#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace1-1#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace1-1#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace1-1#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun01,2,1,0	script	timer1-1	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer1-1";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer1-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer1-1";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer1-1";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer1-1";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer1-1";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem1-1::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem1-1::OnCommandOn";
+	end;
 }
 
 gon_dun01,202,25,0	script	#getitem1-1	111,2,1,{
@@ -848,65 +846,65 @@ gon_dun01,202,25,0	script	#getitem1-1	111,2,1,{
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem1-1";
-		end;
+OnInit:
+	disablenpc "#getitem1-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem1-1";
-		donpcevent "timer1-1::OnCommandOff";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem1-1";
+	donpcevent "timer1-1::OnCommandOff";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem1-1";
-		end;
+OnCommandOff:
+	disablenpc "#getitem1-1";
+	end;
 }
 
 gon_dun01,190,160,0	script	trace1-2#gnbs	139,1,1,{
 	if (b_sword == 7) donpcevent "timer1-2::OnCommandOn";
 	end;
 
-	OnTimer100000:
-		stopnpctimer;
-		disablenpc "trace1-2#gnbs";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnTimer100000:
+	stopnpctimer;
+	disablenpc "trace1-2#gnbs";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace1-2#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace1-2#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace1-2#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace1-2#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun01,3,1,0	script	timer1-2	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer1-2";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer1-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer1-2";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer1-2";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer1-2";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer1-2";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem1-2::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem1-2::OnCommandOn";
+	end;
 }
 
 gon_dun01,190,159,0	script	#getitem1-2	111,2,1,{
@@ -916,65 +914,65 @@ gon_dun01,190,159,0	script	#getitem1-2	111,2,1,{
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem1-2";
-		end;
+OnInit:
+	disablenpc "#getitem1-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem1-2";
-		donpcevent "timer1-2::OnCommandOff";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem1-2";
+	donpcevent "timer1-2::OnCommandOff";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem1-2";
-		end;
+OnCommandOff:
+	disablenpc "#getitem1-2";
+	end;
 }
 
 gon_dun01,163,53,0	script	trace1-3#gnbs	139,1,1,{
 	if (b_sword == 7) donpcevent "timer1-3::OnCommandOn";
 	end;
 
-	OnTimer90000:
-		stopnpctimer;
-		disablenpc "trace1-3#gnbs";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnTimer90000:
+	stopnpctimer;
+	disablenpc "trace1-3#gnbs";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace1-3#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace1-3#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace1-3#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace1-3#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun01,4,1,0	script	timer1-3	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer1-3";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer1-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer1-3";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer1-3";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer1-3";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer1-3";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem1-3::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem1-3::OnCommandOn";
+	end;
 }
 
 gon_dun01,164,53,0	script	#getitem1-3	111,2,1,{
@@ -984,65 +982,65 @@ gon_dun01,164,53,0	script	#getitem1-3	111,2,1,{
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem1-3";
-		end;
+OnInit:
+	disablenpc "#getitem1-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem1-3";
-		donpcevent "timer1-3::OnCommandOff";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem1-3";
+	donpcevent "timer1-3::OnCommandOff";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem1-3";
-		end;
+OnCommandOff:
+	disablenpc "#getitem1-3";
+	end;
 }
 
 gon_dun01,133,183,0	script	trace1-4#gnbs	139,1,1,{
 	if (b_sword == 7) donpcevent "timer1-4::OnCommandOn";
 	end;
 
-	OnTimer150000:
-		stopnpctimer;
-		disablenpc "trace1-4#gnbs";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnTimer150000:
+	stopnpctimer;
+	disablenpc "trace1-4#gnbs";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace1-4#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace1-4#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace1-4#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace1-4#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun01,5,1,0	script	timer1-4	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer1-4";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer1-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer1-4";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer1-4";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer1-4";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer1-4";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem1-4::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem1-4::OnCommandOn";
+	end;
 }
 
 gon_dun01,134,183,0	script	#getitem1-4	111,2,1,{
@@ -1052,65 +1050,65 @@ gon_dun01,134,183,0	script	#getitem1-4	111,2,1,{
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem1-4";
-		end;
+OnInit:
+	disablenpc "#getitem1-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem1-4";
-		donpcevent "timer1-4::OnCommandOff";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem1-4";
+	donpcevent "timer1-4::OnCommandOff";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem1-4";
-		end;
+OnCommandOff:
+	disablenpc "#getitem1-4";
+	end;
 }
 
 gon_dun01,139,257,0	script	trace1-5#gnbs	139,1,1,{
 	if (b_sword == 7) donpcevent "timer1-5::OnCommandOn";
 	end;
 
-	OnTimer170000:
-		stopnpctimer;
-		disablenpc "trace1-5#gnbs";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnTimer170000:
+	stopnpctimer;
+	disablenpc "trace1-5#gnbs";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace1-5#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace1-5#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace1-5#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace1-5#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun01,6,1,0	script	timer1-5	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer1-5";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer1-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer1-5";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer1-5";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer1-5";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer1-5";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem1-5::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem1-5::OnCommandOn";
+	end;
 }
 
 gon_dun01,140,257,0	script	#getitem1-5	111,2,1,{
@@ -1120,73 +1118,73 @@ gon_dun01,140,257,0	script	#getitem1-5	111,2,1,{
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem1-5";
-		end;
+OnInit:
+	disablenpc "#getitem1-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem1-5";
-		donpcevent "timer1-5::OnCommandOff";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem1-5";
+	donpcevent "timer1-5::OnCommandOff";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem1-5";
-		end;
+OnCommandOff:
+	disablenpc "#getitem1-5";
+	end;
 }
 
 gon_dun02,1,1,0	script	start02#gnbs	-1,{
-	OnInit:
-		sleep 10000;
-	OnCommandOn:
-		donpcevent "trace2-"+rand(1,6)+"#gnbs::OnCommandOn";
-		end;
+OnInit:
+	sleep 10000;
+OnCommandOn:
+	donpcevent "trace2-"+rand(1,6)+"#gnbs::OnCommandOn";
+	end;
 }
 
 gon_dun02,65,168,0	script	trace2-1#gnbs	139,1,1,{
 	if (b_sword == 8) donpcevent "timer2-1::OnCommandOn";
 	end;
 
-	OnTimer80000:
-		stopnpctimer;
-		disablenpc "trace2-1#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer80000:
+	stopnpctimer;
+	disablenpc "trace2-1#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-1#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-1#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-1#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-1#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,2,1,0	script	timer2-1	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-1";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-1";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-1";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-1";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-1";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-1::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-1::OnCommandOn";
+	end;
 }
 
 gon_dun02,202,25,0	script	#getitem2-1	111,2,1,{
@@ -1196,65 +1194,65 @@ gon_dun02,202,25,0	script	#getitem2-1	111,2,1,{
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-1";
-		end;
+OnInit:
+	disablenpc "#getitem2-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-1";
-		donpcevent "timer2-1::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-1";
+	donpcevent "timer2-1::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-1";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-1";
+	end;
 }
 
 gon_dun02,265,200,0	script	trace2-2#gnbs	139,1,1,{
 	if (b_sword == 8) donpcevent "timer2-2::OnCommandOn";
 	end;
 
-	OnTimer130000:
-		stopnpctimer;
-		disablenpc "trace2-2#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer130000:
+	stopnpctimer;
+	disablenpc "trace2-2#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-2#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-2#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-2#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-2#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,3,1,0	script	timer2-2	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-2";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-2";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-2";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-2";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-2";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-2::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-2::OnCommandOn";
+	end;
 }
 
 gon_dun02,265,201,0	script	#getitem2-2	111,2,1,{
@@ -1264,65 +1262,65 @@ gon_dun02,265,201,0	script	#getitem2-2	111,2,1,{
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-2";
-		end;
+OnInit:
+	disablenpc "#getitem2-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-2";
-		donpcevent "timer2-2::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-2";
+	donpcevent "timer2-2::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-2";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-2";
+	end;
 }
 
 gon_dun02,247,129,0	script	trace2-3#gnbs	139,1,1,{
 	if (b_sword == 8) donpcevent "timer2-3::OnCommandOn";
 	end;
 
-	OnTimer110000:
-		stopnpctimer;
-		disablenpc "trace2-3#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer110000:
+	stopnpctimer;
+	disablenpc "trace2-3#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-3#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-3#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-3#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-3#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,4,1,0	script	timer2-3	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-3";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-3";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-3";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-3";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-3";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-3::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-3::OnCommandOn";
+	end;
 }
 
 gon_dun02,247,128,0	script	#getitem2-3	111,2,1,{
@@ -1332,65 +1330,65 @@ gon_dun02,247,128,0	script	#getitem2-3	111,2,1,{
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-3";
-		end;
+OnInit:
+	disablenpc "#getitem2-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-3";
-		donpcevent "timer2-3::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-3";
+	donpcevent "timer2-3::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-3";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-3";
+	end;
 }
 
 gon_dun02,149,74,0	script	trace2-4#gnbs	139,1,1,{
 	if (b_sword == 8) donpcevent "timer2-4::OnCommandOn";
 	end;
 
-	OnTimer230000:
-		stopnpctimer;
-		disablenpc "trace2-4#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer230000:
+	stopnpctimer;
+	disablenpc "trace2-4#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-4#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-4#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-4#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-4#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,5,1,0	script	timer2-4	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-4";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-4";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-4";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-4";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-4";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-4::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-4::OnCommandOn";
+	end;
 }
 
 gon_dun02,149,75,0	script	#getitem2-4	111,2,1,{
@@ -1400,65 +1398,65 @@ gon_dun02,149,75,0	script	#getitem2-4	111,2,1,{
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-4";
-		end;
+OnInit:
+	disablenpc "#getitem2-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-4";
-		donpcevent "timer2-4::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-4";
+	donpcevent "timer2-4::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-4";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-4";
+	end;
 }
 
 gon_dun02,23,105,0	script	trace2-5#gnbs	139,1,1,{
 	if (b_sword == 8) donpcevent "timer2-5::OnCommandOn";
 	end;
 
-	OnTimer190000:
-		stopnpctimer;
-		disablenpc "trace2-5#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer190000:
+	stopnpctimer;
+	disablenpc "trace2-5#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-5#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-5#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-5#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-5#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,6,1,0	script	timer2-5	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-5";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-5";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-5";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-5";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-5";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-5::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-5::OnCommandOn";
+	end;
 }
 
 gon_dun02,23,106,0	script	#getitem2-5	111,2,1,{
@@ -1468,65 +1466,65 @@ gon_dun02,23,106,0	script	#getitem2-5	111,2,1,{
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-5";
-		end;
+OnInit:
+	disablenpc "#getitem2-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-5";
-		donpcevent "timer2-5::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-5";
+	donpcevent "timer2-5::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-5";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-5";
+	end;
 }
 
 gon_dun02,249,39,0	script	trace2-6#gnbs	139,1,1,{
 	if (b_sword == 8) donpcevent "timer2-6::OnCommandOn";
 	end;
 
-	OnTimer110000:
-		stopnpctimer;
-		disablenpc "trace2-6#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer110000:
+	stopnpctimer;
+	disablenpc "trace2-6#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-6#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-6#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-6#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-6#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,7,1,0	script	timer2-6	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-6";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-6";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-6";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-6";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-6";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-6";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-6::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-6::OnCommandOn";
+	end;
 }
 
 gon_dun02,249,40,0	script	#getitem2-6	111,2,1,{
@@ -1536,73 +1534,73 @@ gon_dun02,249,40,0	script	#getitem2-6	111,2,1,{
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-6";
-		end;
+OnInit:
+	disablenpc "#getitem2-6";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-6";
-		donpcevent "timer2-6::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-6";
+	donpcevent "timer2-6::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-6";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-6";
+	end;
 }
 
 gon_dun03,1,1,0	script	start03#gnbs	-1,{
-	OnInit:
-		sleep 10000;
-	OnCommandOn:
-		donpcevent "trace3-"+rand(1,7)+"#gnbs::OnCommandOn";
-		end;
+OnInit:
+	sleep 10000;
+OnCommandOn:
+	donpcevent "trace3-"+rand(1,7)+"#gnbs::OnCommandOn";
+	end;
 }
 
 gon_dun03,11,75,0	script	trace3-1#gnbs	139,1,1,{
 	if (b_sword == 9) donpcevent "timer3-1::OnCommandOn";
 	end;
 
-	OnTimer200000:
-		stopnpctimer;
-		disablenpc "trace3-1#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer200000:
+	stopnpctimer;
+	disablenpc "trace3-1#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-1#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-1#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-1#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-1#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,2,1,0	script	timer3-1	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-1";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-1";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-1";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-1";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-1";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-1::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-1::OnCommandOn";
+	end;
 }
 
 gon_dun03,10,74,0	script	#getitem3-1	111,2,1,{
@@ -1616,65 +1614,65 @@ gon_dun03,10,74,0	script	#getitem3-1	111,2,1,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-1";
-		end;
+OnInit:
+	disablenpc "#getitem3-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-1";
-		donpcevent "timer3-1::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-1";
+	donpcevent "timer3-1::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-1";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-1";
+	end;
 }
 
 gon_dun03,199,103,0	script	trace3-2#gnbs	139,1,1,{
 	if (b_sword == 9) donpcevent "timer3-2::OnCommandOn";
 	end;
 
-	OnTimer130000:
-		stopnpctimer;
-		disablenpc "trace3-2#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer130000:
+	stopnpctimer;
+	disablenpc "trace3-2#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-2#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-2#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-2#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-2#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,3,1,0	script	timer3-2	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-2";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-2";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-2";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-2";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-2";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-2::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-2::OnCommandOn";
+	end;
 }
 
 gon_dun03,199,102,0	script	#getitem3-2	111,2,1,{
@@ -1688,65 +1686,65 @@ gon_dun03,199,102,0	script	#getitem3-2	111,2,1,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-2";
-		end;
+OnInit:
+	disablenpc "#getitem3-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-2";
-		donpcevent "timer3-2::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-2";
+	donpcevent "timer3-2::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-2";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-2";
+	end;
 }
 
 gon_dun03,14,162,0	script	trace3-3#gnbs	139,1,1,{
 	if (b_sword == 9) donpcevent "timer3-3::OnCommandOn";
 	end;
 
-	OnTimer110000:
-		stopnpctimer;
-		disablenpc "trace3-3#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer110000:
+	stopnpctimer;
+	disablenpc "trace3-3#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-3#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-3#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-3#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-3#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,4,1,0	script	timer3-3	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-3";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-3";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-3";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-3";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-3";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-3::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-3::OnCommandOn";
+	end;
 }
 
 gon_dun03,14,163,0	script	#getitem3-3	111,2,1,{
@@ -1760,65 +1758,65 @@ gon_dun03,14,163,0	script	#getitem3-3	111,2,1,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-3";
-		end;
+OnInit:
+	disablenpc "#getitem3-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-3";
-		donpcevent "timer3-3::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-3";
+	donpcevent "timer3-3::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-3";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-3";
+	end;
 }
 
 gon_dun03,155,263,0	script	trace3-4#gnbs	139,1,1,{
 	if (b_sword == 9) donpcevent "timer3-4::OnCommandOn";
 	end;
 
-	OnTimer230000:
-		stopnpctimer;
-		disablenpc "trace3-4#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer230000:
+	stopnpctimer;
+	disablenpc "trace3-4#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-4#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-4#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-4#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-4#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,5,1,0	script	timer3-4	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-4";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-4";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-4";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-4";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-4";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-4::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-4::OnCommandOn";
+	end;
 }
 
 gon_dun03,156,263,0	script	#getitem3-4	111,2,1,{
@@ -1832,65 +1830,65 @@ gon_dun03,156,263,0	script	#getitem3-4	111,2,1,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-4";
-		end;
+OnInit:
+	disablenpc "#getitem3-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-4";
-		donpcevent "timer3-4::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-4";
+	donpcevent "timer3-4::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-4";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-4";
+	end;
 }
 
 gon_dun03,169,90,0	script	trace3-5#gnbs	139,1,1,{
 	if (b_sword == 9) donpcevent "timer3-5::OnCommandOn";
 	end;
 
-	OnTimer190000:
-		stopnpctimer;
-		disablenpc "trace3-5#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer190000:
+	stopnpctimer;
+	disablenpc "trace3-5#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-5#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-5#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-5#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-5#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,6,1,0	script	timer3-5	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-5";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-5";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-5";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-5";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-5";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-5::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-5::OnCommandOn";
+	end;
 }
 
 gon_dun03,170,90,0	script	#getitem3-5	111,2,1,{
@@ -1904,65 +1902,65 @@ gon_dun03,170,90,0	script	#getitem3-5	111,2,1,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-5";
-		end;
+OnInit:
+	disablenpc "#getitem3-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-5";
-		donpcevent "timer3-5::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-5";
+	donpcevent "timer3-5::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-5";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-5";
+	end;
 }
 
 gon_dun03,162,40,0	script	trace3-6#gnbs	139,1,1,{
 	if (b_sword == 9) donpcevent "timer3-6::OnCommandOn";
 	end;
 
-	OnTimer110000:
-		stopnpctimer;
-		disablenpc "trace3-6#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer110000:
+	stopnpctimer;
+	disablenpc "trace3-6#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-6#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-6#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-6#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-6#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,7,1,0	script	timer3-6	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-6";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-6";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-6";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-6";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-6";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-6";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-6::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-6::OnCommandOn";
+	end;
 }
 
 gon_dun03,68,39,0	script	#getitem3-6	111,1,2,{
@@ -1976,65 +1974,65 @@ gon_dun03,68,39,0	script	#getitem3-6	111,1,2,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-6";
-		end;
+OnInit:
+	disablenpc "#getitem3-6";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-6";
-		donpcevent "timer3-6::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-6";
+	donpcevent "timer3-6::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-6";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-6";
+	end;
 }
 
 gon_dun03,68,212,0	script	trace3-7#gnbs	139,1,1,{
 	if (b_sword == 9) donpcevent "timer3-7::OnCommandOn";
 	end;
 
-	OnTimer110000:
-		stopnpctimer;
-		disablenpc "trace3-7#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer110000:
+	stopnpctimer;
+	disablenpc "trace3-7#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-7#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-7#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-7#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-7#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,6,1,0	script	timer3-7	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-7";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-7";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-7";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-7";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-7";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-7";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-7::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-7::OnCommandOn";
+	end;
 }
 
 gon_dun03,68,213,0	script	#getitem3-7	111,1,2,{
@@ -2048,19 +2046,19 @@ gon_dun03,68,213,0	script	#getitem3-7	111,1,2,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-7";
-		end;
+OnInit:
+	disablenpc "#getitem3-7";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-7";
-		donpcevent "timer3-7::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-7";
+	donpcevent "timer3-7::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-7";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-7";
+	end;
 }
 
 gon_in,18,27,5	script	Madam#gnbs	771,{
@@ -3702,8 +3700,8 @@ OnTouch:
 	end;
 }
 
-// Lost Knife
-//============================================================ 
+// Lost Knife :: gon_npc
+//============================================================
 gonryun,237,226,3	script	Han Ran Jiao#gon	776,{
 	if (nakha == 0) {
 		mes "[Han Ran Jiao]";
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index b0ac801e4..79ed93242 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -3,16 +3,16 @@
 //===== By: ==================================================
 //= MasterOfMuppets & SinSloth
 //===== Current Version: =====================================
-//= 2.1
+//= 2.3
 //===== Description: =========================================
-//= Quest NPC's related to Hugel
+//= Quest NPCs related to Hugel
 //===== Additional Comments: =================================
 //= 1.0 First version. [MasterOfMuppets]
 //= 1.1 Added most of Hugel quests. Thanks to MasterOfMuppets
 //= for scripting most of them. [SinSloth]
 //= 1.2 Added Odin Temple Excavation quest. [SinSloth]
 //= 1.3 Added a Missing "close;". [Samuray22]
-//=	-Thanks to Elfange
+//=     -Thanks to Elfange
 //= 1.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.5a Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.5b Fixed a variable name. [SinSloth]
@@ -23,16 +23,15 @@
 //= 2.0 Commented a break out to fix a script hang.
 //= 2.1 Added quest log entries for:
 //=     - Juno Remedy Quest
+//= 2.2 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.3 Added questlog support. [Euphy]
 //============================================================
 
-// Medicine Quest
+// Medicine Quest :: hg_herv
 //============================================================
 hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
-
-	if(BaseLevel > 49)
-	{
-		if(hg_herb == 0)
-		{
+	if (BaseLevel > 49) {
+		if (hg_herb == 0) {
 			mes "[Allen]";
 			mes "*Groooooan~*";
 			mes "Arrrgh, my back hurts...";
@@ -63,8 +62,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "find my son Postell and to";
 			mes "tell him to bring my medicine!";
 			next;
-			switch( select( "Sure.:No, I'm sorry." ) )
-			{
+			switch(select("Sure.:No, I'm sorry.")) {
 			case 1:
 				mes "[Allen]";
 				mes "Th-thank you so much!";
@@ -74,6 +72,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 				mes "find Postell. Tell him that";
 				mes "I need my ''Kolbun A'' now!";
 				set hg_herb,1;
+				setquest 8053;
 				next;
 				mes "[Allen]";
 				mes "And let him know that";
@@ -83,7 +82,6 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 				mes "He's dead to me if he";
 				mes "doesn't love his father!";
 				close;
-			break;
 			case 2:
 				mes "[Allen]";
 				mes "I... I don't understand...!";
@@ -92,11 +90,8 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 				mes "I-I desperately need help!";
 				mes "No! Please, d-don't go away!";
 				close;
-			break;
 			}
-		}
-		else if(hg_herb == 2)
-		{
+		} else if (hg_herb == 2) {
 			mes "[Allen]";
 			mes "Postell... My son...";
 			mes "Why have you forsaken me?";
@@ -139,11 +134,9 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "would you please let me";
 			mes "have a White P-Potion?";
 			next;
-			switch( select( "Give White Potion:Ignore" ) )
-			{
+			switch(select("Give White Potion:Ignore")) {
 			case 1:
-				if(!countitem(504)) //White potion
-				{
+				if (!countitem(504)) {
 					mes "[Allen]";
 					mes "Oh... Oh no...! You";
 					mes "don't have any White";
@@ -152,9 +145,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 					mes "please! Bring me a White Potion";
 					mes "as soon as you can! ^333333*Cough!*^000000";
 					close;
-				}
-				else
-				{
+				} else {
 					delitem 504,1; //White potion
 					mes "[Allen]";
 					mes "Oh, thank you!";
@@ -183,13 +174,13 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 					mes "my son arrives? P-please?";
 					next;
 					set hg_herb,3;
+					changequest 8054,8055;
 					mes "[" +strcharinfo(0)+ "]";
 					mes "......";
 					mes ".........";
 					mes "............";
 					close;
 				}
-			break;
 			case 2:
 				mes "[Allen]";
 				mes "W-wait! A-are you just";
@@ -197,11 +188,8 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 				mes "Noo! ^333333*Cough*^000000 Arrgh! A plague!";
 				mes "A plague on both your houses!";
 				close;
-			break;
 			}
-		}
-		else if(hg_herb == 3)
-		{
+		} else if (hg_herb == 3) {
 			mes "[Allen]";
 			mes "*Gasp* I... I can";
 			mes "feel it! I think I'm";
@@ -218,10 +206,9 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "from... Drawer... H-heeelp me!";
 			mes "Adventurer! H-Heeeeelp~!";
 			set hg_herb,4;
+			changequest 8055,8056;
 			close;
-		}
-		else if(hg_herb == 4)
-		{
+		} else if (hg_herb == 4) {
 			mes "[Allen]";
 			mes "No...!";
 			mes "There's a light at the";
@@ -230,9 +217,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "a little closer to me! Don't";
 			mes "let me step into the light!";
 			close;
-		}
-		else if(hg_herb == 6)
-		{
+		} else if (hg_herb == 6) {
 			mes "^3355FFYou have given the";
 			mes "Withstander medicine";
 			mes "to Allen who guzzles";
@@ -249,9 +234,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "day. Th-thank you so much...";
 			set hg_herb,7;
 			close;
-		}
-		else if(hg_herb == 7)
-		{
+		} else if (hg_herb == 7) {
 			mes "[Allen]";
 			mes "I... I can't...!";
 			mes "I can barely breathe!";
@@ -259,14 +242,11 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "again! Please, c-come closer";
 			mes "to me! I-I think I need CPR!";
 			close;
-		}
-		else if(hg_herb == 9)
-		{
+		} else if (hg_herb == 9) {
 			mes "^3355FFYou give another dose";
 			mes "of Withstander to Allen.^000000";
 			next;
-			if(rand(1,3) == 3)
-			{
+			if (rand(1,3) == 3) {
 				mes "[Allen]";
 				mes "Oh... Thank you...";
 				mes "I feel much b-better now.";
@@ -276,22 +256,20 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 				set hg_herb,10;
 				close;
 			}
-				mes "[Allen]";
-				mes "Oh... Thank you...";
-				mes "Y-you're an angel, a regular";
-				mes "Florence Nightingale. Please";
-				mes "stay with m-me until my son";
-				mes "arrives. You wouldn't abandon";
-				mes "this sick man now, would you?";
-				next;
-				mes "[" +strcharinfo(0)+ "]";
-				mes "(^333333Your son Postell";
-				mes "better get here soon!^000000)";
-				set hg_herb,7;
-				close;
-		}
-		else if(hg_herb == 10)
-		{
+			mes "[Allen]";
+			mes "Oh... Thank you...";
+			mes "Y-you're an angel, a regular";
+			mes "Florence Nightingale. Please";
+			mes "stay with m-me until my son";
+			mes "arrives. You wouldn't abandon";
+			mes "this sick man now, would you?";
+			next;
+			mes "[" +strcharinfo(0)+ "]";
+			mes "(^333333Your son Postell";
+			mes "better get here soon!^000000)";
+			set hg_herb,7;
+			close;
+		} else if (hg_herb == 10) {
 			mes "[Allen]";
 			mes "Arrrgh! My ligaments!";
 			mes "They're in such pain!";
@@ -354,9 +332,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			emotion e_swt,1;
 			emotion e_swt;
 			end;
-		}
-		else if(hg_herb == 11)
-		{
+		} else if (hg_herb == 11) {
 			mes "[Allen]";
 			mes "*Sniff* I should have known";
 			mes "that Postell really does care";
@@ -372,10 +348,9 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "the medicine drawer, and help";
 			mes "yourself to whatever you like~";
 			set hg_herb,12;
+			changequest 8055,8056;
 			close;
-		}
-		else if(hg_herb == 12)
-		{
+		} else if (hg_herb == 12) {
 			mes "[Allen]";
 			mes "Don't worry, adventurer.";
 			mes "I haven't forgotten about";
@@ -383,9 +358,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "the medicine drawer, and help";
 			mes "yourself to whatever you like~";
 			close;
-		}
-		else if(hg_herb == 13)
-		{
+		} else if (hg_herb == 13) {
 			mes "[Allen]";
 			mes "So did you find the";
 			mes "Old Blue Box I put in";
@@ -394,9 +367,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "like it. Consider my way";
 			mes "of thanking you for your help~";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Allen]";
 			mes "*Groooooan~*";
 			mes "Arrrgh, my back hurts...";
@@ -406,9 +377,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "live happy, luxurious lives?";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Allen]";
 		mes "*Groooooan~*";
 		mes "Arrrgh, my back hurts...";
@@ -420,8 +389,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 	}
 
 OnTouch:
-	if(hg_herb == 4)
-	{
+	if (hg_herb == 4) {
 		mes "[Allen]";
 		mes "^333333*Cough cough!*^000000";
 		mes "W-Withstander...!";
@@ -430,9 +398,7 @@ OnTouch:
 		set hg_herb,5;
 		donpcevent "#DrawerOpener::OnEnable";
 		close;
-	}
-	else if(hg_herb == 7)
-	{
+	} else if (hg_herb == 7) {
 		mes "[Allen]";
 		mes "^333333*Whew*^000000";
 		mes "I... I can breathe again!";
@@ -448,7 +414,6 @@ OnTouch:
 }
 
 hu_in01,385,247,5	script	Postell Schuwell#D	97,{
-
 	mes "[Postell]";
 	mes "Hey, uh...";
 	mes "I'm in the middle";
@@ -471,9 +436,7 @@ OnTimer100000:
 }
 
 hu_fild06,34,123,3	script	Postell Schuwell	97,{
-
-	if(hg_herb == 1)
-	{
+	if (hg_herb == 1) {
 		mes "[Postell]";
 		mes "I really like living";
 		mes "in Hugel. Fresh air,";
@@ -497,8 +460,7 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 		mes "all the medicines he's taking";
 		mes "are habit forming, you know?";
 		next;
-		switch( select( "But your father needs you!:Habit forming?" ) )
-		{
+		switch(select("But your father needs you!:Habit forming?")) {
 		case 1:
 			mes "[Allen's Voice]";
 			mes "Yeah, I guess you're right.";
@@ -524,8 +486,8 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 			mes "more trouble? I'd really";
 			mes "appreciate it if you do.";
 			set hg_herb,2;
+			changequest 8053,8054;
 			close;
-		break;
 		case 2:
 			mes "[Postell]";
 			mes "Yeah, like he's addicted";
@@ -534,11 +496,8 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 			mes "gets as little of it as possible! Honestly, I think he drinks";
 			mes "too much medicine already...";
 			close;
-		break;
 		}
-	}
-	else if(hg_herb > 1)
-	{
+	} else if (hg_herb > 1) {
 		mes "[Postell]";
 		mes "Kolbun A, Kolbun A...";
 		mes "Let's see, is it really";
@@ -546,9 +505,7 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 		mes "If it isn't, I better come up";
 		mes "with some replacement...";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Postell]";
 		mes "I really like living";
 		mes "in Hugel. Fresh air,";
@@ -557,23 +514,18 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 		mes "more could I want?";
 		close;
 	}
-	
 }
 
 hu_in01,370,255,3	script	Upper Drawer#First	139,2,2,{
-
 OnTouch:
-	set @randvar,rand(1,7);
-	if(hg_herb < 5)
-	{
+	set .@rand,rand(1,7);
+	if (hg_herb < 5) {
 		mes "^3355FFThere are several";
 		mes "books and a few";
 		mes "liquid medicines";
 		mes "inside this drawer.^000000";
 		close;
-	}
-	else if(hg_herb == 5)
-	{
+	} else if (hg_herb == 5) {
 		mes "[Allen]";
 		mes "Oh... Oh...";
 		mes "Oooh... The pain";
@@ -582,8 +534,8 @@ OnTouch:
 		mes "Withstander later...";
 		set hg_herb,4;
 		next;
-		if(@randvar == 4)
-		{
+		set .@rand,rand(1,7);
+		if (.@rand == 4) {
 			mes "^3355FFYou find an old book";
 			mes "inside the drawer.^000000";
 			next;
@@ -600,9 +552,7 @@ OnTouch:
 			mes "I guess that's why he'd";
 			mes "keep this old PR brochure...^000000)";
 			close;
-		}
-		else if(@randvar == 5)
-		{
+		} else if (.@rand == 5) {
 			mes "^3355FFYou find Allen's";
 			mes "journal inside the";
 			mes "drawer and quickly";
@@ -618,20 +568,16 @@ OnTouch:
 			mes "Lab... Escape... Hugel... Um...";
 			mes "Dr. Morriphen... Side effects?";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Wh-what...?";
 			mes "Do you really";
 			mes "need that medicine?!";
 			close;
 		}
-	}
-	else if(hg_herb == 6)
+	} else if (hg_herb == 6)
 		end;
-	else if(hg_herb == 8)
-	{
+	else if (hg_herb == 8) {
 		mes "[Allen]";
 		mes "Oh... Oh...";
 		mes "Oooh... The pain";
@@ -640,8 +586,7 @@ OnTouch:
 		mes "Withstander later...";
 		set hg_herb,7;
 		next;
-		if(@randvar == 4)
-		{
+		if (.@rand == 4) {
 			mes "^3355FFYou find an old book";
 			mes "inside the drawer.^000000";
 			next;
@@ -658,9 +603,7 @@ OnTouch:
 			mes "I guess that's why he'd";
 			mes "keep this old PR brochure...^000000)";
 			close;
-		}
-		else if(@randvar == 5)
-		{
+		} else if (.@rand == 5) {
 			mes "^3355FFYou find Allen's";
 			mes "journal inside the";
 			mes "drawer and quickly";
@@ -676,33 +619,27 @@ OnTouch:
 			mes "Lab... Escape... Hugel... Um...";
 			mes "Dr. Morriphen... Side effects?";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Wh-what...?";
 			mes "Do you really";
 			mes "need that medicine?!";
 			close;
 		}
-	}
-	else if(hg_herb == 9)
+	} else if (hg_herb == 9)
 		end;
-	else if(hg_herb == 12)
-	{
+	else if (hg_herb == 12) {
 		mes "^3355FFYou find an";
 		mes "Old Blue Box deep";
 		mes "inside the drawer.^000000";
 		close2;
 		specialeffect EF_CONE;
 		set hg_herb,13;
-		getitem 603,1; //Old blue box
-		getexp 5000,0;
-	}
-	else
-	{
-		if(@randvar > 3)
-		{
+		getitem 603,1; //Old Blue Box
+		getexp (checkre(3))?5000:50000,0;
+		completequest 8056;
+	} else {
+		if (.@rand > 3) {
 			mes "^3355FFYou find an old book";
 			mes "inside the drawer.^000000";
 			next;
@@ -719,9 +656,7 @@ OnTouch:
 			mes "I guess that's why he'd";
 			mes "keep this old PR brochure...^000000)";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "^3355FFYou find Allen's";
 			mes "journal inside the";
 			mes "drawer and quickly";
@@ -739,7 +674,6 @@ OnTouch:
 			close;
 		}
 	}
-	
 }
 
 hu_in01,370,255,3	script	Upper Drawer#Second	139,2,2,{
@@ -747,28 +681,22 @@ OnInit:
 	disablenpc "Upper Drawer#Second";
 	end;
 
-	OnTouch:
-		if(hg_herb == 5)
-		{
-			mes "^3355FFYou take out one dose of";
-			mes "Withstander from the drawer.^000000";
-			set hg_herb,6;
-			close;
-		}
-		else if(hg_herb == 8)
-		{
-			mes "^3355FFYou take out one dose of";
-			mes "Withstander from the drawer.^000000";
-			set hg_herb,9;
-			close;
-		}
-		else
-		{
-			mes "^3355FFThere are several books";
-			mes "kept inside this drawer.^000000";
-			close;
-		}
-		
+OnTouch:
+	if (hg_herb == 5) {
+		mes "^3355FFYou take out one dose of";
+		mes "Withstander from the drawer.^000000";
+		set hg_herb,6;
+		close;
+	} else if (hg_herb == 8) {
+		mes "^3355FFYou take out one dose of";
+		mes "Withstander from the drawer.^000000";
+		set hg_herb,9;
+		close;
+	} else {
+		mes "^3355FFThere are several books";
+		mes "kept inside this drawer.^000000";
+		close;
+	}
 }
 
 hu_in01,1,1,0	script	#DrawerOpener	-1,{
@@ -792,17 +720,13 @@ OnTimer4500:
 	disablenpc "#DrawerOpener";
 	stopnpctimer;
 	end;
-	
 }
 
-// Biological Weapon Quest
+// Biological Weapon Quest :: hg_bio
 //============================================================
 ein_in01,16,36,3	script	Morriphen	86,{
-
-	if(hg_bio == 0)
-	{
-		if(hg_herb == 13)
-		{
+	if (hg_bio == 0) {
+		if (hg_herb == 13) {
 			mes "[Morriphen]";
 			mes "Wh-who are you, and what are";
 			mes "you looking for? If you're here";
@@ -846,8 +770,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 			mes "Hmm...";
 			mes "What should I do?";
 			next;
-			switch( select( "Leave him:Help him" ) )
-			{
+			switch(select("Leave him:Help him")) {
 			case 1:
 				mes "["+strcharinfo(0)+"]";
 				mes "You know, I'm a little";
@@ -861,7 +784,6 @@ ein_in01,16,36,3	script	Morriphen	86,{
 				mes "just fine. You take care";
 				mes "of yourself, you hear?";
 				close;
-			break;
 			case 2:
 				mes "["+strcharinfo(0)+"]";
 				mes "Hey...";
@@ -925,21 +847,17 @@ ein_in01,16,36,3	script	Morriphen	86,{
 				mes "^333333*Cough Cough*";
 				mes "*Cough Cough*^000000";
 				set hg_bio,1;
+				setquest 11009;
 				close;
-			break;
 			}
-		}
-		else
-		{
+		} else {
 			mes "[Morriphen]";
 			mes "Ugh... I don't feel";
 			mes "very well. I guess";
 			mes "I better call it a day...";
 			close;
 		}
-	}
-	else if(hg_bio == 1)
-	{
+	} else if (hg_bio == 1) {
 		mes "[Morriphen]";
 		mes "Please ask my ^333333*Cough*^000000";
 		mes "wife Siria in my home in";
@@ -947,9 +865,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "medicine. Th-thank you...";
 		mes "^333333*Haaaaack* *Hhh, haaaack*^000000";
 		close;
-	}
-	else if(hg_bio == 2)
-	{
+	} else if (hg_bio == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh no... Morriphen";
 		mes "doesn't look good at all!";
@@ -957,9 +873,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "him medicine from Siria";
 		mes "in Hugel as soon as I can!";
 		close;
-	}
-	else if(hg_bio == 3)
-	{
+	} else if (hg_bio == 3) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh no... Morriphen";
 		mes "doesn't look good at all!";
@@ -967,9 +881,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "him medicine from Dono";
 		mes "in Hugel as soon as I can!";
 		close;
-	}
-	else if(hg_bio == 4)
-	{
+	} else if (hg_bio == 4) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh no... Morriphen";
 		mes "doesn't look good at all!";
@@ -977,9 +889,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "him medicine from Dono";
 		mes "in Hugel as soon as I can!";
 		close;
-	}
-	else if(hg_bio == 5)
-	{
+	} else if (hg_bio == 5) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh no... Morriphen";
 		mes "doesn't look good at all!";
@@ -987,9 +897,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "him medicine from Dono";
 		mes "in Hugel as soon as I can!";
 		close;
-	}
-	else if(hg_bio == 6)
-	{
+	} else if (hg_bio == 6) {
 		mes "^3355FFYou administer the";
 		mes "medicine to Morriphen,";
 		mes "who slowly regains";
@@ -1031,10 +939,9 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "I can back to Hugel to";
 		mes "give Siria this medicine.";
 		set hg_bio,7;
+		changequest 11014,11015;
 		close;
-	}
-	else if(hg_bio == 7)
-	{
+	} else if (hg_bio == 7) {
 		mes "["+strcharinfo(0)+"]";
 		mes "What am I doing...?";
 		mes "I need to return to";
@@ -1042,9 +949,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "medicine to Siria as";
 		mes "soon as possible!";
 		close;
-	}
-	else if(hg_bio == 8)
-	{
+	} else if (hg_bio == 8) {
 		mes "[Morriphen]";
 		mes "You're back! So, have you";
 		mes "seen my wife? She's okay,";
@@ -1312,11 +1217,10 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "I won't have to worry";
 		mes "about you. Take care~";
 		set hg_bio,9;
-		getexp 70000,0;
+		getexp (checkre(3))?70000:700000,0;
+		completequest 11016;
 		close;
-	}
-	else if(hg_bio == 9)
-	{
+	} else if (hg_bio == 9) {
 		mes "[Morriphen]";
 		mes "Oh, long time no see~";
 		mes "Yes, my wife and I can't";
@@ -1331,9 +1235,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "here in Hugel. Why don't you";
 		mes "come visit our house sometime?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Morriphen]";
 		mes "Oh, long time no see~";
 		mes "Yes, my wife and I can't";
@@ -1349,13 +1251,10 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "come visit our house sometime?";
 		close;
 	}
-	
 }
 
 hu_in01,326,307,3	script	Siria	90,{
-
-	if(hg_bio == 1)
-	{
+	if (hg_bio == 1) {
 		mes "[Siria]";
 		mes "Oh, hello there.";
 		mes "Can I help you";
@@ -1443,10 +1342,9 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "trust you too. ^333333*Cough*^000000";
 		mes "Thank you so much...";
 		set hg_bio,2;
+		changequest 11009,11010;
 		close;
-	}
-	else if(hg_bio == 2)
-	{
+	} else if (hg_bio == 2) {
 		mes "[Siria]";
 		mes "^333333*Sniff*^000000 Please";
 		mes "go to Lighthalzen and";
@@ -1454,9 +1352,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "medicine from his friend,";
 		mes "Dono, as soon as you can.";
 		close;
-	}
-	else if(hg_bio == 3)
-	{
+	} else if (hg_bio == 3) {
 		mes "[Siria]";
 		mes "Oh, have you met Dono?";
 		mes "I'm so grateful for all of";
@@ -1464,9 +1360,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "good friend to Morriphen,";
 		mes "no matter what he says.";
 		close;
-	}
-	else if(hg_bio == 4)
-	{
+	} else if (hg_bio == 4) {
 		mes "[Siria]";
 		mes "Oh, have you met Dono?";
 		mes "I'm so grateful for all of";
@@ -1474,9 +1368,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "good friend to Morriphen,";
 		mes "no matter what he says.";
 		close;
-	}
-	else if(hg_bio == 5)
-	{
+	} else if (hg_bio == 5) {
 		mes "[Siria]";
 		mes "Oh, have you met Dono?";
 		mes "I'm so grateful for all of";
@@ -1484,9 +1376,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "good friend to Morriphen,";
 		mes "no matter what he says.";
 		close;
-	}
-	else if(hg_bio == 6)
-	{
+	} else if (hg_bio == 6) {
 		mes "[Siria]";
 		mes "*Cough* I-I'm fine,";
 		mes "so please don't worry";
@@ -1494,9 +1384,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "medicine to Morriphen as";
 		mes "fast as you can for me.";
 		close;
-	}
-	else if(hg_bio == 7)
-	{
+	} else if (hg_bio == 7) {
 		mes "^3355FFYou gently administered";
 		mes "the medicine to Siria, who";
 		mes "slow regained consciousness.^000000";
@@ -1524,11 +1412,10 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "I just... I just need to relax.";
 		mes "Thank you for everything...";
 		set hg_bio,8;
-		getexp 50000,0;
+		getexp (checkre(3))?30000:500000,0;
+		changequest 11015,11016;
 		close;
-	}
-	else if(hg_bio == 8)
-	{
+	} else if (hg_bio == 8) {
 		mes "[Siria]";
 		mes "Oh, please go back";
 		mes "to Morriphen and let";
@@ -1536,9 +1423,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "better. I don't want him";
 		mes "to worry about me!";
 		close;
-	}
-	else if(hg_bio == 9)
-	{
+	} else if (hg_bio == 9) {
 		mes "[Siria]";
 		mes "Oh, welcome~";
 		mes "Thank you so much";
@@ -1546,22 +1431,17 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "Morriphen. You've been";
 		mes "a real godsend, you know?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Siria]";
 		mes "Oh, hello there.";
 		mes "Can I help you";
 		mes "with anything?";
 		close;
 	}
-	
 }
 
 lighthalzen,88,79,7	script	Dono	85,{
-
-	if(hg_bio == 2)
-	{
+	if (hg_bio == 2) {
 		mes "[Dono]";
 		mes "What do you want?";
 		mes "Spit it out, I don't";
@@ -1644,33 +1524,30 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "If you don't hurry, then";
 		mes "those two will die, simple^FFFFFF ^000000 as that. I'll wait for you here.";
 		set hg_bio,3;
+		changequest 11010,11011;
 		close;
-	}
-	else if(hg_bio == 1)
-	{
+	} else if (hg_bio == 1) {
 		mes "[Dono]";
 		mes "Store's closed.";
 		mes "Get outta here, and";
 		mes "come back later to";
 		mes "buy something, got it?";
 		close;
-	}
-	else if(hg_bio == 3)
-	{
-		if (countitem(971) > 2 && countitem(1003) > 4 && countitem(619) && countitem(507) && countitem(508) && countitem(511) && countitem(509) && countitem(510) && countitem(7053) > 4 && countitem(7054) > 4 && countitem(935) > 19)
-		{
-			delitem 971,3;
-			delitem 1003,5;
-			delitem 619,1;
-			delitem 507,1;
-			delitem 508,1;
-			delitem 511,1;
-			delitem 509,1;
-			delitem 510,1;
-			delitem 7053,5;
-			delitem 7054,5;
-			delitem 935,20;
+	} else if (hg_bio == 3) {
+		if (countitem(971) > 2 && countitem(1003) > 4 && countitem(619) && countitem(507) && countitem(508) && countitem(511) && countitem(509) && countitem(510) && countitem(7053) > 4 && countitem(7054) > 4 && countitem(935) > 19) {
+			delitem 971,3; //Detrimindexta
+			delitem 1003,5; //Coal
+			delitem 619,1; //Unripe_Apple
+			delitem 507,1; //Red_Herb
+			delitem 508,1; //Yellow_Herb
+			delitem 511,1; //White_Herb
+			delitem 509,1; //Green_Herb
+			delitem 510,1; //Blue_Herb
+			delitem 7053,5; //Brigan
+			delitem 7054,5; //Cyfar
+			delitem 935,20; //Shell
 			set hg_bio,4;
+			changequest 11011,11012;
 			mes "[Dono]";
 			mes "Good, good, you've brought";
 			mes "everything I've asked. Give";
@@ -1713,9 +1590,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 			mes "chemical impurities in this";
 			mes "medicine. Go, go now!";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Dono]";
 			mes "If you don't hurry and";
 			mes "gather the materials for";
@@ -1741,9 +1616,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 			mes "^3355FF1 Yellow Herb^000000.";
 			close;
 		}
-	}
-	else if(hg_bio == 4)
-	{
+	} else if (hg_bio == 4) {
 		mes "[Dono]";
 		mes "Hey, you should be able";
 		mes "to find Makkie inside the";
@@ -1751,9 +1624,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "up and bring me some Red";
 		mes "Plant Stem Power from him.^FFFFFF ^000000 Come on, Morriphen's in trouble!";
 		close;
-	}
-	else if(hg_bio == 5)
-	{
+	} else if (hg_bio == 5) {
 		mes "[Dono]";
 		mes "Where is it?!";
 		mes "Okay, good, you brought";
@@ -1815,19 +1686,16 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "stresses himself to death,";
 		mes "my work will be for nothing.";
 		set hg_bio,6;
+		changequest 11013,11014;
 		close;
-	}
-	else if(hg_bio == 6)
-	{
+	} else if (hg_bio == 6) {
 		mes "[Dono]";
 		mes "Whoa, what are you still";
 		mes "doing here?! Hurry and";
 		mes "get that medicine over to";
 		mes "Morriphen, or he'll die soon!";
 		close;
-	}
-	else if(hg_bio == 7)
-	{
+	} else if (hg_bio == 7) {
 		mes "[Dono]";
 		mes "Oh, hey, do you know";
 		mes "how Morriphen's doing?";
@@ -1836,9 +1704,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "only guy that can offer me";
 		mes "a decent challenge at chess...";
 		close;
-	}
-	else if(hg_bio == 8)
-	{
+	} else if (hg_bio == 8) {
 		mes "[Dono]";
 		mes "Oh, hey, do you know";
 		mes "how Morriphen's doing?";
@@ -1847,9 +1713,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "only guy that can offer me";
 		mes "a decent challenge at chess...";
 		close;
-	}
-	else if(hg_bio == 9)
-	{
+	} else if (hg_bio == 9) {
 		mes "[Dono]";
 		mes "Oh, hey, do you know";
 		mes "how Morriphen's doing?";
@@ -1858,9 +1722,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "only guy that can offer me";
 		mes "a decent challenge at chess...";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Dono]";
 		mes "Hey, store's closed!";
 		mes "I'll open when I feel";
@@ -1869,13 +1731,10 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "anything! Now, scram!";
 		close;
 	}
-	
 }
 
 lhz_in03,193,28,3	script	Makkie	83,{
-
-	if(hg_bio == 4)
-	{
+	if (hg_bio == 4) {
 		mes "[Makkie]";
 		mes "Hello, how may";
 		mes "I help you today?";
@@ -1955,6 +1814,7 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "^3355FFYou receive a small bag";
 		mes "of Red Plant Stem Powder.^000000";
 		set hg_bio,5;
+		changequest 11012,11013;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh! Thanks so much";
@@ -1962,42 +1822,32 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "I better hurry and give";
 		mes "this to Dono. Goodbye~";
 		close;
-	}
-	else if(hg_bio == 1)
-	{
+	} else if (hg_bio == 1) {
 		mes "[Makkie]";
 		mes "Gosh, I'm so bored~";
 		mes "I wouldn't even mind";
 		mes "having some work to do.";
 		close;
-	}
-	else if(hg_bio == 2)
-	{
+	} else if (hg_bio == 2) {
 		mes "[Makkie]";
 		mes "Gosh, I'm so bored~";
 		mes "I wouldn't even mind";
 		mes "having some work to do.";
 		close;
-	}
-	else if(hg_bio == 3)
-	{
+	} else if (hg_bio == 3) {
 		mes "[Makkie]";
 		mes "Gosh, I'm so bored~";
 		mes "I wouldn't even mind";
 		mes "having some work to do.";
 		close;
-	}
-	else if(hg_bio == 5)
-	{
+	} else if (hg_bio == 5) {
 		mes "[Makkie]";
 		mes "Hm? Shouldn't you hurry";
 		mes "and get that bag of Red";
 		mes "Plant Stem Powder to";
 		mes "Dono as soon as you can?";
 		close;
-	}
-	else if(hg_bio == 6)
-	{
+	} else if (hg_bio == 6) {
 		mes "[Makkie]";
 		mes "Hey, have you seen";
 		mes "Morriphen and Dono";
@@ -2006,9 +1856,7 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "I should go see them";
 		mes "soon, for old time's sake.";
 		close;
-	}
-	else if(hg_bio == 7)
-	{
+	} else if (hg_bio == 7) {
 		mes "[Makkie]";
 		mes "Hey, have you seen";
 		mes "Morriphen and Dono";
@@ -2017,9 +1865,7 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "I should go see them";
 		mes "soon, for old time's sake.";
 		close;
-	}
-	else if(hg_bio == 8)
-	{
+	} else if (hg_bio == 8) {
 		mes "[Makkie]";
 		mes "Hey, have you seen";
 		mes "Morriphen and Dono";
@@ -2028,9 +1874,7 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "I should go see them";
 		mes "soon, for old time's sake.";
 		close;
-	}
-	else if(hg_bio == 9)
-	{
+	} else if (hg_bio == 9) {
 		mes "[Makkie]";
 		mes "Hey, have you seen";
 		mes "Morriphen and Dono";
@@ -2039,25 +1883,20 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "I should go see them";
 		mes "soon, for old time's sake.";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Makkie]";
 		mes "Hey, welcome to the";
 		mes "Lighthalzen Pub. Relax,";
 		mes "and make yourself at home~";
 		close;
 	}
-	
 }
 
-// Rebellion Quest
+// Rebellion Quest :: hg_tre
 //============================================================
 hugel,70,137,5	script	Shede	879,{
-
 	cutin "siide1.bmp",2;
-	if(hg_tre == 0)
-	{
+	if (hg_tre == 0) {
 		mes "[Shede]";
 		mes "Yay~ are you talking to me? Yay!";
 		mes "Hey, are you from a different city? Wow, nice to see you!";
@@ -2072,8 +1911,7 @@ hugel,70,137,5	script	Shede	879,{
 		mes "At the same time, I have so many customers to serve...";
 		mes "In fact, I don't even have a time to cht-chat, hohoho.";
 		next;
-		switch( select( "Do you want me to help you?","I will leave you alone" ) )
-		{
+		switch(select("Do you want me to help you?:I will leave you alone")) {
 		case 1:
 			mes "[Shede]";
 			mes "Oh~ how kind of you! Thank you so much~";
@@ -2081,133 +1919,125 @@ hugel,70,137,5	script	Shede	879,{
 			emotion e_lv;
 			next;
 			mes "[Shede]";
-			switch(rand(1,3))
-			{
-				case 1:
-					mes "Uncle Hollun's birthday is coming,";
-					mes "so I want to make \"^3131FFMushroom Flavor Cookies^000000\" for him.";
-					mes "Unfortunately, I am short of the most important ingredient, the Mushrooms.";
-					next;
-					cutin "siide2.bmp",2;
-					mes "[Shede]";
-					mes "Ordinary mushrooms don't smell that good, but";
-					mes "\"^3131FFMoks Mushrooms^000000\" which only grow in Hugel have such appetizing scent.";
-					mes "So, when they are added to cookies, they enhance the taste of cookies so much better.";
-					next;
-					mes "[Shede]";
-					mes "Can you please go gather \"^3131FF5 Moks Mushroom Solution^000000\" from \"^3131FFMoks Mushrooms^000000\"?";
-					mes "You will find the mushrooms in fields near Hugel.";
-					mes "I hope that you will bring their solution as quickly as you can!";
-					set hg_tre,10;
-					close2;
-					cutin "",255;
-					end;
-				break;
-				case 2:
-					mes "In fact, Agette and I am competing with each other for the Hugel's best cookie master position.";
-					next;
-					mes "[Shede]";
-					mes "Becoming the best cookie mater is not an easy thing to achieve.";
-					mes "Everyone can have the best ingredients and the best cooking utensils,";
-					mes "but that doesn't mean that they can become the best cookie masters.";
-					next;
-					mes "[Shede]";
-					mes "You need to know how to harmonize your skills and your senses";
-					mes "to make the most delicious cookies.";
-					next;
-					cutin "siide2.bmp",2;
-					mes "[Shede]";
-					mes "I dare to say that my cookies are the best.";
-					mes "However, Agette is also a professional cookie baker.";
-					next;
-					mes "[Shede]";
-					mes "If I hear her name while baking,";
-					mes "it makes me shake my hands in anxiety";
-					mes "so that I make a mistake to measure the right amount of ingredients.";
-					mes "That explains how good she is at baking cookies.";
-					next;
-					mes "[Shede]";
-					mes "Still, I am a proud cookie baker, and";
-					mes "I can hear a voice from deep inside of me saying";
-					mes "that I cannot be beat by her!";
-					mes "Can you hear that?";
-					mes "Can you hear my inner fighting spirit as a cookie baker?";
-					next;
-					mes "[Shede]";
-					mes "I am going to compete with her";
-					mes "for the Hugel's best cookie mater position after a while.";
-					mes "So, I have been doing my best in practicing my skills to win her!";
-					next;
-					mes "[Shede]";
-					mes "There were many obstacles in my way to become the best cookie baker.";
-					mes "But, see? I am still here, alive and kicking! I will never give up! In that sense..";
-					mes "I am going to challenge on baking ^FF0000Clam Cookies^000000 today!";
-					mes "I am going to make them taste tangy and unique. I am sure that they will be a great sucess!";
-					next;
-					mes "[Shede]";
-					mes "When you go to the beach, ";
-					mes "you will find clams near the ferry.";
-					mes "Please gather ^3131FF5 Clam Flesh^000000 from the clams.";
-					mes "Please hurry!";
-					set hg_tre,20;
-					close2;
-					cutin "",255;
-					end;
-				break;
-				case 3:
-					mes "In fact, I gave my heart to a gentleman.";
-					mes "I think that the time has come to let him know";
-					mes "how I feel about him.";
-					next;
-					cutin "siide2.bmp",2;
-					mes "[Shede]";
-					mes "So, I decided to bake special cookies called...";
-					mes "...... ^3131FFDevil's Cookies^000000!";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "Devil's Cookies?";
-					next;
-					cutin "siide1.bmp",2;
-					mes "[Shede]";
-					mes "Yes, Devil's Cookies.";
-					mes "When you go outside of Hugel, you will find \"^3131FFMoks Bugs^000000\"";
-					mes "hiding in the bushes. They breed in this season, so they are plump with eggs.";
-					next;
-					mes "[Shede]";
-					mes "When you stew their shells and use the broth to kneed flour,";
-					mes "you can make fresh and crunch cookies.";
-					next;
-					cutin "siide2.bmp",2;
-					mes "[Shede]";
-					mes "Devil's Cookies are so delicious, so they are rumored to dazzle the eaters with";
-					mes "the mysteriously crunch texture and the sweetness, and to allure them to hell without them knowing.";
-					mes "Ah~ I hope that he will like them...";
-					next;
-					cutin "siide1.bmp",2;
-					mes "[Shede]";
-					mes "Would you please help me to bake the cookies? I need 5 Moks Bug Shells~";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "'......I am confused...Does she love him or hate him?'";
-					emotion e_dots,1;
-					set hg_tre,30;
-					close2;
-					cutin "",255;
-					end;
-				break;
+			switch(rand(1,3)) {
+			case 1:
+				mes "Uncle Hollun's birthday is coming,";
+				mes "so I want to make \"^3131FFMushroom Flavor Cookies^000000\" for him.";
+				mes "Unfortunately, I am short of the most important ingredient, the Mushrooms.";
+				next;
+				cutin "siide2.bmp",2;
+				mes "[Shede]";
+				mes "Ordinary mushrooms don't smell that good, but";
+				mes "\"^3131FFMoks Mushrooms^000000\" which only grow in Hugel have such appetizing scent.";
+				mes "So, when they are added to cookies, they enhance the taste of cookies so much better.";
+				next;
+				mes "[Shede]";
+				mes "Can you please go gather \"^3131FF5 Moks Mushroom Solution^000000\" from \"^3131FFMoks Mushrooms^000000\"?";
+				mes "You will find the mushrooms in fields near Hugel.";
+				mes "I hope that you will bring their solution as quickly as you can!";
+				set hg_tre,10;
+				close2;
+				cutin "",255;
+				end;
+			case 2:
+				mes "In fact, Agette and I am competing with each other for the Hugel's best cookie master position.";
+				next;
+				mes "[Shede]";
+				mes "Becoming the best cookie mater is not an easy thing to achieve.";
+				mes "Everyone can have the best ingredients and the best cooking utensils,";
+				mes "but that doesn't mean that they can become the best cookie masters.";
+				next;
+				mes "[Shede]";
+				mes "You need to know how to harmonize your skills and your senses";
+				mes "to make the most delicious cookies.";
+				next;
+				cutin "siide2.bmp",2;
+				mes "[Shede]";
+				mes "I dare to say that my cookies are the best.";
+				mes "However, Agette is also a professional cookie baker.";
+				next;
+				mes "[Shede]";
+				mes "If I hear her name while baking,";
+				mes "it makes me shake my hands in anxiety";
+				mes "so that I make a mistake to measure the right amount of ingredients.";
+				mes "That explains how good she is at baking cookies.";
+				next;
+				mes "[Shede]";
+				mes "Still, I am a proud cookie baker, and";
+				mes "I can hear a voice from deep inside of me saying";
+				mes "that I cannot be beat by her!";
+				mes "Can you hear that?";
+				mes "Can you hear my inner fighting spirit as a cookie baker?";
+				next;
+				mes "[Shede]";
+				mes "I am going to compete with her";
+				mes "for the Hugel's best cookie mater position after a while.";
+				mes "So, I have been doing my best in practicing my skills to win her!";
+				next;
+				mes "[Shede]";
+				mes "There were many obstacles in my way to become the best cookie baker.";
+				mes "But, see? I am still here, alive and kicking! I will never give up! In that sense..";
+				mes "I am going to challenge on baking ^FF0000Clam Cookies^000000 today!";
+				mes "I am going to make them taste tangy and unique. I am sure that they will be a great sucess!";
+				next;
+				mes "[Shede]";
+				mes "When you go to the beach, ";
+				mes "you will find clams near the ferry.";
+				mes "Please gather ^3131FF5 Clam Flesh^000000 from the clams.";
+				mes "Please hurry!";
+				set hg_tre,20;
+				close2;
+				cutin "",255;
+				end;
+			case 3:
+				mes "In fact, I gave my heart to a gentleman.";
+				mes "I think that the time has come to let him know";
+				mes "how I feel about him.";
+				next;
+				cutin "siide2.bmp",2;
+				mes "[Shede]";
+				mes "So, I decided to bake special cookies called...";
+				mes "...... ^3131FFDevil's Cookies^000000!";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Devil's Cookies?";
+				next;
+				cutin "siide1.bmp",2;
+				mes "[Shede]";
+				mes "Yes, Devil's Cookies.";
+				mes "When you go outside of Hugel, you will find \"^3131FFMoks Bugs^000000\"";
+				mes "hiding in the bushes. They breed in this season, so they are plump with eggs.";
+				next;
+				mes "[Shede]";
+				mes "When you stew their shells and use the broth to kneed flour,";
+				mes "you can make fresh and crunch cookies.";
+				next;
+				cutin "siide2.bmp",2;
+				mes "[Shede]";
+				mes "Devil's Cookies are so delicious, so they are rumored to dazzle the eaters with";
+				mes "the mysteriously crunch texture and the sweetness, and to allure them to hell without them knowing.";
+				mes "Ah~ I hope that he will like them...";
+				next;
+				cutin "siide1.bmp",2;
+				mes "[Shede]";
+				mes "Would you please help me to bake the cookies? I need 5 Moks Bug Shells~";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "'......I am confused...Does she love him or hate him?'";
+				emotion e_dots,1;
+				set hg_tre,30;
+				close2;
+				cutin "",255;
+				end;
 			}
-		break;
 		case 2:
 			mes "[Shede]";
 			mes "No, it is fine. Somehow I needed a break, hohoh!";
 			close2;
 			cutin "",255;
 			end;
-		break;
 		}
-	}
-	else if(hg_tre > 9 && hg_tre < 15)
-	{
+	} else if (hg_tre > 9 && hg_tre < 15) {
 		mes "[Shede]";
 		mes "Can you please go gather \"^3131FF5 Moks Mushroom Solution^000000\" from \"^3131FFMoks Mushrooms^000000\"?";
 		mes "You will find the mushrooms in fields near Hugel.";
@@ -2215,27 +2045,21 @@ hugel,70,137,5	script	Shede	879,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre > 19 && hg_tre < 25)
-	{
+	} else if (hg_tre > 19 && hg_tre < 25) {
 		mes "[Shede]";
 		mes "Please pick up \"^3131FF5 Clams^000000\" from a fish trap in the ferry.";
 		mes "I hope that you will bring their solution as quickly as you can!";
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre > 29 && hg_tre < 35)
-	{
+	} else if (hg_tre > 29 && hg_tre < 35) {
 		mes "[Shede]";
 		mes "Please bring \"^3131FF5 Moks Bug Shells^000000\" from outside of Hugel.";
 		mes "I hope that you will bring their solution as quickly as you can!";
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 15)
-	{
+	} else if (hg_tre == 15) {
 		mes "[Shede]";
 		mes "Oh! You came back earlier than I thought.";
 		mes "Now, I can bake the Mushroom Flavor Cookies for uncle Hollun.";
@@ -2245,9 +2069,7 @@ hugel,70,137,5	script	Shede	879,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 25)
-	{
+	} else if (hg_tre == 25) {
 		mes "[Shede]";
 		mes "Oh! You came back earlier than I thought.";
 		mes "Now, I can bake the best cookies of mine and compete with Agette!";
@@ -2257,9 +2079,7 @@ hugel,70,137,5	script	Shede	879,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 35)
-	{
+	} else if (hg_tre == 35) {
 		mes "[Shede]";
 		mes "Oh! You came back earlier than I thought.";
 		mes "Now, I can bake Devil's Cookies to confess my love to the gentleman.";
@@ -2274,11 +2094,8 @@ hugel,70,137,5	script	Shede	879,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 40)
-	{
-		if(lhz_boss == 44 && lhz_curse > 30)
-		{
+	} else if (hg_tre == 40) {
+		if (lhz_boss == 44 && lhz_curse > 30) {
 			mes "[Shede]";
 			mes "Have you seen Mr. Herico?";
 			mes "He is a lonesome old man who is staying at Hugel Inn.";
@@ -2290,9 +2107,7 @@ hugel,70,137,5	script	Shede	879,{
 			close2;
 			cutin "",255;
 			end;
-		}
-		else
-		{
+		} else {
 			mes "[Shede]";
 			mes "So, how do you like Hugel?";
 			mes "It is a peaceful village, isn't it?";
@@ -2300,18 +2115,14 @@ hugel,70,137,5	script	Shede	879,{
 			cutin "",255;
 			end;
 		}
-	}
-	else if(hg_tre == 41)
-	{
+	} else if (hg_tre == 41) {
 		mes "[Shede]";
 		mes "Mr. Herico has an impediment in movement, so he usually stays in his room.";
 		mes "Please go spend some time with him. I know that he will appreciate it.";
 		close2;
 		cutin "",255;
 		end;
-	}
-	else
-	{
+	} else {
 		mes "[Shede]";
 		mes "So, how do you like Hugel?";
 		mes "It is a peaceful village, isn't it?";
@@ -2319,28 +2130,22 @@ hugel,70,137,5	script	Shede	879,{
 		cutin "",255;
 		end;
 	}
-	
 }
 
 hu_in01,256,40,3	script	Herico	897,{
-
-	if(checkweight(7342,1) != 1)
-	{
+	if (checkweight(7342,1) != 1) {
 		mes "[Herico]";
 		mes "Why don't you go take some load off your shoulder first, and come back?";
 		close;
 	}
 	cutin "heri1.bmp",2;
-	if(hg_tre < 41)
-	{
+	if (hg_tre < 41) {
 		mes "[Herico]";
 		mes "The weather is beautiful today. *Sigh* But my body aches too badly to go out...";
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 41)
-	{
+	} else if (hg_tre == 41) {
 		mes "[Herico]";
 		mes "The weather is beautiful today. *Sigh* But my body aches too badly to go out...";
 		next;
@@ -2369,8 +2174,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		mes "and have figured out many things on your own.";
 		mes "Am I right?";
 		next;
-		switch( select( "Yes, you are right.","I am not so sure.","No." ) )
-		{
+		switch(select("Yes, you are right.:I am not so sure.:No.")) {
 		case 1:
 			cutin "heri2.bmp",2;
 			mes "[Herico]";
@@ -2399,7 +2203,6 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		break;
 		case 2:
 			mes "[Herico]";
 			mes "Then I guess that you have not been deeply impressed by this country.";
@@ -2407,7 +2210,6 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		break;
 		case 3:
 			mes "[Herico]";
 			mes "Oh, am I not?";
@@ -2415,11 +2217,8 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		break;
 		}
-	}
-	else if(hg_tre == 42)
-	{
+	} else if (hg_tre == 42) {
 		mes "[Herico]";
 		mes "Hmm...can you tell me your name once again?";
 		next;
@@ -2448,11 +2247,8 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 43)
-	{
-		if(hg_odin == 60)
-		{
+	} else if (hg_tre == 43) {
+		if (hg_odin == 60) {
 			mes "[Herico]";
 			mes "Welcome back. I have been waiting for you with eager anticipation to hear about the secret.";
 			mes "Now, please tell me what you have found out.";
@@ -2486,9 +2282,7 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		}
-		else
-		{
+		} else {
 			mes "[Herico]";
 			mes "Please find out the secret about the airship and the island.";
 			mes "Then I will tell you my stories.";
@@ -2497,9 +2291,7 @@ hu_in01,256,40,3	script	Herico	897,{
 			cutin "",255;
 			end;
 		}
-	}
-	else if(hg_tre == 44)
-	{
+	} else if (hg_tre == 44) {
 		mes "[Herico]";
 		mes "Hmm...I don't know where to start.";
 		next;
@@ -2607,9 +2399,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 45)
-	{
+	} else if (hg_tre == 45) {
 		mes "[Herico]";
 		mes "Please go to Lighthalzen and find a news reporter";
 		mes "who still remembers about the rebellion.";
@@ -2618,17 +2408,13 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre > 45 && hg_tre < 49)
-	{
+	} else if (hg_tre > 45 && hg_tre < 49) {
 		mes "[Herico]";
 		mes "How have you been doing?";
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 49)
-	{
+	} else if (hg_tre == 49) {
 		mes "[Herico]";
 		mes "Did you find Sage Varmunt's research documents?";
 		next;
@@ -2636,8 +2422,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		mes "["+strcharinfo(0)+"]";
 		mes "Well, about the documents...";
 		next;
-		switch( select( "I ate them.","Rekenber has taken them into their possession." ) )
-		{
+		switch(select("I ate them.:Rekenber has taken them into their possession.")) {
 		case 1:
 			mes "I ate them.";
 			next;
@@ -2681,11 +2466,11 @@ hu_in01,256,40,3	script	Herico	897,{
 			mes "["+strcharinfo(0)+"]";
 			mes "Rekenber has taken them into their possession.";
 			next;
-		break;
+			break;
 		case 2:
 			mes "Rekenber has taken them into their possession.";
 			next;
-		break;
+			break;
 		}
 		cutin "heri3.bmp",2;
 		mes "[Herico]";
@@ -2804,9 +2589,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 50)
-	{
+	} else if (hg_tre == 50) {
 		mes "[Herico]";
 		mes "Can you guess what I am thinking right now?";
 		next;
@@ -2833,8 +2616,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		mes "Let me hear your opinion.";
 		mes "Will you join me in destroying Regenschirm?";
 		next;
-		switch( select( "Sorry, I won't.","Yes, I will." ) )
-		{
+		switch(select("Sorry, I won't:Yes, I will.")) {
 		case 1:
 			mes "[Herico]";
 			mes "I respect your decision since this is not something";
@@ -2844,7 +2626,6 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		break;
 		case 2:
 			cutin "heri2.bmp",2;
 			mes "[Herico]";
@@ -2860,11 +2641,8 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		break;
 		}
-	}
-	else if(hg_tre == 51)
-	{
+	} else if (hg_tre == 51) {
 		mes "[Herico]";
 		mes "We must find out how we can stop them";
 		mes "from doing more evil things, at least for a while.";
@@ -2885,9 +2663,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 52)
-	{
+	} else if (hg_tre == 52) {
 		mes "[Herico]";
 		mes "Regenschirm is located at the underground level";
 		mes "of Rekenber's Laighthalzen headquarters.";
@@ -2895,9 +2671,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "heri1.bmp",255;
 		end;
-	}
-	else if(hg_tre == 53)
-	{
+	} else if (hg_tre == 53) {
 		mes "[Herico]";
 		mes "Ah, you are back.";
 		next;
@@ -2952,9 +2726,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 54)
-	{
+	} else if (hg_tre == 54) {
 		mes "[Herico]";
 		mes "Please go meet with ^3131FFthe Marine Sphere Bottle manufacturer^000000,";
 		mes "and purchase some Marine Sphere Bottles.";
@@ -2969,9 +2741,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 55)
-	{
+	} else if (hg_tre == 55) {
 		mes "["+strcharinfo(0)+"]";
 		mes "The machine was blown up.";
 		next;
@@ -3005,8 +2775,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		mes "By any chance, do you know a man who can aid his power in stopping them?";
 		next;
 		input .@inputstr$;
-		if(.@inputstr$ == "President Karl" || .@inputstr$ == "President Weierstrass" || .@inputstr$ == "President" || .@inputstr$ == "Karl Weierstrass")
-		{
+		if (.@inputstr$ == "President Karl" || .@inputstr$ == "President Weierstrass" || .@inputstr$ == "President" || .@inputstr$ == "Karl Weierstrass") {
 			mes "["+strcharinfo(0)+"]";
 			mes "I think that I know one...";
 			next;
@@ -3053,11 +2822,8 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else
-	{
-		if(countitem(7342))
-		{
+	} else {
+		if (countitem(7342)) {
 			mes "[Herico]";
 			mes "Why are you still here?";
 			mes "That research data will aid a great help to Mr. President.";
@@ -3065,67 +2831,48 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		}
-		else
-		{
+		} else {
 			mes "[Herico]";
 			mes "Hey, welcome back.";
 			next;
-			switch( select( "I brought Handcuffs","Regarding Sage Varmunt's documents" ) )
-			{
+			switch(select("I brought Handcuffs:Regarding Sage Varmunt's documents")) {
 			case 1:
 				mes "[Herico]";
 				mes "I am willing to exchange 1 of level 4 food with 100 Handcuffs.";
 				next;
-				switch( select( "Exchange.","Cancel." ) )
-				{
-				case 1:
-					if(countitem(7345) > 99) //Handcuffs
-					{
+				if(select("Exchange:Cancel.") == 1) {
+					if (countitem(7345) > 99) {
 						mes "[Herico]";
 						mes "There you go, thank you for your trouble.";
 						delitem 7345,100; //Handcuffs
-						switch(rand(1,6))
-						{
+						switch(rand(1,6)) {
 						case 1:
 							getitem 12044,1; //Herb Marinade Beef
-						break;
+							break;
 						case 2:
 							getitem 12049,1; //Morroc Fruit Wine
-						break;
+							break;
 						case 3:
 							getitem 12059,1; //Lutie Cold Noodle
-						break;
+							break;
 						case 4:
 							getitem 12064,1; //Cream Sandwich
-						break;
+							break;
 						case 5:
 							getitem 12069,1; //Steamed Ancient Lips
-						break;
+							break;
 						case 6:
 							getitem 12054,1; //Seasoned Jellyfish
-						break;
+							break;
 						}
-						close2;
-						cutin "",255;
-						end;
-					}
-					else
-					{
+					} else {
 						mes "[Herico]";
 						mes "I don't think that you have brought me 100 Handcuffs.";
-						close2;
-						cutin "",255;
-						end;
 					}
-				break;
-				case 2:
-				break;
 				}
 				close2;
 				cutin "",255;
 				end;
-			break;
 			case 2:
 				mes "[Herico]";
 				mes "When I checked the research data that you have brought to me,";
@@ -3136,19 +2883,15 @@ hu_in01,256,40,3	script	Herico	897,{
 				close2;
 				cutin "",255;
 				end;
-			break;
 			}
 		}
 	}
 	cutin "",255;
 	end;
-	
 }
 
 lhz_in03,39,44,3	script	Enquro Carson	97,{
-
-	if(hg_tre < 45)
-	{
+	if (hg_tre < 45) {
 		mes "[Enquro Carson]";
 		mes "Hello, everyone. This is Enquro Carson";
 		mes "from Light News.";
@@ -3159,9 +2902,7 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 		mes "especially when people are astonished by the news";
 		mes "which I am delivering to them.";
 		close;
-	}
-	else if(hg_tre == 45)
-	{
+	} else if (hg_tre == 45) {
 		mes "[Enquro Carson]";
 		mes "Hello, everyone. This is Enquro Carson";
 		mes "from Light News.";
@@ -3172,8 +2913,7 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 		mes "especially when people are astonished by the news";
 		mes "which I am delivering to them.";
 		next;
-		switch( select( "Mercenary Rebellion","News reporter job" ) )
-		{
+		switch(select("Mercenary Rebellion:News reporter job")) {
 		case 1:
 			mes "[Enquro Carson]";
 			mes "Hmm...Mercenary Rebellion...?";
@@ -3239,7 +2979,6 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 			mes "Can you please get me the drink? Hahaha, thanks!";
 			set hg_tre,46;
 			close;
-		break;
 		case 2:
 			mes "[Enquro Carson]";
 			mes ".......Hmmm...Hmmm...Hmmm.";
@@ -3249,13 +2988,9 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 			mes "[Enquro Carson]";
 			mes "You are not saying that you want to be a news reporter, are you?";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 46)
-	{
-		if(!countitem(12112) || !countitem(12113))
-		{
+	} else if (hg_tre == 46) {
+		if (!countitem(12112) || !countitem(12113)) {
 			mes "[Enquro Carson]";
 			mes "I heard of a private pub in Morroc,";
 			mes "a city of Rune-Midgarts Kingdom";
@@ -3264,9 +2999,7 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 			mes "and I wonder how delicious the drink will be.";
 			mes "Can you please get me the drink? Hahaha, thanks!";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Enquro Carson]";
 			mes "Wow, this is that famous drink!";
 			mes "Let's see...*Gulp*";
@@ -3314,9 +3047,7 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 			delitem 12113,1; //Vermilion on the Beach
 			close;
 		}
-	}
-	else if(hg_tre == 47)
-	{
+	} else if (hg_tre == 47) {
 		mes "[Enquro Carson]";
 		mes "Just get on to the airship and go to Hugel.";
 		mes "Hopefully you will meet with ^3131FFWintzil Trony^000000";
@@ -3324,28 +3055,21 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 		mes "Oh, be careful not to provoke him though.";
 		mes "He used to be a mercenary soldier, and they were famed for their violence.";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Enquro Carson]";
 		mes "This is very shameful for me to confess,";
 		mes "but I tend to make lots and lots of spelling mistakes.";
 		mes "Yeah, I know, it is a shame.";
 		close;
 	}
-	
 }
 
 hu_in01,310,380,5	script	Girl#hugel	891,{
-
-	if(hg_tre < 47)
-	{
+	if (hg_tre < 47) {
 		mes "[Girl]";
 		mes "Bah, I am bored.";
 		close;
-	}
-	else if(hg_tre == 47)
-	{
+	} else if (hg_tre == 47) {
 		mes "[Girl]";
 		mes "Hehe...are you from another city?";
 		mes "Heheh.";
@@ -3446,44 +3170,33 @@ hu_in01,310,380,5	script	Girl#hugel	891,{
 		mes "But, can you be careful to treat the shelf? It is a keepsake from my father.";
 		set hg_tre,48;
 		close;
-	}
-	else if(hg_tre > 48)
-	{
+	} else if (hg_tre > 48) {
 		mes "[Wintzil Trony]";
 		mes "I am bored and bored! When is my mom coming back?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Wintzil Trony]";
 		mes "If you promise me that you will not break it,";
 		mes "you can take a look at the shelf.";
 		close;
 	}
-	
 }
 
 hu_in01,317,312,0	script	Book	111,{
-
 	cutin "hg_book.bmp",2;
-	if(hg_tre > 47)
-	{
+	if (hg_tre > 47) {
 		mes "- You picked up a very thick book. -";
 		mes "- You opened the book and found out -";
 		mes "- that there were a small book hidden behind.-";
 		next;
-		switch( select( "Read the small book.","Leave it alone." ) )
-		{
+		switch(select("Read the small book.:Leave it alone.")) {
 		case 1:
 			mes "- You picked up the small book. -";
 			mes "- The book owner must want to -";
 			mes "- keep it secret. -";
 			next;
-			set @whilevar,1;
-			while(@whilevar)
-			{
-				switch( select( "Page 1","Page 2","Page 3","Page 4","Page 5","Page 6","Page 7","Page 8","Page 9","Stop Reading." ) )
-				{
+			while(1) {
+				switch(select("Page 1:Page 2:Page 3:Page 4:Page 5:Page 6:Page 7:Page 8:Page 9:Stop Reading.")) {
 				case 1:
 					mes "- You started reading the 1st page of the book. -";
 					next;
@@ -3509,7 +3222,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 2:
 					mes "- You started reading the 2nd page of the book. -";
 					next;
@@ -3522,7 +3235,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 3:
 					mes "- You started reading the 3rd page of the book. -";
 					next;
@@ -3550,7 +3263,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 4:
 					mes "- You started reading the 4th page of the book. -";
 					next;
@@ -3561,7 +3274,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 5:
 					mes "- You started reading the 5th page of the book. -";
 					next;
@@ -3583,7 +3296,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 6:
 					mes "- You started reading the 6th page of the book. -";
 					next;
@@ -3609,10 +3322,7 @@ hu_in01,317,312,0	script	Book	111,{
 					next;
 					mes "- You found a folded note between the pages that you were reading. -";
 					next;
-					switch( select( "Check the note.","Read the next page." ) )
-					{
-					case 1:
-						next;
+					if(select("Check the note.:Read the next page.") == 1) {
 						mes "^3131FF.........................^000000";
 						next;
 						mes "^3131FF...I am so sorry for hearing such devastating news and for your loss.";
@@ -3625,11 +3335,8 @@ hu_in01,317,312,0	script	Book	111,{
 						next;
 						mes "^3131FF.........................^000000";
 						next;
-					break;
-					case 2:
-					break;
 					}
-				break;
+					break;
 				case 7:
 					mes "- You started reading the 7th page.-";
 					next;
@@ -3657,7 +3364,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 8:
 					mes "- You started reading the 8th page. -";
 					next;
@@ -3676,7 +3383,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 9:
 					mes "- You started reading the 9th page. -";
 					next;
@@ -3696,37 +3403,29 @@ hu_in01,317,312,0	script	Book	111,{
 					mes " ";
 					mes "My arm is throbbing with pain again. The history of mercenary soldiers ended, and I need to rest.";
 					mes "I hope that this will be the last page of my journal.";
-					if(hg_tre == 48) set hg_tre,49;
+					if (hg_tre == 48) set hg_tre,49;
 					next;
 					mes "- The journal was ended at the page. -";
 					next;
-				break;
+					break;
 				case 10:
-					set @whilevar,0;
 					mes "- You closed the book. -";
 					close2;
 					cutin "",255;
 					end;
-				break;
 				}
 			}
-		break;
 		case 2:
 			mes "- You closed the book. -";
 			close2;
 			cutin "",255;
 			end;
-		break;
 		}
-
 	}
-
 }
 
 einbech,208,124,3	script	Bomb Maker	851,{
-
-	if(hg_tre == 54)
-	{
+	if (hg_tre == 54) {
 		if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 			mes "[Boomer]";
 			mes "Hey, you look pretty heavy, huh?";
@@ -3738,8 +3437,7 @@ einbech,208,124,3	script	Bomb Maker	851,{
 		mes "I am a professional Marine Sphere Bottle maker.";
 		mes "You can call me Boomer.";
 		next;
-		switch( select( "Buy Marine Sphere Bottle.","End conversation." ) )
-		{
+		switch(select("Buy Marine Sphere Bottle.:End conversation.")) {
 		case 1:
 			mes "[Boomer]";
 			mes "Heh, you want my Marine Sphere Bottles, huh?";
@@ -3753,55 +3451,43 @@ einbech,208,124,3	script	Bomb Maker	851,{
 			mes "considering its amazing performance!";
 			mes "You will regret if you miss this chance. Hahaha!";
 			next;
-			switch( select( "Buy.","Cancel." ) )
-			{
+			switch(select("Buy.:Cancel.")) {
 			case 1:
-				if(Zeny < 3000)
-				{
+				if (Zeny < 3000) {
 					mes "[Boomer]";
 					mes "Errr...You must have been so hurry to carry your wallet with you.";
 					close;
 				}
-					mes "[Boomer]";
-					mes "Just make sure that you are not going to";
-					mes "blow yourself away with this bomb, hahah!";
-					set Zeny,Zeny-3000;
-					getitem 7138,1; //Marine Sphere Bottle
-					close;
-			break;
+				mes "[Boomer]";
+				mes "Just make sure that you are not going to";
+				mes "blow yourself away with this bomb, hahah!";
+				set Zeny,Zeny-3000;
+				getitem 7138,1; //Marine Sphere Bottle
+				close;
 			case 2:
 				mes "[Boomer]";
 				mes "I believe that you will end up coming back to me. Heheh.";
 				close;
-			break;
 			}
-		break;
 		case 2:
 			mes "[Boomer]";
 			mes "Boom! Don't you need a bomb? Boom!";
 			close;
-		break;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Boomer]";
 		mes "Hey, what's up?";
 		mes "I am a professional Marine Sphere Bottle maker.";
 		mes "You can call me Boomer.";
 		close;
 	}
-	
 }
 
 hu_fild06,168,359,3	script	Moks Mushrooms#Mush1	111,{
-
-	if(hg_tre > 9 && hg_tre < 15)
-	{
+	if (hg_tre > 9 && hg_tre < 15) {
 		mes "- You found mushrooms that are as big as your palm. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You decided to gather the mushrooms. -";
 			next;
@@ -3815,8 +3501,7 @@ hu_fild06,168,359,3	script	Moks Mushrooms#Mush1	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -3824,28 +3509,24 @@ hu_fild06,168,359,3	script	Moks Mushrooms#Mush1	111,{
 			mes "- You have successfully gathered mushrooms. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 11)
+			if (hg_tre == 11)
 				mes "Collected Moks Mushroom Solution: 1ea ";
-			else if(hg_tre == 12)
+			else if (hg_tre == 12)
 				mes "Collected Moks Mushroom Solution: 2ea ";
-			else if(hg_tre == 13)
+			else if (hg_tre == 13)
 				mes "Collected Moks Mushroom Solution: 3ea ";
-			else if(hg_tre == 14)
+			else if (hg_tre == 14)
 				mes "Collected Moks Mushroom Solution: 4ea ";
-			else if(hg_tre == 15)
+			else if (hg_tre == 15)
 				mes "Collected Moks Mushroom Solution: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Mushrooms#Mush1";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 15)
-	{
+	} else if (hg_tre == 15) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -3855,17 +3536,13 @@ OnTimer20000:
 	enablenpc "Moks Mushrooms#Mush1";
 	stopnpctimer;
 	end;
-
 }
 
 hu_fild06,194,341,3	script	Moks Mushrooms#Mush2	111,{
-
-	if(hg_tre > 9 && hg_tre < 15)
-	{
+	if (hg_tre > 9 && hg_tre < 15) {
 		mes "- You found mushrooms that are as big as your palm. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You decided to gather the mushrooms. -";
 			next;
@@ -3879,8 +3556,7 @@ hu_fild06,194,341,3	script	Moks Mushrooms#Mush2	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -3888,28 +3564,24 @@ hu_fild06,194,341,3	script	Moks Mushrooms#Mush2	111,{
 			mes "- You have successfully gathered mushrooms. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 11)
+			if (hg_tre == 11)
 				mes "Collected Moks Mushroom Solution: 1ea ";
-			else if(hg_tre == 12)
+			else if (hg_tre == 12)
 				mes "Collected Moks Mushroom Solution: 2ea ";
-			else if(hg_tre == 13)
+			else if (hg_tre == 13)
 				mes "Collected Moks Mushroom Solution: 3ea ";
-			else if(hg_tre == 14)
+			else if (hg_tre == 14)
 				mes "Collected Moks Mushroom Solution: 4ea ";
-			else if(hg_tre == 15)
+			else if (hg_tre == 15)
 				mes "Collected Moks Mushroom Solution: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Mushrooms#Mush2";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 15)
-	{
+	} else if (hg_tre == 15) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -3919,17 +3591,13 @@ OnTimer20000:
 	enablenpc "Moks Mushrooms#Mush2";
 	stopnpctimer;
 	end;
-
 }
 
 hu_fild06,198,339,3	script	Moks Mushrooms#Mush3	111,{
-
-	if(hg_tre > 9 && hg_tre < 15)
-	{
+	if (hg_tre > 9 && hg_tre < 15) {
 		mes "- You found mushrooms that are as big as your palm. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You decided to gather the mushrooms. -";
 			next;
@@ -3943,8 +3611,7 @@ hu_fild06,198,339,3	script	Moks Mushrooms#Mush3	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -3952,28 +3619,24 @@ hu_fild06,198,339,3	script	Moks Mushrooms#Mush3	111,{
 			mes "- You have successfully gathered mushrooms. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 11)
+			if (hg_tre == 11)
 				mes "Collected Moks Mushroom Solution: 1ea ";
-			else if(hg_tre == 12)
+			else if (hg_tre == 12)
 				mes "Collected Moks Mushroom Solution: 2ea ";
-			else if(hg_tre == 13)
+			else if (hg_tre == 13)
 				mes "Collected Moks Mushroom Solution: 3ea ";
-			else if(hg_tre == 14)
+			else if (hg_tre == 14)
 				mes "Collected Moks Mushroom Solution: 4ea ";
-			else if(hg_tre == 15)
+			else if (hg_tre == 15)
 				mes "Collected Moks Mushroom Solution: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Mushrooms#Mush3";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 15)
-	{
+	} else if (hg_tre == 15) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -3983,17 +3646,13 @@ OnTimer20000:
 	enablenpc "Moks Mushrooms#Mush3";
 	stopnpctimer;
 	end;
-
 }
 
 hugel,209,163,3	script	Clam#C1	111,{
-
-	if(hg_tre > 19 && hg_tre < 25)
-	{
+	if (hg_tre > 19 && hg_tre < 25) {
 		mes "- You found very fresh clams whose shells are shining under the sunlight. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You started opening clam shells to gather Clam Flesh.-";
 			next;
@@ -4007,8 +3666,7 @@ hugel,209,163,3	script	Clam#C1	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4016,28 +3674,24 @@ hugel,209,163,3	script	Clam#C1	111,{
 			mes "- You have successfully gathered Clam Flesh. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 21)
+			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
-			else if(hg_tre == 22)
+			else if (hg_tre == 22)
 				mes "Collected Clam Flesh: 2ea ";
-			else if(hg_tre == 23)
+			else if (hg_tre == 23)
 				mes "Collected Clam Flesh: 3ea ";
-			else if(hg_tre == 24)
+			else if (hg_tre == 24)
 				mes "Collected Clam Flesh: 4ea ";
-			else if(hg_tre == 25)
+			else if (hg_tre == 25)
 				mes "Collected Clam Flesh: 5ea ";
 			initnpctimer;
 			disablenpc "Clam#C1";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 25)
-	{
+	} else if (hg_tre == 25) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -4047,17 +3701,13 @@ OnTimer20000:
 	enablenpc "Clam#C1";
 	stopnpctimer;
 	end;
-
 }
 
 hugel,203,166,3	script	Clam#C2	111,{
-
-	if(hg_tre > 19 && hg_tre < 25)
-	{
+	if (hg_tre > 19 && hg_tre < 25) {
 		mes "- You found very fresh clams whose shells are shining under the sunlight. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You started opening clam shells to gather Clam Flesh.-";
 			next;
@@ -4071,8 +3721,7 @@ hugel,203,166,3	script	Clam#C2	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
 				specialeffect EF_STUNATTACK;
 				close;
@@ -4080,28 +3729,24 @@ hugel,203,166,3	script	Clam#C2	111,{
 			mes "- You have successfully gathered Clam Flesh. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 21)
+			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
-			else if(hg_tre == 22)
+			else if (hg_tre == 22)
 				mes "Collected Clam Flesh: 2ea ";
-			else if(hg_tre == 23)
+			else if (hg_tre == 23)
 				mes "Collected Clam Flesh: 3ea ";
-			else if(hg_tre == 24)
+			else if (hg_tre == 24)
 				mes "Collected Clam Flesh: 4ea ";
-			else if(hg_tre == 25)
+			else if (hg_tre == 25)
 				mes "Collected Clam Flesh: 5ea ";
 			initnpctimer;
 			disablenpc "Clam#C2";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 25)
-	{
+	} else if (hg_tre == 25) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -4111,17 +3756,13 @@ OnTimer20000:
 	enablenpc "Clam#C2";
 	stopnpctimer;
 	end;
-
 }
 
 hugel,217,158,3	script	Clam#C3	111,{
-
-	if(hg_tre > 19 && hg_tre < 25)
-	{
+	if (hg_tre > 19 && hg_tre < 25) {
 		mes "- You found very fresh clams whose shells are shining under the sunlight. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You started opening clam shells to gather Clam Flesh.-";
 			next;
@@ -4135,8 +3776,7 @@ hugel,217,158,3	script	Clam#C3	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4144,28 +3784,24 @@ hugel,217,158,3	script	Clam#C3	111,{
 			mes "- You have successfully gathered Clam Flesh. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 21)
+			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
-			else if(hg_tre == 22)
+			else if (hg_tre == 22)
 				mes "Collected Clam Flesh: 2ea ";
-			else if(hg_tre == 23)
+			else if (hg_tre == 23)
 				mes "Collected Clam Flesh: 3ea ";
-			else if(hg_tre == 24)
+			else if (hg_tre == 24)
 				mes "Collected Clam Flesh: 4ea ";
-			else if(hg_tre == 25)
+			else if (hg_tre == 25)
 				mes "Collected Clam Flesh: 5ea ";
 			initnpctimer;
 			disablenpc "Clam#C3";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 25)
-	{
+	} else if (hg_tre == 25) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -4175,17 +3811,13 @@ OnTimer20000:
 	enablenpc "Clam#C3";
 	stopnpctimer;
 	end;
-
 }
 
 hugel,204,150,3	script	Clam#C4	111,{
-
-	if(hg_tre > 19 && hg_tre < 25)
-	{
+	if (hg_tre > 19 && hg_tre < 25) {
 		mes "- You found very fresh clams whose shells are shining under the sunlight. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You started opening clam shells to gather Clam Flesh.-";
 			next;
@@ -4199,8 +3831,7 @@ hugel,204,150,3	script	Clam#C4	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4208,28 +3839,24 @@ hugel,204,150,3	script	Clam#C4	111,{
 			mes "- You have successfully gathered Clam Flesh. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 21)
+			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
-			else if(hg_tre == 22)
+			else if (hg_tre == 22)
 				mes "Collected Clam Flesh: 2ea ";
-			else if(hg_tre == 23)
+			else if (hg_tre == 23)
 				mes "Collected Clam Flesh: 3ea ";
-			else if(hg_tre == 24)
+			else if (hg_tre == 24)
 				mes "Collected Clam Flesh: 4ea ";
-			else if(hg_tre == 25)
+			else if (hg_tre == 25)
 				mes "Collected Clam Flesh: 5ea ";
 			initnpctimer;
 			disablenpc "Clam#C4";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 25)
-	{
+	} else if (hg_tre == 25) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -4239,17 +3866,13 @@ OnTimer20000:
 	enablenpc "Clam#C4";
 	stopnpctimer;
 	end;
-
 }
 
 hu_fild06,155,309,1	script	Moks Bugs#Bug1	1053,{
-
-	if(hg_tre > 29 && hg_tre < 35)
-	{
+	if (hg_tre > 29 && hg_tre < 35) {
 		mes "- You found big brown Moks Bugs in the bushes. -";
 		next;
-		switch( select( "Catch them.","Pass." ) )
-		{
+		switch(select("Catch them.:Pass.")) {
 		case 1:
 			mes "- You nervously stretched your hands toward Moks Bugs.-";
 			next;
@@ -4263,8 +3886,7 @@ hu_fild06,155,309,1	script	Moks Bugs#Bug1	1053,{
 			mes "- *Whizz Whizz*-";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4272,28 +3894,24 @@ hu_fild06,155,309,1	script	Moks Bugs#Bug1	1053,{
 			mes "- You have successfully gathered Moks Bugs Shells. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 31)
+			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
-			else if(hg_tre == 32)
+			else if (hg_tre == 32)
 				mes "Collected Moks Bugs Shells: 2ea ";
-			else if(hg_tre == 33)
+			else if (hg_tre == 33)
 				mes "Collected Moks Bugs Shells: 3ea ";
-			else if(hg_tre == 34)
+			else if (hg_tre == 34)
 				mes "Collected Moks Bugs Shells: 4ea ";
-			else if(hg_tre == 35)
+			else if (hg_tre == 35)
 				mes "Collected Moks Bugs Shells: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Bugs#Bug1";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 35)
-	{
+	} else if (hg_tre == 35) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Aww...I don't want to touch dirty things like bugs!";
 		close;
@@ -4303,17 +3921,13 @@ OnTimer20000:
 	enablenpc "Moks Bugs#Bug1";
 	stopnpctimer;
 	end;
-	
 }
 
 hu_fild06,218,320,1	script	Moks Bugs#Bug2	1053,{
-
-	if(hg_tre > 29 && hg_tre < 35)
-	{
+	if (hg_tre > 29 && hg_tre < 35) {
 		mes "- You found big brown Moks Bugs in the bushes. -";
 		next;
-		switch( select( "Catch them","Pass." ) )
-		{
+		switch(select("Catch them:Pass.")) {
 		case 1:
 			mes "- You nervously stretched your hands toward Moks Bugs.-";
 			next;
@@ -4327,8 +3941,7 @@ hu_fild06,218,320,1	script	Moks Bugs#Bug2	1053,{
 			mes "- *Whizz Whizz*-";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4336,28 +3949,24 @@ hu_fild06,218,320,1	script	Moks Bugs#Bug2	1053,{
 			mes "- You have successfully gathered Moks Bugs Shells. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 31)
+			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
-			else if(hg_tre == 32)
+			else if (hg_tre == 32)
 				mes "Collected Moks Bugs Shells: 2ea ";
-			else if(hg_tre == 33)
+			else if (hg_tre == 33)
 				mes "Collected Moks Bugs Shells: 3ea ";
-			else if(hg_tre == 34)
+			else if (hg_tre == 34)
 				mes "Collected Moks Bugs Shells: 4ea ";
-			else if(hg_tre == 35)
+			else if (hg_tre == 35)
 				mes "Collected Moks Bugs Shells: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Bugs#Bug2";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 35)
-	{
+	} else if (hg_tre == 35) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Aww...I don't want to touch dirty things like bugs!";
 		close;
@@ -4367,17 +3976,13 @@ OnTimer20000:
 	enablenpc "Moks Bugs#Bug2";
 	stopnpctimer;
 	end;
-	
 }
 
 hu_fild06,249,329,1	script	Moks Bugs#Bug3	1053,{
-
-	if(hg_tre > 29 && hg_tre < 35)
-	{
+	if (hg_tre > 29 && hg_tre < 35) {
 		mes "- You found big brown Moks Bugs in the bushes. -";
 		next;
-		switch( select( "Catch them","Pass." ) )
-		{
+		switch(select("Catch them:Pass.")) {
 		case 1:
 			mes "- You nervously stretched your hands toward Moks Bugs.-";
 			next;
@@ -4391,8 +3996,7 @@ hu_fild06,249,329,1	script	Moks Bugs#Bug3	1053,{
 			mes "- *Whizz Whizz*-";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4400,28 +4004,24 @@ hu_fild06,249,329,1	script	Moks Bugs#Bug3	1053,{
 			mes "- You have successfully gathered Moks Bugs Shells. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 31)
+			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
-			else if(hg_tre == 32)
+			else if (hg_tre == 32)
 				mes "Collected Moks Bugs Shells: 2ea ";
-			else if(hg_tre == 33)
+			else if (hg_tre == 33)
 				mes "Collected Moks Bugs Shells: 3ea ";
-			else if(hg_tre == 34)
+			else if (hg_tre == 34)
 				mes "Collected Moks Bugs Shells: 4ea ";
-			else if(hg_tre == 35)
+			else if (hg_tre == 35)
 				mes "Collected Moks Bugs Shells: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Bugs#Bug3";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 35)
-	{
+	} else if (hg_tre == 35) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Aww...I don't want to touch dirty things like bugs!";
 		close;
@@ -4431,17 +4031,13 @@ OnTimer20000:
 	enablenpc "Moks Bugs#Bug3";
 	stopnpctimer;
 	end;
-	
 }
 
 hu_fild06,218,373,1	script	Moks Bugs#Bug4	1053,{
-
-	if(hg_tre > 29 && hg_tre < 35)
-	{
+	if (hg_tre > 29 && hg_tre < 35) {
 		mes "- You found big brown Moks Bugs in the bushes. -";
 		next;
-		switch( select( "Catch them.","Pass." ) )
-		{
+		switch(select("Catch them.:Pass.")) {
 		case 1:
 			mes "- You nervously stretched your hands toward Moks Bugs.-";
 			next;
@@ -4455,8 +4051,7 @@ hu_fild06,218,373,1	script	Moks Bugs#Bug4	1053,{
 			mes "- *Whizz Whizz*-";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4464,28 +4059,24 @@ hu_fild06,218,373,1	script	Moks Bugs#Bug4	1053,{
 			mes "- You have successfully gathered Moks Bugs Shells. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 31)
+			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
-			else if(hg_tre == 32)
+			else if (hg_tre == 32)
 				mes "Collected Moks Bugs Shells: 2ea ";
-			else if(hg_tre == 33)
+			else if (hg_tre == 33)
 				mes "Collected Moks Bugs Shells: 3ea ";
-			else if(hg_tre == 34)
+			else if (hg_tre == 34)
 				mes "Collected Moks Bugs Shells: 4ea ";
-			else if(hg_tre == 35)
+			else if (hg_tre == 35)
 				mes "Collected Moks Bugs Shells: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Bugs#Bug4";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 35)
-	{
+	} else if (hg_tre == 35) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Aww...I don't want to touch dirty things like bugs!";
 		close;
@@ -4495,13 +4086,10 @@ OnTimer20000:
 	enablenpc "Moks Bugs#Bug4";
 	stopnpctimer;
 	end;
-	
 }
 
 lhz_in01,214,129,0	script	A Pile of Paper	111,{
-
-	if(hg_tre == 52)
-	{
+	if (hg_tre == 52) {
 		mes "- You found a pile of paper that was tied up with a thick ribbon.";
 		mes "On the very top paper, a period and a title saying 'Report of the **th Research'";
 		mes "were written.";
@@ -4513,13 +4101,12 @@ lhz_in01,214,129,0	script	A Pile of Paper	111,{
 		donpcevent "HuMSpawner::OnMonster";
 		close;
 	}
-	
+	end;
 }
 
 lhz_in01,235,129,0	script	HuMSpawner	139,{
-
 	OnMonster:
-	if(rand(0,1))
+	if (rand(0,1))
 		mapannounce "lhz_in01","Intruder alert! Protect the research documents!",1,0xFF0000;
 	else
 		mapannounce "lhz_in01","Intruder alert! Intruder alert!",1,0xFF0000;
@@ -4535,15 +4122,11 @@ OnTimer60000:
 	
 OnMonsterDead:
 	end;
-	
 }
 
 lhz_dun02,244,226,0	script	Unethical Machine	111,{
-
-	if(hg_tre == 54)
-	{
-		if(countitem(7138))
-		{
+	if (hg_tre == 54) {
+		if (countitem(7138)) {
 			mes "["+strcharinfo(0)+"]";
 			mes "This must be it...whoa, it looks very spooky.";
 			mes "Today, I am going to destroy you";
@@ -4558,15 +4141,12 @@ lhz_dun02,244,226,0	script	Unethical Machine	111,{
 			delitem 7138,1; //Marine sphere bottle
 			set hg_tre,55;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "- You were staggered for the fact that";
 			mes "you forgot to bring the Marine Sphere Bottle with you. -";
 			close;
 		}
 	}
-	
 }
 
 lhz_dun02,244,227,0	script	HiddenExplosion	139,5,5,{
@@ -4579,35 +4159,29 @@ OnTouch:
 	specialeffect EF_HIT5;
 	disablenpc "HiddenExplosion";
 	end;
-	
 }
 
 hu_in01,365,170,3	script	Girl#Hu	793,{
-
 	mes "[Girl]";
 	mes "I love sitting in front of a stove because it makes me warm~";
 	mes "Ah...it is so warm and relaxing...and now I feel sleepy...Zzzzz Zzzz...";
 	close;
-	
 }
 
 hu_in01,377,106,3	script	Pub Granny	892,{
-
 	mes "[Pub Granny]";
 	mes "Recently we have many tourists visiting our town.";
 	mes "They make me pretty busy, but I am so happy to see them enjoying my food. Hohoho!";
 	close;
 }
 
-// Memory Quest
+// Memory Quest :: hg_memo
 //============================================================
 hugel,198,169,0	script	#HugelTree	139,2,2,{
-
-	if(BaseLevel > 49)
-	{
-		if(!hg_memory)
-		{
+	if (BaseLevel > 49) {
+		if (!hg_memory) {
 			set hg_memory,1;
+			setquest 8057;
 			mes "^3355FFFor some reason, you";
 			mes "feel very warm, safe,";
 			mes "and secure near this";
@@ -4615,9 +4189,7 @@ hugel,198,169,0	script	#HugelTree	139,2,2,{
 			mes "it brings you a sense";
 			mes "of overwhelming comfort.^000000";
 			close;
-		}
-		else if(hg_memory == 1)
-		{
+		} else if (hg_memory == 1) {
 			mes "^3355FFFor some reason, you";
 			mes "feel very warm, safe,";
 			mes "and secure near this";
@@ -4625,9 +4197,7 @@ hugel,198,169,0	script	#HugelTree	139,2,2,{
 			mes "it brings you a sense";
 			mes "of overwhelming comfort.^000000";
 			close;
-		}
-		else if(hg_memory == 6)
-		{
+		} else if (hg_memory == 6) {
 			specialeffect2 EF_BEGINSPELL5;
 			mes "^3355FFWhat's this strange";
 			mes "feeling of dread?";
@@ -4635,9 +4205,7 @@ hugel,198,169,0	script	#HugelTree	139,2,2,{
 			mes "It's almost as if you";
 			mes "were in Nifflheim...^000000";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "^3355FFFor some reason, you";
 			mes "feel very warm, safe,";
 			mes "and secure near this";
@@ -4646,9 +4214,7 @@ hugel,198,169,0	script	#HugelTree	139,2,2,{
 			mes "of overwhelming comfort.^000000";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "^3355FFFor some reason, you";
 		mes "feel very warm, safe,";
 		mes "and secure near this";
@@ -4657,13 +4223,10 @@ hugel,198,169,0	script	#HugelTree	139,2,2,{
 		mes "of overwhelming comfort.^000000";
 		close;
 	}
-	
 }
 
 hugel,191,172,3	script	Manainne	892,1,{
-
-	if(hg_memory == 1)
-	{
+	if (hg_memory == 1) {
 		mes "[Manainne]";
 		mes "This tree means so much";
 		mes "to everyone in this town,";
@@ -4680,10 +4243,9 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "Right now he's surveying";
 		mes "the land for construction...";
 		set hg_memory,2;
+		changequest 8057,8058;
 		close;
-	}
-	else if(hg_memory == 2)
-	{
+	} else if (hg_memory == 2) {
 		mes "[Manainne]";
 		mes "This tree means so much";
 		mes "to everyone in this town,";
@@ -4700,9 +4262,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "Right now he's surveying";
 		mes "the land for construction...";
 		close;
-	}
-	else if(hg_memory == 5)
-	{
+	} else if (hg_memory == 5) {
 		mes "[Manainne]";
 		mes "You know, El Schatt and";
 		mes "I used to get along when";
@@ -4725,10 +4285,9 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "My sister would be rolling";
 		mes "in her grave, seeing him now...";
 		set hg_memory,6;
+		changequest 8061,8062;
 		close;
-	}
-	else if(hg_memory == 6)
-	{
+	} else if (hg_memory == 6) {
 		mes "[Manainne]";
 		mes "Now El Schatt is just a";
 		mes "heartless, money grubbing...!";
@@ -4736,9 +4295,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "My sister would be rolling";
 		mes "in her grave, seeing him now...";
 		close;
-	}
-	else if(hg_memory == 7)
-	{
+	} else if (hg_memory == 7) {
 		mes "[Manainne]";
 		mes "What? That's...";
 		mes "That's an incredible";
@@ -4761,9 +4318,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "It's giving me the chills!";
 		mes "A-aren't you cold?";
 		close;
-	}
-	else if(hg_memory == 8)
-	{
+	} else if (hg_memory == 8) {
 		mes "[Manainne]";
 		mes "......";
 		mes ".........";
@@ -4793,9 +4348,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "......";
 		mes "..........";
 		close;
-	}
-	else if(hg_memory == 9)
-	{
+	} else if (hg_memory == 9) {
 		mes "[Manainne]";
 		mes "...I'm here. I'm really";
 		mes "back! Oh, it's been so";
@@ -4846,9 +4399,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes ".........";
 		mes "............";
 		close;
-	}
-	else if(hg_memory == 10)
-	{
+	} else if (hg_memory == 10) {
 		mes "[Manainne]";
 		mes "Wait, El Schatt!";
 		mes "It's really me, but";
@@ -4934,15 +4485,11 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "Is it really you?";
 		set hg_memory,11;
 		close;
-	}
-	else if(hg_memory == 11)
-	{
+	} else if (hg_memory == 11) {
 		mes "[Manainne]";
 		mes "El Schatt...";
 		close;
-	}
-	else if(hg_memory == 12)
-	{
+	} else if (hg_memory == 12) {
 		mes "^3355FFManainne is sobbing";
 		mes "uncontrollably, and there's";
 		mes "nothing you can do to comfort";
@@ -4950,9 +4497,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "leave her alone to her despair";
 		mes "and unfathomable sense of loss.^000000";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Manainne]";
 		mes "You know, even though";
 		mes "it's not a wealthy area,";
@@ -4962,13 +4507,10 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "the world, I'd live right here~";
 		close;
 	}
-	
 }
 
 niflheim,90,106,3	script	A Spirit#HQuest	802,{
-
-	if(hg_memory == 6)
-	{
+	if (hg_memory == 6) {
 		mes "[Spirit]";
 		mes "El Schatt...";
 		mes "Manainne...";
@@ -5003,11 +4545,10 @@ niflheim,90,106,3	script	A Spirit#HQuest	802,{
 		mes "the living... to Hugel...";
 		mes "Let me send you there...";
 		set hg_memory,7;
+		changequest 8062,8063;
 		close2;
 		warp "hugel",78,148;
-	}
-	else if(hg_memory == 7)
-	{
+	} else if (hg_memory == 7) {
 		mes "[Kanainne's Spirit]";
 		mes "You...! You can help";
 		mes "me... Just go back to ";
@@ -5015,9 +4556,7 @@ niflheim,90,106,3	script	A Spirit#HQuest	802,{
 		mes "Let me send you there...";
 		close2;
 		warp "hugel",78,148;
-	}
-	else
-	{
+	} else {
 		mes "[Spirit]";
 		mes "The living shouldn't";
 		mes "be here in Nifflheim...";
@@ -5030,13 +4569,10 @@ niflheim,90,106,3	script	A Spirit#HQuest	802,{
 		mes "I miss them...";
 		close;
 	}
-	
 }
 
 hugel,100,103,3	script	Perfitz	866,{
-
-	if(hg_memory == 3)
-	{
+	if (hg_memory == 3) {
 		set hg_memory,4;
 		mes "[Perfitz]";
 		mes "I'm pleased that my son has";
@@ -5060,19 +4596,16 @@ hugel,100,103,3	script	Perfitz	866,{
 		mes "he's too excited about cutting";
 		mes "that tree down. Maybe this old";
 		mes "man is just too suspcious~";
+		changequest 8059,8060;
 		close;
-	}
-	else if(hg_memory == 4)
-	{
+	} else if (hg_memory == 4) {
 		mes "[Perfitz]";
 		mes "It's funny how things";
 		mes "change. You know, El Schatt";
 		mes "actually used to protest against^FFFFFF ^000000 my idea of building shops in the";
 		mes "area when that tree grows. Hmm...^FFFFFF ^000000 I wonder, what happened to him?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Perfitz]";
 		mes "Money is very dependable...";
 		mes "But it's value is relative, and";
@@ -5098,13 +4631,10 @@ hugel,100,103,3	script	Perfitz	866,{
 		mes "that are worth having.";
 		close;
 	}
-	
 }
 
 hugel,196,164,3	script	El Schatt	50,{
-
-	if(hg_memory == 2)
-	{
+	if (hg_memory == 2) {
 		mes "[El Schatt]";
 		mes "What? What's that look for?";
 		mes "Oh, you must have spoken to";
@@ -5136,10 +4666,9 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "town, but how much money do";
 		mes "you think these people enjoy?";
 		mes "I need to look to the future...";
+		changequest 8058,8059;
 		close;
-	}
-	else if(hg_memory == 3)
-	{
+	} else if (hg_memory == 3) {
 		mes "[El Schatt]";
 		mes "This is the perfect";
 		mes "location for shops.";
@@ -5154,9 +4683,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "When you think about it,";
 		mes "it's just a waste of space...";
 		close;
-	}
-	else if(hg_memory == 4)
-	{
+	} else if (hg_memory == 4) {
 		set hg_memory,5;
 		mes "[El Schatt]";
 		mes "You've spoken with my father?";
@@ -5172,10 +4699,9 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "I'd protect that old tree";
 		mes "with my life, I won't deny";
 		mes "it. But that's an old story that^FFFFFF ^000000 should be buried in the past...";
+		changequest 8060,8061;
 		close;
-	}
-	else if(hg_memory == 5)
-	{
+	} else if (hg_memory == 5) {
 		mes "[El Schatt]";
 		mes "The past is behind me";
 		mes "as it should be. Now";
@@ -5183,9 +4709,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "my family's businesses.";
 		mes "Father was right all along...";
 		close;
-	}
-	else if(hg_memory == 7)
-	{
+	} else if (hg_memory == 7) {
 		mes "[El Schatt]";
 		mes "What did you say...?";
 		mes "You met Kanainne?";
@@ -5194,9 +4718,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "of sick joke, so get out";
 		mes "of here before I get angry.";
 		close;
-	}
-	else if(hg_memory == 10)
-	{
+	} else if (hg_memory == 10) {
 		mes "[El Schatt]";
 		mes "No way...!";
 		mes "Kanainne is dead!";
@@ -5208,9 +4730,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes ".........";
 		mes "............";
 		close;
-	}
-	else if(hg_memory == 11)
-	{
+	} else if (hg_memory == 11) {
 		mes "[El Schatt]";
 		mes "K-Kanainne! ^333333*Sob*^000000";
 		mes "I've missed you so much!";
@@ -5336,17 +4856,16 @@ hugel,196,164,3	script	El Schatt	50,{
 		next;
 		specialeffect2 EF_CONE;
 		set hg_memory,12;
-		getexp 5000,0;
-		getitem 603,1; //Old blue box
+		getexp (checkre(3))?8000:50000,0;
+		completequest 8063;
+		getitem 603,1; //Old Blue Box
 		mes "[El Schatt]";
 		mes "Oh... Oh dear";
 		mes "sweet God... My...";
 		mes "My dear Kanainne...";
 		mes "No.... No... Please...";
 		close;
-	}
-	else if(hg_memory == 12)
-	{
+	} else if (hg_memory == 12) {
 		mes "[El Schatt]";
 		mes "...Would you please";
 		mes "leave me alone? I have...";
@@ -5354,9 +4873,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "think about. And there's";
 		mes "music that I have to write...";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[El Schatt]";
 		mes "Father was right...";
 		mes "This area is the perfect";
@@ -5369,21 +4886,17 @@ hugel,196,164,3	script	El Schatt	50,{
 
 }
 
-// Hide and Seek Quest
+// Hide and Seek Quest :: hg_c_child
 //============================================================
 hugel,107,67,3	script	Torpy	706,{
-
-	if(BaseLevel > 49)
-	{
-		if(!hg_ubu01)
-		{
+	if (BaseLevel > 49) {
+		if (!hg_ubu01) {
 			mes "[Torpy]";
 			mes "D-Daddy...!";
 			mes "Daddy where";
 			mes "are you?! Wah~!";
 			next;
-			switch( select( "What's wrong?:Ignore" ) )
-			{
+			switch(select("What's wrong?:Ignore")) {
 			case 1:
 				mes "[Torpy]";
 				mes "My Daddy hasn't";
@@ -5405,8 +4918,7 @@ hugel,107,67,3	script	Torpy	706,{
 				mes "and then, a-and then...";
 				mes "I never found him!";
 				next;
-				switch( select( "Really? Tell me more...:What, is that all...?" ) )
-				{
+				switch(select("Really? Tell me more...:What, is that all...?")) {
 				case 1:
 					mes "[Torpy]";
 					mes "Th-then my Mom got";
@@ -5424,8 +4936,8 @@ hugel,107,67,3	script	Torpy	706,{
 					mes "least one of them just";
 					mes "outside of town.";
 					set hg_ubu01,1;
+					setquest 12044;
 					close;
-				break;
 				case 2:
 					mes "["+strcharinfo(0)+"]";
 					mes "Don't worry, your";
@@ -5435,9 +4947,7 @@ hugel,107,67,3	script	Torpy	706,{
 					mes "of luck, kid.";
 					emotion e_dots,1;
 					close;
-				break;
 				}
-			break;
 			case 2:
 				mes "[Torpy]";
 				mes "D-Daddy...!";
@@ -5445,11 +4955,8 @@ hugel,107,67,3	script	Torpy	706,{
 				mes "Where are yoooou?!";
 				mes "Wuh-Waaaaaaaaaah!";
 				close;
-			break;
 			}
-		}
-		else if(hg_ubu01 == 2)
-		{
+		} else if (hg_ubu01 == 2) {
 			mes "[Torpy]";
 			mes "Oh...";
 			mes "Mommy was just";
@@ -5457,10 +4964,9 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "*Sob* Okay, I hope my";
 			mes "Daddy comes back soon...";
 			set hg_ubu01,3;
+			changequest 12045,12046;
 			close;
-		}
-		else if(hg_ubu01 == 6)
-		{
+		} else if (hg_ubu01 == 6) {
 			mes "[Torpy]";
 			mes "Y-you found my Daddy!";
 			mes "Hooray! I was so worried";
@@ -5493,9 +4999,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "a girlfriend! He promised~!^000000";
 			set hg_ubu01,7;
 			close;
-		}
-		else if(hg_ubu01 == 7)
-		{
+		} else if (hg_ubu01 == 7) {
 			mes "[Torpy]";
 			mes "Would you please hurry";
 			mes "and talk to my Mom? She";
@@ -5516,9 +5020,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "Wh-what if they become friends?";
 			mes "Um, that might not be good...^000000";
 			close;
-		}
-		else if(hg_ubu01 == 8)
-		{
+		} else if (hg_ubu01 == 8) {
 			emotion e_dots,1;
 			mes "[Torpy]";
 			mes "Daddy promised to get";
@@ -5534,9 +5036,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "girl that I can find! Yaaay~";
 			set hg_ubu01,9;
 			close;
-		}
-		else if(hg_ubu01 == 9)
-		{
+		} else if (hg_ubu01 == 9) {
 			emotion e_dots,1;
 			mes "[Torpy]";
 			mes "Maybe I should wait until";
@@ -5550,9 +5050,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "to learn about girlfriends,";
 			mes "or just people, in general.^000000";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Torpy]";
 			mes "^333333*Sniff*^000000 D-Daddy's gone!";
 			mes "Will you help me find my";
@@ -5560,9 +5058,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "to find him now! H-Hurry!";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Torpy]";
 		mes "Waaah~!";
 		mes "I have to find";
@@ -5570,13 +5066,10 @@ hugel,107,67,3	script	Torpy	706,{
 		mes "Where are yooooou?!";
 		close;
 	}
-	
 }
 
 hu_fild06,190,367,3	script	Torpy's Mom	701,{
-
-	if(hg_ubu01 == 0)
-	{
+	if (hg_ubu01 == 0) {
 		mes "[Torpy's Mom]";
 		mes "Where did he go this time?!";
 		mes "If my husband doesn't have";
@@ -5584,9 +5077,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "home, then he better come";
 		mes "up with one or he'll be sorry!";
 		close;
-	}
-	else if(hg_ubu01 == 1)
-	{
+	} else if (hg_ubu01 == 1) {
 		mes "[Torpy's Mom]";
 		mes "Hmm? Oh, you talked to";
 		mes "my little Torpy? He thinks his";
@@ -5633,10 +5124,9 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "my husband inside town, tell";
 		mes "him that he better come home!";
 		set hg_ubu01,2;
+		changequest 12044,12045;
 		close;
-	}
-	else if(hg_ubu01 == 2)
-	{
+	} else if (hg_ubu01 == 2) {
 		mes "[Torpy's Mom]";
 		mes "Listen, would you please";
 		mes "tell my son Torpy that I'm";
@@ -5645,31 +5135,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "my husband inside town, tell";
 		mes "him that he better come home!";
 		close;
-	}
-	else if(hg_ubu01 == 6)
-	{
-		mes "[Torpy's Mom]";
-		mes "What?! He was hiding";
-		mes "inside a barrel this";
-		mes "entire time?! Oh, no.";
-		mes "I'm sorry, my husband has";
-		mes "caused you so much trouble.";
-		next;
-		mes "[Torpy's Mom]";
-		mes "I really appreciate";
-		mes "everything you've done";
-		mes "to help us find him. I know";
-		mes "it's not much, but I hope";
-		mes "you accept this as our thanks.";
-		mes "Goodbye for now, adventurer~";
-		specialeffect2 EF_CONE;
-		set hg_ubu01,8;
-		getitem 12065,3; //Green salad
-		getexp 5000,0;
-		close;
-	}
-	else if(hg_ubu01 == 7)
-	{
+	} else if (hg_ubu01 == 6 || hg_ubu01 == 7) {
 		mes "[Torpy's Mom]";
 		mes "What?! He was hiding";
 		mes "inside a barrel this";
@@ -5684,14 +5150,13 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "it's not much, but I hope";
 		mes "you accept this as our thanks.";
 		mes "Goodbye for now, adventurer~";
-		specialeffect2 EF_MVP;
+		specialeffect2 (hg_ubu01 == 6)?EF_CONE:EF_MVP;
 		set hg_ubu01,8;
-		getitem 12065,3; //Green salad
-		getexp 5000,0;
+		completequest 12048;
+		getitem 12065,3; //Green Salad
+		getexp (checkre(3))?5000:50000,0;
 		close;
-	}
-	else if(hg_ubu01 == 8)
-	{
+	} else if (hg_ubu01 == 8) {
 		mes "[Torpy's Mom]";
 		mes "Sometimes I wonder if";
 		mes "Torpy is too mature for";
@@ -5700,9 +5165,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "way, those two really take";
 		mes "after each other. Oh, well...";
 		close;
-	}
-	else if(hg_ubu01 == 9)
-	{
+	} else if (hg_ubu01 == 9) {
 		emotion e_dots,1;
 		mes "[Torpy's Mom]";
 		mes "When is that husband";
@@ -5712,9 +5175,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "bet with Torpy, did he? Oh,";
 		mes "the trouble with those two...";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Torpy's Mom]";
 		mes "Where did he go this time?!";
 		mes "If my husband doesn't have";
@@ -5723,13 +5184,10 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "up with one or he'll be sorry!";
 		close;
 	}
-	
 }
 
 hugel,100,176,3	script	Suspicious Barrel	111,{
-
-	if(hg_ubu01 == 3)
-	{
+	if (hg_ubu01 == 3) {
 		mes "[Strange Man]";
 		mes "So... hun...gry...";
 		mes "F-food... Give me...";
@@ -5742,8 +5200,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 		mes "this barrel wants";
 		mes "Steamed Crab Nippers.^000000";
 		next;
-		switch( select( "I'll bring you Steamed Crab Nippers:Ignore" ) )
-		{
+		switch(select("I'll bring you Steamed Crab Nippers:Ignore")) {
 		case 1:
 			mes "[Strange Man]";
 			mes "Please... cook me...";
@@ -5765,8 +5222,8 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "o-only... possible...";
 			mes "Way... P-please help...";
 			set hg_ubu01,4;
+			changequest 12046,12047;
 			close;
-		break;
 		case 2:
 			mes "[Strange Man]";
 			mes "D-don't... leave...";
@@ -5781,13 +5238,9 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "and get your Steamed";
 			mes "Crab Nippers yourself?!";
 			close;
-		break;
 		}
-	}
-	else if(hg_ubu01 == 4)
-	{
-		if(countitem(12051)) //Steamed crab nippers
-		{
+	} else if (hg_ubu01 == 4) {
+		if (countitem(12051)) {
 			mes "[Strange Man]";
 			mes "Th-that... tantalizing...";
 			mes "scent... It's S-Steamed...";
@@ -5812,9 +5265,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			close2;
 			donpcevent "Strange Man#Hugel::OnEnable";
 			end;
-		}
-		else
-		{
+		} else {
 			mes "[Strange Man]";
 			mes "Please... cook me...";
 			mes "Steamed... Crab Nippers...!";
@@ -5836,11 +5287,8 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "Way... P-please help...";
 			close;
 		}
-	}
-	else if(hg_ubu01 == 5)
-	{
-		if(countitem(12051)) //Steamed crab nippers
-		{
+	} else if (hg_ubu01 == 5) {
+		if (countitem(12051)) {
 			mes "[Strange Man]";
 			mes "Th-that... tantalizing...";
 			mes "scent... It's S-Steamed...";
@@ -5865,9 +5313,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			close2;
 			donpcevent "Strange Man#Hugel::OnEnable";
 			end;
-		}
-		else
-		{
+		} else {
 			mes "[Strange Man]";
 			mes "Please... cook me...";
 			mes "Steamed... Crab Nippers...!";
@@ -5889,9 +5335,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "Way... P-please help...";
 			close;
 		}
-	}
-	else if(hg_ubu01 == 6)
-	{
+	} else if (hg_ubu01 == 6) {
 		emotion e_dots,1;
 		mes "^3355FFFor now, you should";
 		mes "tell Torpy and his mom";
@@ -5899,42 +5343,31 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 		mes "hiding so they won't";
 		mes "worry about him so much.";
 		close;
-	}
-	else if(hg_ubu01 == 7)
-	{
+	} else if (hg_ubu01 == 7) {
 		emotion e_dots,1;
 		mes "^800080Torpy's mom might want to know about^000000";
 		mes "^800080this extraordinary barrel.^000000";
 		close;
-	}
-	else if(hg_ubu01 == 8)
-	{
+	} else if (hg_ubu01 == 8) {
 		emotion e_dots,1;
 		mes "^800080How long does Torpy's father plan to stay within the barrel?^000000";
 		close;
-	}
-	else if(hg_ubu01 == 9)
-	{
+	} else if (hg_ubu01 == 9) {
 		emotion e_dots,1;
 		mes "^800080That barrel will become a symbolic object^000000";
 		mes "^800080that pays tribute to the firm will of Torpy's father^000000";
 		mes "^800080who is trying hard to avoid keeping the promise with his son to find his wife.^000000";
 		close;
-	}
-	else
-	{
+	} else {
 		emotion e_dots,1;
 		mes "^800080You hear something bustling from the hole in the barrel.^000000";
 		mes "^800080However, it doesn't seem to be a big deal.^000000";
 		close;
 	}
-	
 }
 
 hugel,100,174,3	script	Strange Man#Hugel	898,{
-
-	if(hg_ubu01 == 5)
-	{
+	if (hg_ubu01 == 5) {
 		mes "[Strange Man]";
 		mes "Ahhhh... Thanks for";
 		mes "the free meal! It was";
@@ -5980,6 +5413,7 @@ hugel,100,174,3	script	Strange Man#Hugel	898,{
 		mes "this game of Hide-and-Seek...";
 		mes "Well, I just can't lose! Bye!";
 		set hg_ubu01,6;
+		changequest 12047,12048;
 		next;
 		mes "^3355FFTorpy's father has";
 		mes "hidden himself again,";
@@ -5991,9 +5425,7 @@ hugel,100,174,3	script	Strange Man#Hugel	898,{
 		disablenpc "Strange Man#Hugel";
 		enablenpc "Suspicious Barrel";
 		end;
-	}
-	else
-	{
+	} else {
 		mes "[Strange Man]";
 		mes "Hahahaha!";
 		mes "Steamed Crab Nippers!";
@@ -6018,15 +5450,12 @@ OnTimer60000:
 	disablenpc "Strange Man#Hugel";
 	enablenpc "Suspicious Barrel";
 	end;
-	
 }
 
-// Fish Cake Soup Delivery Quest
+// Fish Cake Soup Delivery Quest :: hg_odeng
 //============================================================
 hu_in01,15,372,3	script	Cellette Lavit	74,{
-
-	if(!hg_odeng)
-	{
+	if (!hg_odeng) {
 		mes "[Cellette]";
 		mes "Hi there, thanks for";
 		mes "visiting our lovely town!";
@@ -6067,17 +5496,15 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 		mes "But if you're not interested,";
 		mes "you can just buy some now~";
 		next;
-		switch( select( "Sure, I'll work for you!:I want to buy Fish Cake Soup.:See ya." ) )
-		{
+		switch(select("Sure, I'll work for you!:I want to buy Fish Cake Soup.:See ya.")) {
 		case 1:
 			mes "[Cellette]";
 			mes "Oh, thank you so much!";
 			mes "You can't imagine how busy";
 			mes "I've been, and how much I need^FFFFFF ^000000 the help! Now, let's get started~";
 			next;
-			set @randvar, rand(1,4);
-			if(@randvar == 1)
-			{
+			switch(rand(1,4)) {
+			case 1:
 				mes "[Cellette]";
 				mes "Alright, please take this";
 				mes "order of Fish Cake Soup to";
@@ -6085,11 +5512,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "that she's a regular customer--";
 				mes "she's a good friend, but I'm sure^FFFFFF ^000000 that she loves the soup as well.";
 				set hg_odeng,1;
-				getitem 584,1; //Skewer soup
+				setquest 8064;
+				getitem 584,1; //Fish_Ball_Soup
 				close;
-			}
-			else if(@randvar == 2)
-			{
+			case 2:
 				mes "[Cellette]";
 				mes "Right, take this next order";
 				mes "of Fish Cake Soup to Maewan,";
@@ -6097,11 +5523,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "He's been buying my soup ever";
 				mes "since I helped him start his^FFFFFF ^000000 business. Nice of him, isn't it?";
 				set hg_odeng,2;
-				getitem 584,1; //Skewer soup
+				setquest 8065;
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
-			}
-			else if(@randvar == 3)
-			{
+			case 3:
 				mes "[Cellette]";
 				mes "Okay, this order of Fish";
 				mes "Cake Soup is ready! Please";
@@ -6110,11 +5535,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "a thing about punctuality.";
 				mes "Just try not to be late...";
 				set hg_odeng,3;
-				getitem 584,1; //Skewer soup
+				setquest 8066;
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
-			}
-			else if(@randvar == 4)
-			{
+			case 4:
 				mes "[Cellette]";
 				mes "Quick, take this Fish";
 				mes "Paste Soup to Erjan. Um,";
@@ -6123,10 +5547,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "have everything in such";
 				mes "and such and order...";
 				set hg_odeng,4;
-				getitem 584,1; //Skewer soup
+				setquest 8067;
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
 			}
-		break;
 		case 2:
 			mes "[Cellette]";
 			mes "Oh, you'd like to try my";
@@ -6135,22 +5559,18 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "its delicious, hearty flavor~";
 			mes "Each order costs 100 zeny.";
 			next;
-			switch( select( "Order a Fish Cake Soup:Cancel" ) )
-			{
+			switch(select("Order a Fish Cake Soup:Cancel")) {
 			case 1:
-				if(Zeny > 99)
-				{
+				if (Zeny > 99) {
 					mes "[Cellette]";
 					mes "Thanks! Enjoy your";
 					mes "bowl of Fish Cake Soup.";
 					mes "I hope you come and ";
 					mes "visit me again, okay?";
 					set Zeny,Zeny-100;
-					getitem 584,1; //Skewer soup
+					getitem 584,1; //Fish_Ball_Soup 
 					close;
-				}
-				else
-				{
+				} else {
 					mes "[Cellette]";
 					mes "Oh, what's this?";
 					mes "You don't have enough";
@@ -6160,7 +5580,6 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 					mes "for my gourmet soup, you know.";
 					close;
 				}
-			break;
 			case 2:
 				mes "[Cellette]";
 				mes "If you're ever hungry,";
@@ -6168,9 +5587,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "a delicious meal, come";
 				mes "and have some of my soup~";
 				close;
-			break;
 			}
-		break;
 		case 3:
 			mes "[Cellette]";
 			mes "Oh? You're not interested";
@@ -6180,13 +5597,9 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "back. I just know you'll love";
 			mes "the taste if you give it a try.";
 			close;
-		break;
 		}
-	}
-	else if(hg_odeng == 1)
-	{
-		if(countitem(584)) //Skewer soup
-		{
+	} else if (hg_odeng == 1) {
+		if (countitem(584)) {
 			mes "[Cellette]";
 			mes "Haven't you left already?";
 			mes "My friend Neha is waiting";
@@ -6195,9 +5608,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "try to get it to her before the";
 			mes "soup gets cold, okay?";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Cellette]";
 			mes "What's that? You lost";
 			mes "the Fish Cake Soup you're";
@@ -6206,8 +5617,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "to give you this fresh bowl";
 			mes "of soup that I just made...";
 			next;
-			if(Zeny > 99)
-			{
+			if (Zeny > 99) {
 				mes "[Cellette]";
 				mes "But you need to be";
 				mes "responsible and pay";
@@ -6216,11 +5626,9 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
 				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
-			}
-			else
-			{
+			} else {
 				mes "[Cellette]";
 				mes "W-wait... You don't";
 				mes "have any money to pay";
@@ -6232,11 +5640,8 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				close;
 			}
 		}
-	}
-	else if(hg_odeng == 2)
-	{
-		if(countitem(584)) //Skewer soup
-		{
+	} else if (hg_odeng == 2) {
+		if (countitem(584)) {
 			mes "[Cellette]";
 			mes "Whoa, whoa, whoa!";
 			mes "You should have left";
@@ -6244,9 +5649,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "soup to Maewan! Hurry,";
 			mes "before it gets too cold!";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Cellette]";
 			mes "What's that? You lost";
 			mes "the Fish Cake Soup you're";
@@ -6255,8 +5658,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "to give you this fresh bowl";
 			mes "of soup that I just made...";
 			next;
-			if(Zeny > 99)
-			{
+			if (Zeny > 99) {
 				mes "[Cellette]";
 				mes "But you need to be";
 				mes "responsible and pay";
@@ -6265,11 +5667,9 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
 				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
-			}
-			else
-			{
+			} else {
 				mes "[Cellette]";
 				mes "W-wait... You don't";
 				mes "have any money to pay";
@@ -6281,11 +5681,8 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				close;
 			}
 		}
-	}
-	else if(hg_odeng == 3)
-	{
-		if(countitem(584)) //Skewer soup
-		{
+	} else if (hg_odeng == 3) {
+		if (countitem(584)) {
 			mes "[Cellette]";
 			mes "I thought you left to";
 			mes "deliver that soup to";
@@ -6294,9 +5691,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "it doesn't taste good after";
 			mes "it gets cold, you know.";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Cellette]";
 			mes "What's that? You lost";
 			mes "the Fish Cake Soup you're";
@@ -6305,8 +5700,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "to give you this fresh bowl";
 			mes "of soup that I just made...";
 			next;
-			if(Zeny > 99)
-			{
+			if (Zeny > 99) {
 				mes "[Cellette]";
 				mes "But you need to be";
 				mes "responsible and pay";
@@ -6315,11 +5709,9 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
 				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
-			}
-			else
-			{
+			} else {
 				mes "[Cellette]";
 				mes "W-wait... You don't";
 				mes "have any money to pay";
@@ -6331,11 +5723,8 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				close;
 			}
 		}
-	}
-	else if(hg_odeng == 4)
-	{
-		if(countitem(584))
-		{
+	} else if (hg_odeng == 4) {
+		if (countitem(584)) {
 			mes "[Cellette]";
 			mes "Oh, dear, you better";
 			mes "leave now and deliver";
@@ -6343,9 +5732,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "Erjan before he can think";
 			mes "of something to complain about.^FFFFFF ^000000 Although it's probably too late...";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Cellette]";
 			mes "What's that? You lost";
 			mes "the Fish Cake Soup you're";
@@ -6354,8 +5741,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "to give you this fresh bowl";
 			mes "of soup that I just made...";
 			next;
-			if(Zeny > 99)
-			{
+			if (Zeny > 99) {
 				mes "[Cellette]";
 				mes "But you need to be";
 				mes "responsible and pay";
@@ -6364,11 +5750,9 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
 				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				getitem 584,1; //Fish_Ball_Soup
 				close;
-			}
-			else
-			{
+			} else {
 				mes "[Cellette]";
 				mes "W-wait... You don't";
 				mes "have any money to pay";
@@ -6380,9 +5764,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				close;
 			}
 		}
-	}
-	else if(hg_odeng == 5)
-	{
+	} else if (hg_odeng == 5) {
 		mes "[Cellette]";
 		mes "Ah, I'm sorry, but";
 		mes "I can't do any business";
@@ -6390,9 +5772,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 		mes "to be irresponsible. Nothing";
 		mes "personal, it's just my policy.";
 		close;
-	}
-	else if(hg_odeng == 10)
-	{
+	} else if (hg_odeng == 10) {
 		mes "[Cellette]";
 		mes "Good work! I hear that";
 		mes "you successfully delivered";
@@ -6401,8 +5781,12 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 		mes "is your Fish Cake Soup. Thank";
 		mes "you so much for your help~";
 		set hg_odeng,0;
-		getitem 584,3; //Skewer soup
-		getexp 100,0;
+		for(set .@i,8072; .@i<= 8075; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1)
+				erasequest .@i;
+		}
+		getitem 584,3; //Fish_Ball_Soup
+		getexp (checkre(3))?100:1000,0;
 		next;
 		mes "[Cellette]";
 		mes "It was really nice working";
@@ -6412,9 +5796,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 		mes "friends about my delicious";
 		mes "Fish Cake Soup. See you later~";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Cellette]";
 		mes "Come and taste some";
 		mes "authentic Hugel cuisine!";
@@ -6425,11 +5807,8 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 }
 
 hugel,76,134,3	script	Neha	101,{
-
-	if(hg_odeng == 1)
-	{
-		if(countitem(584))
-		{
+	if (hg_odeng == 1) {
+		if (countitem(584)) {
 			mes "[Neha]";
 			mes "Oh, you have a delivery";
 			mes "from Cellette, hm? Hmpf!";
@@ -6437,8 +5816,7 @@ hugel,76,134,3	script	Neha	101,{
 			mes "this soup isn't good if it";
 			mes "isn't steaming hot?";
 			next;
-			if(sex)
-			{
+			if (Sex) {
 				mes "[Neha]";
 				mes "But... You're a handsome";
 				mes "fellow, so I'll forgive you...";
@@ -6446,11 +5824,7 @@ hugel,76,134,3	script	Neha	101,{
 				mes "^FF00001 Whip^000000 with which to spank ";
 				mes "you. You better hurry, boy, or";
 				mes "I won't let you off that easy.";
-				set hg_odeng,6;
-				close;
-			}
-			else
-			{
+			} else {
 				mes "[Neha]";
 				mes "Yes, yes... You should";
 				mes "be punished. You should be";
@@ -6458,12 +5832,15 @@ hugel,76,134,3	script	Neha	101,{
 				mes "your delivery, then bring me";
 				mes "^FF00001 Whip^000000 so that I can spank you";
 				mes "for your impertinence, girl!";
-				set hg_odeng,6;
-				close;
 			}
-		}
-		else
-		{
+			for(set .@i,8064; .@i<= 8067; set .@i,.@i+1) {
+				if (checkquest(.@i) > -1 && checkquest(.@i) < 2)
+					completequest .@i;
+			}
+			setquest 8068;
+			set hg_odeng,6;
+			close;
+		} else {
 			mes "[Neha]";
 			mes "Oh ho ho ho ho ho~";
 			mes "I just love cute little boys...";
@@ -6472,11 +5849,8 @@ hugel,76,134,3	script	Neha	101,{
 			mes "a little bit as well. Hoho~";
 			close;
 		}
-	}
-	else if(hg_odeng == 6)
-	{
-		if(countitem(1960) && countitem(584)) //Whip and Skewer soup
-		{
+	} else if (hg_odeng == 6) {
+		if (countitem(1960) && countitem(584)) {
 			mes "[Neha]";
 			mes "Finally... My soup!";
 			mes "And you brought me my Whip!";
@@ -6504,12 +5878,11 @@ hugel,76,134,3	script	Neha	101,{
 			mes "you did a good job... I hope";
 			mes "you come deliver my soup again~";
 			delitem 1960,1; //Whip
-			delitem 584,1; //Skewer soup
+			delitem 584,1; //Fish_Ball_Soup
 			set hg_odeng,10;
+			changequest 8068,8072;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Neha]";
 			mes "^FF00001 Fish Cake Soup^000000...";
 			mes "^FF00001 Whip^000000... Is that too";
@@ -6519,9 +5892,7 @@ hugel,76,134,3	script	Neha	101,{
 			mes "with that, huh? Now hurry up!";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Neha]";
 		mes "Oh ho ho ho ho ho~";
 		mes "I just love cute little boys...";
@@ -6530,15 +5901,11 @@ hugel,76,134,3	script	Neha	101,{
 		mes "a little bit as well. Hoho~";
 		close;
 	}
-	
 }
 
 hugel,87,139,3	script	Maewan	86,{
-
-	if(hg_odeng == 2)
-	{
-		if(countitem(584))
-		{
+	if (hg_odeng == 2) {
+		if (countitem(584)) {
 			mes "[Maewan]";
 			mes "Oh, finally, I've been";
 			mes "waiting for my order of";
@@ -6560,10 +5927,9 @@ hugel,87,139,3	script	Maewan	86,{
 			mes "eat my soup before";
 			mes "you deliver it to me!";
 			set hg_odeng,7;
+			changequest 8065,8069;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Maewan]";
 			mes "I like to think of";
 			mes "myself as a man of";
@@ -6573,11 +5939,8 @@ hugel,87,139,3	script	Maewan	86,{
 			mes "all sorts of new things~";
 			close;
 		}
-	}
-	else if(hg_odeng == 7 )
-	{
-		if(countitem(584) && countitem(7015)) //Skewer soup and Bookclip in memory
-		{
+	} else if (hg_odeng == 7 ) {
+		if (countitem(584) && countitem(7015)) {
 			mes "[Maewan]";
 			mes "Great, you really brought";
 			mes "me a Bookclip in Memory!";
@@ -6585,13 +5948,12 @@ hugel,87,139,3	script	Maewan	86,{
 			mes "addition to my collection~";
 			mes "Oh, and give me my soup.";
 			mes "Thanks again for delivering~";
-			delitem 584,1; //Skewer soup
+			delitem 584,1; //Fish_Ball_Soup
 			delitem 7015,1; //Bookclip in memory
 			set hg_odeng,10;
+			changequest 8069,8073;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Maewan]";
 			mes "I know it sounds unfair";
 			mes "of me to ask you to bring";
@@ -6607,9 +5969,7 @@ hugel,87,139,3	script	Maewan	86,{
 			mes "for all sorts of crazy things.";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Maewan]";
 		mes "I like to think of";
 		mes "myself as a man of";
@@ -6623,11 +5983,8 @@ hugel,87,139,3	script	Maewan	86,{
 }
 
 hugel,84,125,3	script	Layoma	700,{
-
-	if(hg_odeng == 3)
-	{
-		if(countitem(584))
-		{
+	if (hg_odeng == 3) {
+		if (countitem(584)) {
 			mes "[Layoma]";
 			mes "You're here to deliver";
 			mes "my Fish Cake Soup?";
@@ -6644,10 +6001,9 @@ hugel,84,125,3	script	Layoma	700,{
 			mes "me ^FF00001 Mushroom Spore^000000, and";
 			mes "I'll forget this whole thing.";
 			set hg_odeng,8;
+			changequest 8066,8070;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Layoma]";
 			mes "I love singing songs,";
 			mes "and I love eating mushrooms.";
@@ -6655,11 +6011,8 @@ hugel,84,125,3	script	Layoma	700,{
 			mes "that's a pretty exciting life!";
 			close;
 		}
-	}
-	else if(hg_odeng == 8)
-	{
-		if(countitem(584) && countitem(921)) //Skewer soup and Mushroom spore
-		{
+	} else if (hg_odeng == 8) {
+		if (countitem(584) && countitem(921)) {
 			mes "[Layoma]";
 			mes "Great! You brought me";
 			mes "1 Mushroom Spore! This";
@@ -6672,13 +6025,12 @@ hugel,84,125,3	script	Layoma	700,{
 			mes "for my roommate Cellette";
 			mes "a little while longer. Oh, and";
 			mes "please tell her to not to come^FFFFFF ^000000 home so late all the time, okay?";
-			delitem 921,1; //Mushroom spore
-			delitem 584,1; //Skewer soup
+			delitem 921,1; //Mushroom_Spore
+			delitem 584,1; //Fish_Ball_Soup
 			set hg_odeng,10;
+			changequest 8070,8074;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Layoma]";
 			mes "Hey! I thought you";
 			mes "wanted to prove that";
@@ -6688,9 +6040,7 @@ hugel,84,125,3	script	Layoma	700,{
 			mes "Spore with my Fish Cake Soup!";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Layoma]";
 		mes "I love singing songs,";
 		mes "and I love eating mushrooms.";
@@ -6702,11 +6052,8 @@ hugel,84,125,3	script	Layoma	700,{
 }
 
 hugel,102,161,3	script	Erjan	100,{
-
-	if(hg_odeng == 4)
-	{
-		if(countitem(584))
-		{
+	if (hg_odeng == 4) {
+		if (countitem(584)) {
 			mes "[Erjan]";
 			mes "Well, I thought you'd";
 			mes "never come to deliver";
@@ -6723,6 +6070,7 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "the commoner's ^FF0000China^000000!";
 			next;
 			set hg_odeng,9;
+			changequest 8067,8071;
 			mes "[Erjan]";
 			mes "Realize that I'm compromising";
 			mes "with you by asking you to bring";
@@ -6731,9 +6079,7 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "glass and tableware available.";
 			mes "That's how we noblemen live~";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Erjan]";
 			mes "I am Erjan, first son of";
 			mes "the noble Franchefeschu";
@@ -6743,11 +6089,8 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "and do whatever it is you do.";
 			close;
 		}
-	}
-	else if(hg_odeng == 9)
-	{
-		if(countitem(584) && countitem(736)) //Skewer soup and China
-		{
+	} else if (hg_odeng == 9) {
+		if (countitem(584) && countitem(736)) {
 			mes "[Erjan]";
 			mes "Ah, so you've delivered";
 			mes "my Fish Cake Soup with some";
@@ -6768,13 +6111,12 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "Please take your leave,";
 			mes "and return to Cellette";
 			mes "with my noble thanks.";
-			delitem 736,1; //China
-			delitem 584,1; //Skewer soup
+			delitem 736,1; //White_Platter
+			delitem 584,1; //Fish_Ball_Soup
 			set hg_odeng,10;
+			changequest 8071,8075;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Erjan]";
 			mes "Must I repeat myself?";
 			mes "Bring me my ^FF0000Fish Cake Soup^000000";
@@ -6782,9 +6124,7 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "properly enjoy my meal.";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Erjan]";
 		mes "I am Erjan, first son of";
 		mes "the noble Franchefeschu";
@@ -6796,34 +6136,29 @@ hugel,102,161,3	script	Erjan	100,{
 	}
 }
 
-// Juno Remedy Quest
+// Juno Remedy Quest :: hg_ma1
 //============================================================
 yuno,111,156,3	script	Euslan	90,{
-
-	if(BaseLevel < 60)
-	{
+	if (BaseLevel < 60) {
 		mes "[Euslan]";
 		mes "^333333*Cough Cough*";
 		mes "*Haaaaaaack*";
 		mes "*C-cough* *Sob*^000000";
 		close;
 	}
-	if(!hg_ma1)
-	{
+	if (!hg_ma1) {
 		mes "[Euslan]";
 		mes "^333333*Cough Cough*";
 		mes "*Haaaaaaack*";
 		mes "*C-cough* *Sob*^000000";
 		next;
-		switch( select( "Ignore:Speak to Euslan" ) )
-		{
+		switch(select("Ignore:Speak to Euslan")) {
 		case 1:
 			mes "[Euslan]";
 			mes "^333333*Sniff*";
 			mes "*Huff Huff*";
 			mes "*Cough Cough*^000000";
 			close;
-		break;
 		case 2:
 			mes "[Euslan]";
 			mes "*Huff Huff*";
@@ -6836,25 +6171,20 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "to speak to her.^000000";
 			set hg_ma1,1;
 			close;
-		break;
 		}
-	}
-	else if(hg_ma1 == 1)
-	{
+	} else if (hg_ma1 == 1) {
 		mes "[Euslan]";
 		mes "^333333*Sniff* *Cough";
 		mes "*Cough Cough*";
 		mes "*Sob* *Sniff*^000000";
 		next;
-		switch( select( "Ignore:Speak to Euslan" ) )
-		{
+		switch(select("Ignore:Speak to Euslan")) {
 		case 1:
 			mes "[Euslan]";
 			mes "^333333*Sniff*";
 			mes "*Huff Huff*";
 			mes "*Cough Cough*^000000";
 			close;
-		break;
 		case 2:
 			mes "[Euslan]";
 			mes "^333333*Sniff*";
@@ -6867,17 +6197,15 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "^333333*Cough cough*^000000 did";
 			mes "you want? ^333333*Sniff*^000000";
 			next;
-		break;
+			break;
 		}
-		switch( select( "Nothing!:Are you alright?" ) )
-		{
+		switch(select("Nothing!:Are you alright?")) {
 		case 1:
 			mes "[Euslan]";
 			mes "Oh, I'm s-sorry...";
 			mes "^333333*Cough Cough*^000000 I must";
 			mes "have been mistaken...";
 			close;
-		break;
 		case 2:
 			mes "[Euslan]";
 			mes "Th-thank you so much";
@@ -6901,10 +6229,9 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "is he? ^333333*Sniff*^000000 Where's my";
 			mes "Thierry? I want to see him...";
 			next;
-		break;
+			break;
 		}
-		switch( select( "Leave her alone:Offer to find Thierry" ) )
-		{
+		switch(select("Leave her alone:Offer to find Thierry")) {
 		case 1:
 			mes "[Euslan]";
 			mes "Thierry... ^333333*Sob*^000000";
@@ -6914,7 +6241,6 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "^333333*Cough Cough*^000000";
 			set hg_ma1,2;
 			close;
-		break;
 		case 2:
 			mes "[Euslan]";
 			mes "...Are you really willing to";
@@ -6954,14 +6280,11 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "know as soon as you can,";
 			mes "okay? Thanks for cheering";
 			mes "me up, "+strcharinfo(0)+".";
-			setquest 8044;
 			set hg_ma1,3;
+			setquest 8044;
 			close;
-		break;
 		}
-	}
-	else if(hg_ma1 == 2)
-	{
+	} else if (hg_ma1 == 2) {
 		mes "[Euslan]";
 		mes "I've just been waiting here";
 		mes "for my fiancee to return, but";
@@ -6978,8 +6301,7 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "is he? ^333333*Sniff*^000000 Where's my";
 		mes "Thierry? I want to see him...";
 		next;
-		switch( select( "Leave her alone:Offer to find Thierry" ) )
-		{
+		switch(select("Leave her alone:Offer to find Thierry")) {
 		case 1:
 			mes "[Euslan]";
 			mes "Thierry... ^333333*Sob*^000000";
@@ -6988,7 +6310,6 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "I'm so worried...";
 			mes "^333333*Cough Cough*^000000";
 			close;
-		break;
 		case 2:
 			mes "[Euslan]";
 			mes "...Are you really willing to";
@@ -7028,23 +6349,18 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "know as soon as you can,";
 			mes "okay? Thanks for cheering";
 			mes "me up, "+strcharinfo(0)+".";
-			setquest 8044;
 			set hg_ma1,3;
+			setquest 8044;
 			close;
-		break;
 		}
-	}
-	else if(hg_ma1 == 3 || hg_ma1 == 4)
-	{
+	} else if (hg_ma1 == 3 || hg_ma1 == 4) {
 		mes "^333333Euslan is still patiently";
 		mes "waiting for Thierry's return.";
 		mes "You should keep your promise";
 		mes "to her by asking the crewmen on";
 		mes "the Schwaltvalt Republic domestic flights about Euslan's fiancee.^000000";
 		close;
-	}
-	else if(hg_ma1 == 5)
-	{
+	} else if (hg_ma1 == 5) {
 		mes "[Euslan]";
 		mes "Oh, you're back!";
 		mes "^333333*Cough*^000000 Maybe it's too";
@@ -7052,7 +6368,7 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "you learn anything about";
 		mes "where my fiancee might be?";
 		next;
-		menu "Well, I met Kaci on the Airship.",-;
+		select("Well, I met Kaci on the Airship.");
 		mes "[Euslan]";
 		mes "Oh, Kaci works on the";
 		mes "Airship? It's been so long";
@@ -7092,12 +6408,10 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "of your way. Still, I'd really";
 		mes "appreciate your help if you";
 		mes "happen to pass through Hugel.";
-		changequest 8046,8047;
 		set hg_ma1,6;
+		changequest 8046,8047;
 		close;
-	}
-	else if(hg_ma1 == 6 || hg_ma1 == 7)
-	{
+	} else if (hg_ma1 == 6 || hg_ma1 == 7) {
 		mes "[Euslan]";
 		mes "If you get the chance,";
 		mes "please visit my brother";
@@ -7105,17 +6419,13 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "him where my Thierry might be.";
 		mes "Thank you again for your kindness. ^FFFFFF ^000000";
 		close;
-	}
-	else if(hg_ma1 == 8 || hg_ma1 == 9 || hg_ma1 == 10 || hg_ma1 == 11)
-	{
+	} else if (hg_ma1 == 8 || hg_ma1 == 9 || hg_ma1 == 10 || hg_ma1 == 11) {
 		mes "^3355FFEuslan is waiting for";
 		mes "you to bring her news from";
 		mes "her fiancee Thierry. You better";
 		mes "go back to Hugel to find him.";
 		close;
-	}
-	else if(hg_ma1 == 12)
-	{
+	} else if (hg_ma1 == 12) {
 		mes "[Euslan]";
 		mes "Oh, you've returned!";
 		mes "^333333*Cough*^000000 Were you able to";
@@ -7152,14 +6462,15 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "your safety in your adventures.";
 		mes "Take care of yourself...";
 		close2;
-		completequest 8052;
 		set hg_ma1,13;
+		completequest 8052;
 		specialeffect EF_ABSORBSPIRITS;
-		getexp 90000,60000;
+		if (checkre(3))
+			getexp 90000,60000;
+		else
+			getexp 900000,600000;
 		end;
-	}
-	else if(hg_ma1 == 13)
-	{
+	} else if (hg_ma1 == 13) {
 		mes "^3355FFEuslan is still waiting";
 		mes "for her fiancee to return";
 		mes "home, but she appears";
@@ -7172,15 +6483,14 @@ yuno,111,156,3	script	Euslan	90,{
 
 que_bingo,49,12,0	script	#Hg_Quest	139,4,4,{
 OnTouch:
-	if(hg_ma1 == 6)
-	{
+	if (hg_ma1 == 6) {
 		mes "[Arcade Owner]";
 		mes "Welcome to the";
 		mes "Bingo Game Arcade.";
 		mes "Would you like to";
 		mes "play a game?";
 		next;
-		menu "I want to meet the game coordinator.",-;
+		select("I want to meet the game coordinator.");
 		mes "[Arcade Owner]";
 		mes "I'm sorry, but if he's on";
 		mes "duty, we can't really let you";
@@ -7193,9 +6503,7 @@ OnTouch:
 }
 
 que_bingo,53,190,7	script	Eukran	778,{
-
-	if(hg_ma1 == 6)
-	{
+	if (hg_ma1 == 6) {
 		mes "[Eukran]";
 		mes "Oh, weren't you just";
 		mes "in the bingo room?";
@@ -7203,7 +6511,7 @@ que_bingo,53,190,7	script	Eukran	778,{
 		mes "the game. Now, can";
 		mes "I help you with anything?";
 		next;
-		menu "Talk about Euslan",-;
+		select("Talk about Euslan");
 		mes "^3355FFYou tell Eukran about his";
 		mes "sister's illness, and that";
 		mes "she has sent you to search";
@@ -7232,8 +6540,8 @@ que_bingo,53,190,7	script	Eukran	778,{
 		mes "would Thierry go to such a";
 		mes "dangerous place? No one goes^FFFFFF ^000000 to the Odin Shrine for no reason.";
 		close2;
-		changequest 8047,8048;
 		set hg_ma1,8;
+		changequest 8047,8048;
 		warp "que_bingo",37,24;
 		end;
 	}
@@ -7242,8 +6550,7 @@ que_bingo,53,190,7	script	Eukran	778,{
 
 odin_tem01,129,127,0	script	HiddenActivator#Hugel	139,3,3,{
 OnTouch:
-	if(hg_ma1 == 8)
-	{
+	if (hg_ma1 == 8) {
 		mes "^3355FFYou can hear two";
 		mes "people talking to";
 		mes "each other a short";
@@ -7292,9 +6599,7 @@ OnTouch:
 		enablenpc "Young Man#Hu_Quest";
 		initnpctimer;
 		end;
-	}
-	else if(hg_ma1 == 9 || hg_ma1 == 10 || hg_ma1 == 11)
-	{
+	} else if (hg_ma1 == 9 || hg_ma1 == 10 || hg_ma1 == 11) {
 		enablenpc "Young Man#Hu_Quest";
 		initnpctimer;
 		end;
@@ -7312,16 +6617,14 @@ OnInit:
 }
 
 odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
-
-	if(hg_ma1 == 8)
-	{
+	if (hg_ma1 == 8) {
 		mes "[Young Man]";
 		mes "Hm? Oh, an adventurer.";
 		mes "There's more and more";
 		mes "of you coming to visit this";
 		mes "Odin Shrine nowadays.";
 		next;
-		menu "Mr. Thierry?",-;
+		select("Mr. Thierry?");
 		mes "[Thierry]";
 		mes "...?!";
 		mes "H-how do you";
@@ -7329,7 +6632,7 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "Do I know you";
 		mes "from somewhere?";
 		next;
-		menu "Tell him about Euslan",-;
+		select("Tell him about Euslan");
 		mes "[Thierry]";
 		mes "Oh, Euslan sent you to me?";
 		mes "I'm so sorry that you had to";
@@ -7337,7 +6640,7 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "Still, I'm glad to hear from her. Please let her know that I'm";
 		mes "coming home soon, would you?";
 		next;
-		menu "What are you doing here?",-;
+		select("What are you doing here?");
 		mes "[Thierry]";
 		mes "Well, um, I'm sorry.";
 		mes "I can't really go into the";
@@ -7346,12 +6649,10 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "Euslan's disease. It's not";
 		mes "curable by modern medicine...";
 		close2;
-		changequest 8048,8049;
 		set hg_ma1,9;
+		changequest 8048,8049;
 		end;
-	}
-	else if(hg_ma1 == 9)
-	{
+	} else if (hg_ma1 == 9) {
 		mes "[Thierry]";
 		mes "I can't tell you more";
 		mes "than that. Please just";
@@ -7360,16 +6661,14 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "Euslan that I should be";
 		mes "coming home very soon?";
 		close;
-	}
-	else if(hg_ma1 == 10)
-	{
+	} else if (hg_ma1 == 10) {
 		mes "[Thierry]";
 		mes "Oh, I thought you";
 		mes "already left Odin Shrine.";
 		mes "You don't have anything ";
 		mes "else to tell me, do you?";
 		next;
-		menu "Warn Thierry about Suspicious Men",-;
+		select("Warn Thierry about Suspicious Men");
 		mes "[Thierry]";
 		mes "What?! It's just what";
 		mes "I thought! They were just";
@@ -7479,14 +6778,11 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "If they get me, I'll never be";
 		mes "able to make the medicine!";
 		close2;
-		changequest 8050,8051;
 		set hg_ma1,11;
+		changequest 8050,8051;
 		end;
-	}
-	else if(hg_ma1 == 11)
-	{
-		if(countitem(7511) < 5)
-		{
+	} else if (hg_ma1 == 11) {
+		if (countitem(7511) < 5) {
 			mes "[Thierry]";
 			mes "I understand that gathering";
 			mes "materials here in the Odin";
@@ -7534,13 +6830,11 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "medicine that Thierry";
 		mes "has made to give to Euslan.^000000";
 		close2;
-		delitem 7511,5; //Darkness rune
-		changequest 8051,8052;
+		delitem 7511,5; //Rune_Of_Darkness
 		set hg_ma1,12;
+		changequest 8051,8052;
 		end;
-	}
-	else if(hg_ma1 == 12)
-	{
+	} else if (hg_ma1 == 12) {
 		mes "[Thierry]";
 		mes "Please give that";
 		mes "medicine to Euslan as";
@@ -7549,9 +6843,7 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "her know that I'm coming";
 		mes "home as soon as I can.";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Researcher]";
 		mes "I'm sorry, Euslan...";
 		mes "Please just wait for";
@@ -7564,8 +6856,7 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 
 odin_tem01,111,144,0	script	HiddenHugel	139,2,2,{
 OnTouch:
-	if(hg_ma1 == 9)
-	{
+	if (hg_ma1 == 9) {
 		mes "^3355FFYou hear the voice of";
 		mes "the suspicious man that";
 		mes "was speaking to Thierry";
@@ -7592,18 +6883,16 @@ OnTouch:
 		mes "you better go tell him";
 		mes "about this right now!^000000";
 		close2;
-		changequest 8049,8050;
 		set hg_ma1,10;
+		changequest 8049,8050;
 		end;
 	}
 }
 
-// Cow Milking Quest
+// Cow Milking Quest :: hg_milkingcow
 //============================================================
 hugel,56,104,3	script	Kurupe	709,3,3,{
-
-	if(hg_milk == 1)
-	{
+	if (hg_milk == 1) {
 		mes "[Kurupe]";
 		mes "Could Burupu be hiding";
 		mes "from me again? He's been";
@@ -7620,32 +6909,29 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "Burupu for me, I'll be sure";
 		mes "to pay you for your effort.";
 		next;
-		switch( select( "Sure.","Sorry, I'm busy." ) )
-		{
-			case 1:
-				mes "[Kurupe]";
-				mes "Thank you, you're a";
-				mes "lifesaver! I need to get the";
-				mes "milk delivered by tomorrow,";
-				mes "so I really need Burupu back!";
-				mes "You should be able to find him";
-				mes "somewhere just outside of town.";
-				set hg_milk,2;
-				close;
-			
-			case 2:
-				mes "[Kurupe]";
-				mes "N-no...!";
-				mes "If I can't find";
-				mes "Burupu, then there's no";
-				mes "way I'd be able to deliver";
-				mes "the milk orders by tomorrow!";
-				mes "Great, what am I gonna do?";
-				close;
+		switch(select("Sure.:Sorry, I'm busy.")) {
+		case 1:
+			mes "[Kurupe]";
+			mes "Thank you, you're a";
+			mes "lifesaver! I need to get the";
+			mes "milk delivered by tomorrow,";
+			mes "so I really need Burupu back!";
+			mes "You should be able to find him";
+			mes "somewhere just outside of town.";
+			set hg_milk,2;
+			setquest 12040;
+			close;
+		case 2:
+			mes "[Kurupe]";
+			mes "N-no...!";
+			mes "If I can't find";
+			mes "Burupu, then there's no";
+			mes "way I'd be able to deliver";
+			mes "the milk orders by tomorrow!";
+			mes "Great, what am I gonna do?";
+			close;
 		}
-	}
-	else if(hg_milk > 1 && hg_milk < 5)
-	{
+	} else if (hg_milk > 1 && hg_milk < 5) {
 		mes "[Kurupe]";
 		mes "Burupu, I need you";
 		mes "to come to work! Maybe";
@@ -7654,9 +6940,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "of town. I hope you can find";
 		mes "that lazy guy for me...";
 		close;
-	}
-	else if(hg_milk == 5)
-	{
+	} else if (hg_milk == 5) {
 		mes "[Kurupe]";
 		mes "Burupu is making demands?!";
 		mes "I guess I don't have a choice.";
@@ -7665,9 +6949,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "Why does Burupu want to become";
 		mes "a Swordman so much, huh?";
 		close;
-	}
-	else if(hg_milk == 6)
-	{
+	} else if (hg_milk == 6) {
 		mes "[Kurupe]";
 		mes "Oh, you're going to";
 		mes "help me milk the cow?";
@@ -7677,9 +6959,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "some delicious milk~";
 		set hg_milk,7;
 		close;
-	}
-	else if(hg_milk == 7)
-	{
+	} else if (hg_milk == 7) {
 		mes "[Kurupe]";
 		mes "Hmm, how about this?";
 		mes "If you can actually milk";
@@ -7688,9 +6968,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "that sound fair? Anyway,";
 		mes "please get to work soon~";
 		close;
-	}
-	else if(hg_milk == 8)
-	{
+	} else if (hg_milk == 8) {
 		mes "[Kurupe]";
 		mes "Great! Now that you've";
 		mes "milked Booboo, I can go";
@@ -7699,8 +6977,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "something to eat as my way";
 		mes "of saying, ''Thanks a lot~''";
 		next;
-		if(checkweight(12063,3) != 1)
-		{
+		if (checkweight(12063,3) != 1) {
 			mes "[Kurupe]";
 			mes "Wait a minute!";
 			mes "Currently you are carrying";
@@ -7711,8 +6988,9 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		}
 		set hg_milk,9;
 		specialeffect2 EF_CONE;
-		getexp 10000,0;
+		getexp (checkre(3))?10000:100000,0;
 		getitem 12063,3;
+		erasequest 12043;
 		mes "[Kurupe]";
 		mes "I always need";
 		mes "someone to help me";
@@ -7721,9 +6999,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "like doing it, so please come";
 		mes "by and help me when you can~";
 		close;
-	}
-	else if(hg_milk == 9)
-	{
+	} else if (hg_milk == 9) {
 		mes "[Kurupe]";
 		mes "Oh, it's you again!";
 		mes "Did you want to help me";
@@ -7731,56 +7007,49 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "cow? I can always use a";
 		mes "dependable person like you.";
 		next;
-		switch( select( "Sure, I'll milk Booboo.","What'll pay me this time?","Nah, just dropping by." ) )
-		{
-			case 1:
-				mes "[Kurupe]";
-				mes "Great, great! If you want";
-				mes "to milk Booboo, first tell";
-				mes "Burupu that he doesn't need";
-				mes "to come in today, and then";
-				mes "come back to me. Then, I'll";
-				mes "let you milk Booboo the cow.";
-				set hg_milk,10;
-				close;
-			
-			case 2:
-				mes "[Kurupe]";
-				mes "Let's see...";
-				mes "Milk Booboo for me this";
-				mes "time, and I'll randomly";
-				mes "choose one of the following";
-				mes "sets of rewards to give you.";
-				next;
-				mes "1 set of 5 Milk,";
-				mes "1 set of 3 Honey,";
-				mes "1 set of 5 Orange Potions,";
-				mes "1 set of Yellow Potions, or";
-				mes "1 Bundle of Food. Hmmm...";
-				mes "That sounds fair, right?";
-				close;
-			
-			case 3:
-				mes "[Kurupe]";
-				mes "Ahahahah, it's good";
-				mes "to see you! Now, don't";
-				mes "be a stranger, alright?";
-				mes "Burupu could learn a";
-				mes "couple things from you...";
-				close;
+		switch(select("Sure, I'll milk Booboo.:What'll pay me this time?:Nah, just dropping by.")) {
+		case 1:
+			mes "[Kurupe]";
+			mes "Great, great! If you want";
+			mes "to milk Booboo, first tell";
+			mes "Burupu that he doesn't need";
+			mes "to come in today, and then";
+			mes "come back to me. Then, I'll";
+			mes "let you milk Booboo the cow.";
+			set hg_milk,10;
+			close;
+		case 2:
+			mes "[Kurupe]";
+			mes "Let's see...";
+			mes "Milk Booboo for me this";
+			mes "time, and I'll randomly";
+			mes "choose one of the following";
+			mes "sets of rewards to give you.";
+			next;
+			mes "1 set of 5 Milk,";
+			mes "1 set of 3 Honey,";
+			mes "1 set of 5 Orange Potions,";
+			mes "1 set of Yellow Potions, or";
+			mes "1 Bundle of Food. Hmmm...";
+			mes "That sounds fair, right?";
+			close;
+		case 3:
+			mes "[Kurupe]";
+			mes "Ahahahah, it's good";
+			mes "to see you! Now, don't";
+			mes "be a stranger, alright?";
+			mes "Burupu could learn a";
+			mes "couple things from you...";
+			close;
 		}
-	}
-	else if(hg_milk == 10)
-	{
+	} else if (hg_milk == 10) {
 		mes "[Kurupe]";
 		mes "For now, go talk";
 		mes "to Burupu and let him";
 		mes "know that he doesn't need";
 		mes "to come into work today~";
 		close;
-	}
-	else if(hg_milk == 11)
-	{
+	} else if (hg_milk == 11) {
 		mes "[Kurupe]";
 		mes "Ah, you spoke to";
 		mes "Burupu already? Good,";
@@ -7789,17 +7058,13 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "Thanks once again~";
 		set hg_milk,12;
 		close;
-	}
-	else if(hg_milk == 12)
-	{
+	} else if (hg_milk == 12) {
 		mes "[Kurupe]";
 		mes "Please go and milk";
 		mes "Booboo the cow as";
 		mes "soon as you can, okay?";
 		close;
-	}
-	else if(hg_milk == 13)
-	{
+	} else if (hg_milk == 13) {
 		mes "[Kurupe]";
 		mes "Ah, you've done a good";
 		mes "job of milking Booboo the";
@@ -7808,8 +7073,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "give you as payment. Hmm...";
 		next;
 		set .@milkreward,rand(1,10);
-		if (.@milkreward < 5)
-		{
+		if (.@milkreward < 5) {
 			mes "[Kurupe]";
 			mes "You know what?";
 			mes "Why don't you have";
@@ -7817,8 +7081,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 			mes "fitting, after all. Besides,";
 			mes "it's really good for you!";
 			mes "Thanks again for your help~";
-			if(checkweight(519,5) != 1)
-			{
+			if (checkweight(519,5) != 1) {
 				next;
 				mes "[Kurupe]";
 				mes "Wait a minute!";
@@ -7829,19 +7092,17 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 519,5;
+			erasequest 12043;
+			getitem 519,5; //Milk
 			close;
-		}
-		else if(.@milkreward > 4 && .@milkreward < 8)
-		{
+		} else if (.@milkreward > 4 && .@milkreward < 8) {
 			mes "[Kurupe]";
 			mes "Ah, I've got it!";
 			mes "You like Orange Potions,";
 			mes "right? Come on, you looove";
 			mes "Orange Potions! Here, you can";
 			mes "have a bunch as my way of saying thanks for milking Booboo the cow~";
-			if(checkweight(502,5) != 1)
-			{
+			if (checkweight(502,5) != 1) {
 				next;
 				mes "[Kurupe]";
 				mes "Wait a minute!";
@@ -7852,11 +7113,10 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 502,5;
+			erasequest 12043;
+			getitem 502,5; //Orange_Potion
 			close;
-		}
-		else if(.@milkreward > 7 && .@milkreward < 10)
-		{
+		} else if (.@milkreward > 7 && .@milkreward < 10) {
 			mes "[Kurupe]";
 			mes "Oooh, I could give you";
 			mes "some Yellow Potions, Yes,";
@@ -7864,8 +7124,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 			mes "take these Yellow Potions";
 			mes "as a token of my gratitude";
 			mes "for milking old Booboo.";
-			if(checkweight(503,5) != 1)
-			{
+			if (checkweight(503,5) != 1) {
 				next;
 				mes "[Kurupe]";
 				mes "Wait a minute!";
@@ -7876,14 +7135,12 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 503,5;
+			erasequest 12043;
+			getitem 503,5; //Yellow_Potion
 			close;
-		}
-		else
-		{
+		} else {
 			set .@milkreward,rand(1,10);
-			if (.@milkreward < 7)
-			{
+			if (.@milkreward < 7) {
 				mes "[Kurupe]";
 				mes "Hey, why don't you";
 				mes "take some fresh Honey?";
@@ -7891,8 +7148,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				mes "it's everything you could";
 				mes "ever want! Thanks for";
 				mes "milking Booboo for me~";
-				if(checkweight(518,3) != 1)
-				{
+				if (checkweight(518,3) != 1) {
 					next;
 					mes "[Kurupe]";
 					mes "Wait a minute!";
@@ -7903,7 +7159,8 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 					close;
 				}
 				set hg_milk,9;
-				getitem 518,3;
+				erasequest 12043;
+				getitem 518,3; //Honey
 				close;
 			}
 			mes "[Kurupe]";
@@ -7913,8 +7170,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 			mes "remember what I packed in";
 			mes "here, but I'm sure it tastes";
 			mes "good, and it's good for you~";
-			if(checkweight(12111,1) != 1)
-			{
+			if (checkweight(12111,1) != 1) {
 				next;
 				mes "[Kurupe]";
 				mes "Wait a minute!";
@@ -7925,12 +7181,11 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 12111,1;
+			erasequest 12043;
+			getitem 12111,1; //Food_Package
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Kurupe]";
 		mes "Aww, nuts...!";
 		mes "I've got so many";
@@ -7941,10 +7196,8 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 	}
 
 OnTouch:
-	if (BaseLevel > 49)
-	{
-		if(!hg_milk)
-		{
+	if (BaseLevel > 49) {
+		if (!hg_milk) {
 			mes "[Kurupe]";
 			mes "Oh no, what am I gonna";
 			mes "do?! I need to deliver the";
@@ -7971,9 +7224,7 @@ OnTouch:
 }
 
 hu_fild06,217,270,3	script	Burupu	896,3,3,{
-
-	if (hg_milk == 3)
-	{
+	if (hg_milk == 3) {
 		mes "[Burupu]";
 		mes "What? Kurupe wants me";
 		mes "to come in to work again?";
@@ -7990,9 +7241,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "my destiny! Forget ranching,^FFFFFF ^000000 I'm gonna wield a frickin' sword!";
 		set hg_milk,4;
 		close;
-	}
-	else if(hg_milk == 4)
-	{
+	} else if (hg_milk == 4) {
 		mes "[Burupu]";
 		mes "Hey, that equipment of";
 		mes "yours looks plenty expensive.";
@@ -8008,8 +7257,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "equipment. Let's see... Why not";
 		mes "give me 1 Rapier with 2 Slots?^FFFFFF ^000000 That's not too much to ask, right?";
 		next;
-		switch( select( "Alright.","Whoa, that's too much!" ) )
-		{
+		switch(select("Alright.:Whoa, that's too much!")) {
 			case 1:
 				mes "[Burupu]";
 				mes "I'm glad you agree~";
@@ -8018,6 +7266,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 				mes "as soon as you can! I can't";
 				mes "wait to start training with it!";
 				set hg_milk,5;
+				changequest 12040,12041;
 				close;
 
 			case 2:
@@ -8028,11 +7277,8 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 				mes "that I really want...";
 				close;
 		}
-	}
-	else if(hg_milk == 5)
-	{
-		if (!countitem(1110))
-		{
+	} else if (hg_milk == 5) {
+		if (!countitem(1110)) {
 			mes "[Burupu]";
 			mes "Hey, weren't you";
 			mes "supposed to bring me";
@@ -8049,8 +7295,9 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "2 Slots and everything!";
 		mes "I'm gonna start training";
 		mes "with it right now!";
-		delitem 1110,1;
+		delitem 1110,1; //Lapier
 		set hg_milk,6;
+		changequest 12041,12042;
 		next;
 		mes "[Burupu]";
 		mes "You know what?";
@@ -8073,9 +7320,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "instructions. Oh, and";
 		mes "thanks again for the Rapier~";
 		close;
-	}
-	else if(hg_milk == 10)
-	{
+	} else if (hg_milk == 10) {
 		mes "[Burupu]";
 		mes "Hmm? You wanna milk";
 		mes "Booboo today? Great,";
@@ -8085,9 +7330,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "completely on my training!";
 		set hg_milk,11;
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Burupu]";
 		mes "I'm gonna become the";
 		mes "best Swordman in the";
@@ -8099,8 +7342,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 	}
 
 OnTouch:
-	if (hg_milk == 2)
-	{
+	if (hg_milk == 2) {
 		mes "[Burupu]";
 		mes "Heeeyah!";
 		mes "Yaaaaaaaah!";
@@ -8116,9 +7358,7 @@ OnTouch:
 		set hg_milk,3;
 		emotion e_an,0;
 		close;
-	}
-	else if(hg_milk == 5)
-	{
+	} else if (hg_milk == 5) {
 		mes "[Burupu]";
 		mes "Heeeyah!";
 		mes "Yaaaaaaaah!";
@@ -8129,9 +7369,7 @@ OnTouch:
 }
 
 hugel,72,101,0	script	Burupu's Instructions	111,{
-
-	if (hg_milk < 6)
-	{
+	if (hg_milk < 6) {
 		mes "^3355FFYou've found a small^000000";
 		mes "^3355FFnotebook on the ground.^000000";
 		close;
@@ -8149,127 +7387,124 @@ hugel,72,101,0	script	Burupu's Instructions	111,{
 	mes "Chapter 2: How to Treat Booboo";
 	mes "Chapter 3: Before You Begin";
 	next;
-	switch( select( "Chapter 1","Chapter 2","Chapter 3" ) )
-	{
+	switch(select("Chapter 1:Chapter 2:Chapter 3")) {
+	case 1:
+		mes "[Chapter 1]";
+		mes "Booboo is a very emotionally";
+		mes "sensitive cow that expresses";
+		mes "herself through the power of";
+		mes "song. You must listen to her";
+		mes "song, determine how she feels,";
+		mes "and then comb her just right.";
+		next;
+		mes "[Chapter 1]";
+		mes "Basically, depending on";
+		mes "how Booboo feels, you must";
+		mes "give her the number of brush";
+		mes "strokes that correspond to";
+		mes "her song. I'll explain more";
+		mes "about that in Chapter 2.";
+		break;
+	case 2:
+		mes "[Chapter 2 Contents]";
+		mes " ";
+		mes "Part 1: How to Respond to";
+		mes "Booboo the Cow's Feelings";
+		mes "Part 2: Booboo's Songs";
+		next;
+		switch(select("Part 1:Part 2")) {
 		case 1:
-			mes "[Chapter 1]";
-			mes "Booboo is a very emotionally";
-			mes "sensitive cow that expresses";
-			mes "herself through the power of";
-			mes "song. You must listen to her";
-			mes "song, determine how she feels,";
-			mes "and then comb her just right.";
-			next;
-			mes "[Chapter 1]";
-			mes "Basically, depending on";
-			mes "how Booboo feels, you must";
-			mes "give her the number of brush";
-			mes "strokes that correspond to";
-			mes "her song. I'll explain more";
-			mes "about that in Chapter 2.";
-			close;
-	
+			mes "[Chapter 2, Part 1]";
+			mes "Booboo the Cow usually";
+			mes "expresses five different";
+			mes "feelings through her songs:";
+			mes "these are joy, sadness, anger,";
+			mes "love, and neutral contentment.";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "^800080She is so happy^000000!";
+			mes "When Booboo the Cow";
+			mes "feels joy, then you go";
+			mes "ahead and brush her";
+			mes "hair 3 times before";
+			mes "you can milk her.";
+			mes "^800080 3 times^000000.";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "^800080She is as usual^000000.";
+			mes "When she feels so-so, you need to";
+			mes "comb her hair ^800080 5 times^000000.";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "If Booboo the cow feels";
+			mes "sad, then you need to make";
+			mes "her feel more loved. How";
+			mes "do you do this? Just brush";
+			mes "her hair at least 10 times.";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "Now, remember that when";
+			mes "Booboo the cow is angry,";
+			mes "you shouldn't touch her";
+			mes "at all. Just say, ''No!'' to";
+			mes "brushing her hair, okay?";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "If you happen to see";
+			mes "Booboo the cow in love,";
+			mes "then just brush her hair";
+			mes "once. Just look for the";
+			mes "hearts, and you'll know";
+			mes "that she's in love, okay?";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "Whenever Booboo the";
+			mes "cow is just feeling";
+			mes "neutral contentment,";
+			mes "then just brush her";
+			mes "5 times. That's all~";
+			break;
 		case 2:
-			mes "[Chapter 2 Contents]";
-			mes " ";
-			mes "Part 1: How to Respond to";
-			mes "Booboo the Cow's Feelings";
-			mes "Part 2: Booboo's Songs";
-			next;
-			switch( select( "Part 1","Part 2" ) )
-			{
-				case 1:
-					mes "[Chapter 2, Part 1]";
-					mes "Booboo the Cow usually";
-					mes "expresses five different";
-					mes "feelings through her songs:";
-					mes "these are joy, sadness, anger,";
-					mes "love, and neutral contentment.";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "^800080She is so happy^000000!";
-					mes "When Booboo the Cow";
-					mes "feels joy, then you go";
-					mes "ahead and brush her";
-					mes "hair 3 times before";
-					mes "you can milk her.";
-					mes "^800080 3 times^000000.";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "^800080She is as usual^000000.";
-					mes "When she feels so-so, you need to";
-					mes "comb her hair ^800080 5 times^000000.";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "If Booboo the cow feels";
-					mes "sad, then you need to make";
-					mes "her feel more loved. How";
-					mes "do you do this? Just brush";
-					mes "her hair at least 10 times.";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "Now, remember that when";
-					mes "Booboo the cow is angry,";
-					mes "you shouldn't touch her";
-					mes "at all. Just say, ''No!'' to";
-					mes "brushing her hair, okay?";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "If you happen to see";
-					mes "Booboo the cow in love,";
-					mes "then just brush her hair";
-					mes "once. Just look for the";
-					mes "hearts, and you'll know";
-					mes "that she's in love, okay?";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "Whenever Booboo the";
-					mes "cow is just feeling";
-					mes "neutral contentment,";
-					mes "then just brush her";
-					mes "5 times. That's all~";
-					close;
-				
-				case 2:
-					mes "[Chapter 2, Part 2]";
-					mes "Booboo the cow will";
-					mes "always sing this song.";
-					mes "Keep these sounds in";
-					mes "mind when she sings them...";
-					next;
-					mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
-					mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
-					mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
-					mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
-					mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
-					mes "^0000ffBoo! B! Boo~^000000";
-					next;
-					mes "[Chapter 2, Part 2]";
-					mes "When you try to milk";
-					mes "Booboo, she will sing this";
-					mes "song with a slight difference.";
-					mes "Look for the difference in";
-					mes "Booboo's song, and then";
-					mes "hum the correvt word to her.";
-					close;
-			}
-		
-		case 3:
-			mes "[Chapter 3]";
-			mes "If you want to milk";
-			mes "Booboo the cow, you";
-			mes "must first get permission";
-			mes "from Kurupe. You will also";
-			mes "need 3 Concentration Potions";
-			mes "to insert into Booboo's comb.";
-			close;
+			mes "[Chapter 2, Part 2]";
+			mes "Booboo the cow will";
+			mes "always sing this song.";
+			mes "Keep these sounds in";
+			mes "mind when she sings them...";
+			next;
+			mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
+			mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
+			mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
+			mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
+			mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
+			mes "^0000ffBoo! B! Boo~^000000";
+			next;
+			mes "[Chapter 2, Part 2]";
+			mes "When you try to milk";
+			mes "Booboo, she will sing this";
+			mes "song with a slight difference.";
+			mes "Look for the difference in";
+			mes "Booboo's song, and then";
+			mes "hum the correct word to her.";
+			break;
+		}
+		break;
+	case 3:
+		mes "[Chapter 3]";
+		mes "If you want to milk";
+		mes "Booboo the cow, you";
+		mes "must first get permission";
+		mes "from Kurupe. You will also";
+		mes "need 3 Concentration Potions";
+		mes "to insert into Booboo's comb.";
+		break;
 	}
+	close2;
+	if (checkquest(12042) > -1) erasequest 12042;
+	end;
 }
 
 hugel,68,99,3	script	Booboo the Cow	889,{
-
-	if (hg_milk == 7 || hg_milk == 12)
-	{
+	if (hg_milk == 7 || hg_milk == 12) {
 		mes "[Booboo]";
 		mes "Boop boop boo~";
 		mes "Booboo Boop boo!";
@@ -8279,33 +7514,31 @@ hugel,68,99,3	script	Booboo the Cow	889,{
 		mes "has something that";
 		mes "she wants to tell you.^000000";
 		next;
-		switch( select( "Attempt to Milk Booboo","It's not the right time!" ) )
-		{
-			case 1:
-				if(countitem(645) > 2)
-				{
-					set @cowsong1,rand(1,5);
-					if (@cowsong1 == 1) callfunc "Func_MilkCow","cow_01.wav",3;
-					else if(@cowsong1 == 2) callfunc "Func_MilkCow","cow_02.wav",5;
-					else if(@cowsong1 == 3) callfunc "Func_MilkCow","cow_03.wav",10;
-					else if(@cowsong1 == 4) callfunc "Func_MilkCow","cow_04.wav",0;
-					else if(@cowsong1 == 5) callfunc "Func_MilkCow","cow_05.wav",1;
-					end;
+		switch(select("Attempt to Milk Booboo:It's not the right time!")) {
+		case 1:
+			if (countitem(645) > 2) {
+				switch(rand(1,5)) {
+					case 1: callsub L_MilkCow,"cow_01.wav",3; break;
+					case 2: callsub L_MilkCow,"cow_02.wav",5; break;
+					case 3: callsub L_MilkCow,"cow_03.wav",10; break;
+					case 4: callsub L_MilkCow,"cow_04.wav",0; break;
+					case 5: callsub L_MilkCow,"cow_05.wav",1; break;
 				}
-				mes "^3355FFTo use this comb to";
-				mes "brush Booboo the cow,";
-				mes "you will need to insert";
-				mes "3 Concentration Potions.";
-				mes "You can only brush Booboo";
-				mes "with this luxurious magic comb.^000000";
-				close;
-				
-			case 2:
-				mes "^3355FFMaybe you should learn more";
-				mes "about Booboo the cow, and";
-				mes "get more information before";
-				mes "you can attempt to milk her.^000000";
-				close;
+				end;
+			}
+			mes "^3355FFTo use this comb to";
+			mes "brush Booboo the cow,";
+			mes "you will need to insert";
+			mes "3 Concentration Potions.";
+			mes "You can only brush Booboo";
+			mes "with this luxurious magic comb.^000000";
+			close;
+		case 2:
+			mes "^3355FFMaybe you should learn more";
+			mes "about Booboo the cow, and";
+			mes "get more information before";
+			mes "you can attempt to milk her.^000000";
+			close;
 		}
 	}
 	mes "[Booboo]";
@@ -8313,11 +7546,8 @@ hugel,68,99,3	script	Booboo the Cow	889,{
 	mes "Boobooboo Booo~~~";
 	mes "Booboo Boop~";
 	close;
-}
-					
-function	script	Func_MilkCow	{
-
 
+L_MilkCow:
 	mes "^3355FFThis giant magic comb was";
 	mes "specially ordered from Geffen's";
 	mes "Magic Academy. It is designed";
@@ -8330,7 +7560,7 @@ function	script	Func_MilkCow	{
 	mes "into the comb, it begins";
 	mes "to chime, and Booboo the";
 	mes "cow beings to express her^FFFFFF ^3355FF feelings in the center of Hugel.^000000";
-	delitem 645,3;
+	delitem 645,3; //Center_Potion
 	soundeffect ""+getarg(0)+"",0;
 	next;
 	soundeffect ""+getarg(0)+"",0;
@@ -8340,9 +7570,8 @@ function	script	Func_MilkCow	{
 	mes "you need to brush her a";
 	mes "certain number of times.^000000";
 	next;
-	input @cowbrush;
-	if (@cowbrush != getarg(1))
-	{
+	input .@cowbrush;
+	if (.@cowbrush != getarg(1)) {
 		soundeffect "taming_fail.wav",0;
 		mes "^3355FFAwwww...";
 		mes "Booboo the cow looks";
@@ -8358,61 +7587,62 @@ function	script	Func_MilkCow	{
 	mes "and is singing a serenade.^000000";
 	next;
 	soundeffect "cow_06.wav",0;
-	set @cowsong2,rand(1,6);
 	mes "[Mrs. Booboo]";
-	if (@cowsong2 == 1)
-	{
+	switch(rand(1,6)) {
+	case 1:
+		set .@cowsong$,"Brrbrr";
 		mes "^ff0000Brr~ Brrboo~ Boobooboo~^000000";
 		mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
 		mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! B! Boo~~~^000000";
-	}
-	else if (@cowsong2 == 2)
-	{
+		break;
+	case 2:
+		set .@cowsong$,"Brrrrrr";
 		mes "^ff0000Brr~ Brrboo~ Boobooboo~^000000";
 		mes "^0000ffRrrururu~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
 		mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! B! Boo~~~^000000";
-	}
-	else if (@cowsong2 == 3)
-	{
+		break;
+	case 3:
+		set .@cowsong$,"Rrrrboo";
 		mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
 		mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rurub~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
 		mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! B! Boo~^000000";
-	}
-	else if (@cowsong2 == 4)
-	{
+		break;
+	case 4:
+		set .@cowsong$,"Boobooru";
 		mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
 		mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Bbrrrr~^000000";
 		mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! B! Boo~^000000";
-	}
-	else if (@cowsong2 == 5)
-	{
+		break;
+	case 5:
+		set .@cowsong$,"Boobooboo";
 		mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
 		mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
 		mes "^ff0000Bbb~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! B! Boo~^000000";
-	}
-	else if (@cowsong2 == 6)
-	{
+		break;
+	case 6:
+		set .@cowsong$,"B";
 		mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
 		mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
 		mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! Boo! Boo~^000000";
+		break;
 	}
 	next;
 	mes "^3355FFHurry, respond to Booboo's song! Look for the word that is slightly";
@@ -8420,15 +7650,8 @@ function	script	Func_MilkCow	{
 	mes "song in Burupu's notes, and then tell her the correct world without";
 	mes "the tilde character (''~'').^000000";
 	next;
-	if(@cowsong2 == 1) set @cowsong$,"Brrbrr";
-	else if(@cowsong2 == 2) set @cowsong$,"Brrrrrr";
-	else if(@cowsong2 == 3) set @cowsong$,"Rrrrboo";
-	else if(@cowsong2 == 4) set @cowsong$,"Boobooru";
-	else if(@cowsong2 == 5) set @cowsong$,"Boobooboo";
-	else if(@cowsong2 == 6) set @cowsong$,"B";
-	input @cowanswer$;
-	if (@cowanswer$ == @cowsong$)
-	{
+	input .@cowanswer$;
+	if (.@cowanswer$ == .@cowsong$) {
 		soundeffect "tming_success.wav",0;
 		mes "^3355FFSuccess!";
 		mes "Booboo the cow";
@@ -8436,8 +7659,9 @@ function	script	Func_MilkCow	{
 		mes "you were able to milk";
 		mes "her. Now, you should";
 		mes "report to Kurupe.^000000";
-		if(hg_milk == 12) set hg_milk,13;
+		if (hg_milk == 12) set hg_milk,13;
 		else set hg_milk,8;
+		setquest 12043;
 		close;
 	}
 	soundeffect "taming_fail.wav",0;
@@ -8449,19 +7673,17 @@ function	script	Func_MilkCow	{
 	close;
 }
 
-// Odin Temple Excavation Quest
+// Odin Temple Excavation Quest :: hg_tem
 //============================================================
 hugel,91,152,1	script	Sign	837,{
-
 	mes "**Recruitment Notice**";
 	mes " ";
-	if(hg_odin < 60)
-	{
+	if (hg_odin < 60) {
 		mes "We are now hiring recruits";
 		mes "for the Odin Shrine Expedition.";
 		mes " ";
 		mes "- Shrine Expedition Dept.";
-		if(!hg_odin) set hg_odin,1;
+		if (!hg_odin) set hg_odin,1;
 		close;
 	}
 	mes "Join our magician";
@@ -8473,66 +7695,57 @@ hugel,91,152,1	script	Sign	837,{
 }
 
 hu_in01,19,161,0	script	Alex	803,{
-
-	if(!hg_odin)
-	{
+	if (!hg_odin) {
 		mes "[Alex]";
 		mes "Whatever you're";
 		mes "trying to sell me,";
 		mes "I'm not interested!";
 		mes "Now get out of here!";
 		close;
-	}
-	else if(hg_odin == 1)
-	{
+	} else if (hg_odin == 1) {
 		cutin "hu_alex01.bmp",2;
 		mes "[Alex]";
 		mes "Huh...?";
 		mes "What do you want?";
 		next;
-		switch( select( "Excuse me...","I saw the recruitment notice and..." ) )
-		{
-			case 1:
+		switch(select("Excuse me...:I saw the recruitment notice and...")) {
+		case 1:
+			mes "[Alex]";
+			mes "Whatever you're";
+			mes "trying to sell me,";
+			mes "I'm not interested!";
+			mes "Now get out of here!";
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			mes "[Alex]";
+			mes "Oh, so you saw the";
+			mes "recruitment notice for the";
+			mes "Odin Shrine Expedition, eh?";
+			if (BaseLevel > 59) {
+				mes "Hmmm... Alright, you look";
+				mes "like you're strong enough.";
+				mes "Yeah, I think you qualify.";
+				next;
+			} else {
+				cutin "hu_alex02.bmp",2;
+				mes "Well, I dunno. I think that";
+				mes "kind of expedition would";
+				mes "eat you alive. No offense...";
+				next;
 				mes "[Alex]";
-				mes "Whatever you're";
-				mes "trying to sell me,";
-				mes "I'm not interested!";
-				mes "Now get out of here!";
+				mes "Look, I'll reconsider";
+				mes "whether you qualify after";
+				mes "you get train a little more,";
+				mes "develop your skills, you know,";
+				mes "get stronger. For now, though,";
+				mes "I don't think we can use you.";
 				close2;
 				cutin "",255;
 				end;
-				
-			case 2:
-				mes "[Alex]";
-				mes "Oh, so you saw the";
-				mes "recruitment notice for the";
-				mes "Odin Shrine Expedition, eh?";
-				if(BaseLevel > 59)
-				{
-					mes "Hmmm... Alright, you look";
-					mes "like you're strong enough.";
-					mes "Yeah, I think you qualify.";
-					next;
-				}
-				else
-				{
-					cutin "hu_alex02.bmp",2;
-					mes "Well, I dunno. I think that";
-					mes "kind of expedition would";
-					mes "eat you alive. No offense...";
-					next;
-					mes "[Alex]";
-					mes "Look, I'll reconsider";
-					mes "whether you qualify after";
-					mes "you get train a little more,";
-					mes "develop your skills, you know,";
-					mes "get stronger. For now, though,";
-					mes "I don't think we can use you.";
-					close2;
-					cutin "",255;
-					end;
-				}
-				break;
+			}
+			break;
 		}
 		cutin "hu_alex03.bmp",2;
 		mes "[Alex]";
@@ -8557,12 +7770,11 @@ hu_in01,19,161,0	script	Alex	803,{
 		mes "Please talk to the Boatman";
 		mes "to travel to the shrine, okay?";
 		set hg_odin,2;
+		setquest 11000;
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_odin == 2)
-	{
+	} else if (hg_odin == 2) {
 		cutin "hu_alex03.bmp",2;
 		mes "[Alex]";
 		mes "You really oughtta";
@@ -8573,9 +7785,7 @@ hu_in01,19,161,0	script	Alex	803,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_odin == 3)
-	{
+	} else if (hg_odin == 3) {
 		cutin "hu_alex01.bmp",2;
 		mes "[Alex]";
 		mes "Oh, so you've gone";
@@ -8583,73 +7793,69 @@ hu_in01,19,161,0	script	Alex	803,{
 		mes "already. So will you help";
 		mes "us in our expedition?";
 		next;
-		switch( select( "Who are the people in the next room?","Well...","Yes, I do." ) )
-		{
-			case 1:
-				cutin "hu_alex02.bmp",2;
-				mes "[Alex]";
-				mes "Oh... Them.";
-				mes "They're officially my";
-				mes "co-workers, but quite";
-				mes "frankly, they were forced";
-				mes "upon me by the Rune-Midgarts";
-				mes "Kingdom. It can't be helped...";
-				next;
-				mes "[Alex]";
-				mes "Anyway, I have to accept";
-				mes "them to help international";
-				mes "relations or something silly";
-				mes "like that. They say they're here^FFFFFF ^000000 to research religious relics,";
-				mes "but I just don't trust them.";
-				next;
-				cutin "hu_alex04.bmp",2;
-				mes "[Alex]";
-				mes "In fact, I think it's";
-				mes "obvious that they're here";
-				mes "for something else, though";
-				mes "I'm not sure what it may be.";
-				mes "And that gray haired lady...";
-				mes "She totally creeps me out!";
-				close2;
-				cutin "",255;
-				end;
-				
-			case 2:
-				mes "[Alex]";
-				mes "Yeah, well, I know";
-				mes "it might be a tough";
-				mes "decision to make. Well,";
-				mes "take your time. I understand";
-				mes "that you have to weigh the";
-				mes "risks and everything.";
-				close2;
-				cutin "",255;
-				end;
-
-			case 3:
-				mes "[Alex]";
-				mes "Great! In that case, your";
-				mes "first assignment is to bring";
-				mes "me ^3355FF5 Runes of the Darkness^000000";
-				mes "from the shrine. Don't worry,";
-				mes "I'll make sure that you're";
-				mes "rewarded for your efforts.";
-				set hg_odin,4;
-				next;
-				mes "[Alex]";
-				mes "This is your chance";
-				mes "to show me that your";
-				mes "dependability and sense";
-				mes "of responsibility. Then,";
-				mes "we can move on to the";
-				mes "more important stuff.";
-				close2;
-				cutin "",255;
-				end;
+		switch(select("Who are the people in the next room?:Well...:Yes, I do.")) {
+		case 1:
+			cutin "hu_alex02.bmp",2;
+			mes "[Alex]";
+			mes "Oh... Them.";
+			mes "They're officially my";
+			mes "co-workers, but quite";
+			mes "frankly, they were forced";
+			mes "upon me by the Rune-Midgarts";
+			mes "Kingdom. It can't be helped...";
+			next;
+			mes "[Alex]";
+			mes "Anyway, I have to accept";
+			mes "them to help international";
+			mes "relations or something silly";
+			mes "like that. They say they're here^FFFFFF ^000000 to research religious relics,";
+			mes "but I just don't trust them.";
+			next;
+			cutin "hu_alex04.bmp",2;
+			mes "[Alex]";
+			mes "In fact, I think it's";
+			mes "obvious that they're here";
+			mes "for something else, though";
+			mes "I'm not sure what it may be.";
+			mes "And that gray haired lady...";
+			mes "She totally creeps me out!";
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			mes "[Alex]";
+			mes "Yeah, well, I know";
+			mes "it might be a tough";
+			mes "decision to make. Well,";
+			mes "take your time. I understand";
+			mes "that you have to weigh the";
+			mes "risks and everything.";
+			close2;
+			cutin "",255;
+			end;
+		case 3:
+			mes "[Alex]";
+			mes "Great! In that case, your";
+			mes "first assignment is to bring";
+			mes "me ^3355FF5 Runes of the Darkness^000000";
+			mes "from the shrine. Don't worry,";
+			mes "I'll make sure that you're";
+			mes "rewarded for your efforts.";
+			set hg_odin,4;
+			changequest 11000,11001;
+			next;
+			mes "[Alex]";
+			mes "This is your chance";
+			mes "to show me that your";
+			mes "dependability and sense";
+			mes "of responsibility. Then,";
+			mes "we can move on to the";
+			mes "more important stuff.";
+			close2;
+			cutin "",255;
+			end;
 		}
-	}
-	else if(hg_odin == 4)
-	{
+	} else if (hg_odin == 4) {
 		cutin "hu_alex02.bmp",2;
 		mes "[Alex]";
 		mes "What are you still";
@@ -8657,35 +7863,31 @@ hu_in01,19,161,0	script	Alex	803,{
 		mes "you be headed to the";
 		mes "shrine already?";
 		next;
-		switch( select( "What was I supposed to gather?","I'm leaving, I'm leaving!" ) )
-		{
-			case 1:
-				cutin "hu_alex03.bmp",2;
-				mes "[Alex]";
-				mes "You've forgotten";
-				mes "already? I asked you";
-				mes "to bring me ^3355FF5 Runes";
-				mes "of the Darkness^000000. Okay,";
-				mes "now hurry up and get to it.";
-				close2;
-				cutin "",255;
-				end;
-
-			case 2:
-				mes "[Alex]";
-				mes "That's fine...";
-				mes "Just keep in mind that";
-				mes "we're running behind";
-				mes "schedule. If only that";
-				mes "grey haired crone wasn't";
-				mes "here... We'd be done by now!";
-				close2;
-				cutin "",255;
-				end;
+		switch(select("What was I supposed to gather?:I'm leaving, I'm leaving!")) {
+		case 1:
+			cutin "hu_alex03.bmp",2;
+			mes "[Alex]";
+			mes "You've forgotten";
+			mes "already? I asked you";
+			mes "to bring me ^3355FF5 Runes";
+			mes "of the Darkness^000000. Okay,";
+			mes "now hurry up and get to it.";
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			mes "[Alex]";
+			mes "That's fine...";
+			mes "Just keep in mind that";
+			mes "we're running behind";
+			mes "schedule. If only that";
+			mes "grey haired crone wasn't";
+			mes "here... We'd be done by now!";
+			close2;
+			cutin "",255;
+			end;
 		}
-	}
-	else if(hg_odin == 5)
-	{
+	} else if (hg_odin == 5) {
 		cutin "hu_alex01.bmp",2;
 		mes "[Alex]";
 		mes "Well, it's about";
@@ -8693,128 +7895,124 @@ hu_in01,19,161,0	script	Alex	803,{
 		mes "So did you bring me";
 		mes "^3355FF5 Runes of the Darkness^000000?";
 		next;
-		switch( select( "Er, not yet...:There you go!" ) )
-		{
-			case 1:
-				cutin "hu_alex02.bmp",2;
+		switch(select("Er, not yet...:There you go!")) {
+		case 1:
+			cutin "hu_alex02.bmp",2;
+			mes "[Alex]";
+			mes "Wh-what?!";
+			mes "You came here just to";
+			mes "tell me that? Come back";
+			mes "when you're done and";
+			mes "don't waste my time!";
+			next;
+			emotion e_ho,0,"Julian";
+			mes "[Julian]";
+			mes "Hey, you know what,";
+			mes "Alex? You can't push";
+			mes "people around like that.";
+			mes "Besides, this adventurer";
+			mes "isn't a pushover, you know?";
+			next;
+			cutin "hu_alex03.bmp",2;
+			emotion e_an;
+			mes "[Alex]";
+			mes "What was that...?";
+			mes "Are you trying to";
+			mes "make me mad, Julian?";
+			next;
+			cutin "hu_alex02.bmp",2;
+			mes "[Julian]";
+			mes "All I'm saying is that";
+			mes "most adventurers know that";
+			mes "you can't pay them what they're";
+			mes "worth. That's why so many of";
+			mes "them are going in and out";
+			mes "of the other room, you know.";
+			next;
+			cutin "hu_alex04.bmp",2;
+			mes "[Alex]";
+			mes "That... grey... haired...!";
+			mes "N-no... Calm down, Alex...";
+			mes "Lose your head, you lose";
+			mes "everything... D-don't stoop";
+			mes "down to her level.";
+			next;
+			cutin "hu_alex01.bmp",2;
+			mes "[Alex]";
+			mes "Alright, I'm not in any";
+			mes "position to make demands";
+			mes "of you... But I would really";
+			mes "appreciate it if you would";
+			mes "bring me 5 Runes of the";
+			mes "Darkness as soon as possible.";
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			if (countitem(7511) > 4) {
+				delitem 7511,5; //Rune_Of_Darkness
+				set hg_odin,6; //Old_Blue_Box
+				changequest 11000,11002;
+				getitem 603,1;
 				mes "[Alex]";
-				mes "Wh-what?!";
-				mes "You came here just to";
-				mes "tell me that? Come back";
-				mes "when you're done and";
-				mes "don't waste my time!";
+				mes "Oh! Thank you";
+				mes "so much, I'm sure";
+				mes "these Runes will help";
+				mes "us in our research. I know";
+				mes "this isn't much, but please";
+				mes "accept this Old Blue Box.";
 				next;
-				emotion e_ho,0,"Julian";
 				mes "[Julian]";
-				mes "Hey, you know what,";
-				mes "Alex? You can't push";
-				mes "people around like that.";
-				mes "Besides, this adventurer";
-				mes "isn't a pushover, you know?";
+				mes "Wait...";
+				mes "Research?";
+				mes "Since when did";
+				mes "you do research?";
 				next;
 				cutin "hu_alex03.bmp",2;
-				emotion e_an;
 				mes "[Alex]";
-				mes "What was that...?";
-				mes "Are you trying to";
-				mes "make me mad, Julian?";
+				mes "Gosh, Julian,";
+				mes "will you just";
+				mes "shut up for a bit?";
 				next;
-				cutin "hu_alex02.bmp",2;
 				mes "[Julian]";
-				mes "All I'm saying is that";
-				mes "most adventurers know that";
-				mes "you can't pay them what they're";
-				mes "worth. That's why so many of";
-				mes "them are going in and out";
-				mes "of the other room, you know.";
+				mes "Why? I'm the one who";
+				mes "does all the grunt work";
+				mes "and actual research.";
+				mes "You think you're so";
+				mes "big just ''supervising...''";
 				next;
 				cutin "hu_alex04.bmp",2;
 				mes "[Alex]";
-				mes "That... grey... haired...!";
-				mes "N-no... Calm down, Alex...";
-				mes "Lose your head, you lose";
-				mes "everything... D-don't stoop";
-				mes "down to her level.";
+				mes "J-Julian!";
+				next;
+				mes "[Julian]";
+				mes "Right, right, we've";
+				mes "got a visitor. Yeah,";
+				mes "okay, sorry about that.";
 				next;
-				cutin "hu_alex01.bmp",2;
-				mes "[Alex]";
-				mes "Alright, I'm not in any";
-				mes "position to make demands";
-				mes "of you... But I would really";
-				mes "appreciate it if you would";
-				mes "bring me 5 Runes of the";
-				mes "Darkness as soon as possible.";
-				close2;
-				cutin "",255;
-				end;
-
-			case 2:
-				if(countitem(7511) > 4)
-				{
-					delitem 7511,5;
-					set hg_odin,6;
-					getitem 603,1;
-					mes "[Alex]";
-					mes "Oh! Thank you";
-					mes "so much, I'm sure";
-					mes "these Runes will help";
-					mes "us in our research. I know";
-					mes "this isn't much, but please";
-					mes "accept this Old Blue Box.";
-					next;
-					mes "[Julian]";
-					mes "Wait...";
-					mes "Research?";
-					mes "Since when did";
-					mes "you do research?";
-					next;
-					cutin "hu_alex03.bmp",2;
-					mes "[Alex]";
-					mes "Gosh, Julian,";
-					mes "will you just";
-					mes "shut up for a bit?";
-					next;
-					mes "[Julian]";
-					mes "Why? I'm the one who";
-					mes "does all the grunt work";
-					mes "and actual research.";
-					mes "You think you're so";
-					mes "big just ''supervising...''";
-					next;
-					cutin "hu_alex04.bmp",2;
-					mes "[Alex]";
-					mes "J-Julian!";
-					next;
-					mes "[Julian]";
-					mes "Right, right, we've";
-					mes "got a visitor. Yeah,";
-					mes "okay, sorry about that.";
-					next;
-					cutin "hu_alex02.bmp",2;
-					mes "[Alex]";
-					mes "I'm sorry about all";
-					mes "this. If you don't mind,";
-					mes "we'll continue our research";
-					mes "and hopefully finish our";
-					mes "project soon. Thanks once";
-					mes "again for all of your help.";
-					close2;
-					cutin "",255;
-					end;
-				}
 				cutin "hu_alex02.bmp",2;
 				mes "[Alex]";
-				mes "Hm? Oh, this isn't";
-				mes "enough Runes of the";
-				mes "Darkness. I asked you";
-				mes "to bring me 5 of them...";
+				mes "I'm sorry about all";
+				mes "this. If you don't mind,";
+				mes "we'll continue our research";
+				mes "and hopefully finish our";
+				mes "project soon. Thanks once";
+				mes "again for all of your help.";
 				close2;
 				cutin "",255;
 				end;
+			}
+			cutin "hu_alex02.bmp",2;
+			mes "[Alex]";
+			mes "Hm? Oh, this isn't";
+			mes "enough Runes of the";
+			mes "Darkness. I asked you";
+			mes "to bring me 5 of them...";
+			close2;
+			cutin "",255;
+			end;
 		}
-	}
-	else if(hg_odin == 6)
-	{
+	} else if (hg_odin == 6) {
 		cutin "hu_alex02.bmp",2;
 		mes "[Alex]";
 		mes "...Darn it! I think I might";
@@ -8836,9 +8034,7 @@ hu_in01,19,161,0	script	Alex	803,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_odin > 11 && hg_odin < 17)
-	{
+	} else if (hg_odin > 11 && hg_odin < 17) {
 		cutin "hu_alex03.bmp",2;
 		mes "[Alex]";
 		mes "Excuse me?";
@@ -8881,9 +8077,7 @@ hu_in01,19,161,0	script	Alex	803,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else
-	{
+	} else {
 		cutin "hu_alex02.bmp",2;
 		mes "[Alex]";
 		mes "Hm? Did you need";
@@ -8899,9 +8093,7 @@ hu_in01,19,161,0	script	Alex	803,{
 }
 
 hu_in01,14,11,4	script	Laura	70,{
-
-	if(!hg_odin)
-	{
+	if (!hg_odin) {
 		cutin "hu_laura02.bmp",2;
 		mes "[Laura]";
 		mes "Hm? What are you doing";
@@ -8911,16 +8103,13 @@ hu_in01,14,11,4	script	Laura	70,{
 		cutin "",255;
 		warp "hu_in01",15,76;
 		end;
-	}
-	else if(hg_odin == 1)
-	{
+	} else if (hg_odin == 1) {
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
 		mes "Hm? Oh, you must be";
 		mes "here in response to our";
 		mes "recruitment notice, yes?";
-		if(BaseLevel < 60)
-		{
+		if (BaseLevel < 60) {
 			cutin "hu_laura01.bmp",2;
 			mes "Let me take a look at you...";
 			mes "Oh, you're all skin and bone!";
@@ -8975,71 +8164,63 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "when the gods showed";
 		mes "themselves to humans!";
 		next;
-		switch( select( "Nah, forget it.","Yes, I'll do it!" ) )
-		{
-			case 1:
+		switch(select("Nah, forget it.:Yes, I'll do it!")) {
+		case 1:
+			cutin "hu_laura01.bmp",2;
+			mes "[Laura]";
+			mes "W-Wait! Think about";
+			mes "the importance of learning";
+			mes "about the age of gods! If you";
+			mes "don't help us, then who will?";
+			mes "We need to work together to";
+			mes "build a better future, right?";
+			next;
+			if(select("But you can't pay me.:Alright, I'll do it.") == 1) {
+				cutin "hu_laura04.bmp",2;
+				mes "[Laura]";
+				mes "You're right.";
+				mes "It's like I said";
+				mes "before. I don't have";
+				mes "anything to pay you.";
+				mes "...............................";
+				next;
 				cutin "hu_laura01.bmp",2;
 				mes "[Laura]";
-				mes "W-Wait! Think about";
-				mes "the importance of learning";
-				mes "about the age of gods! If you";
-				mes "don't help us, then who will?";
-				mes "We need to work together to";
-				mes "build a better future, right?";
+				mes "Curses! If this project had";
+				mes "more funding, we'd have more";
+				mes "than a cheesy recruitment ad,";
+				mes "and some professional staff";
+				mes "like those rich Schwaltzvalt";
+				mes "Republic boys in the next room!";
 				next;
-				switch( select( "But you can't pay me.","Alright, I'll do it." ) )
-				{
-					case 1:
-						cutin "hu_laura04.bmp",2;
-						mes "[Laura]";
-						mes "You're right.";
-						mes "It's like I said";
-						mes "before. I don't have";
-						mes "anything to pay you.";
-						mes "...............................";
-						next;
-						cutin "hu_laura01.bmp",2;
-						mes "[Laura]";
-						mes "Curses! If this project had";
-						mes "more funding, we'd have more";
-						mes "than a cheesy recruitment ad,";
-						mes "and some professional staff";
-						mes "like those rich Schwaltzvalt";
-						mes "Republic boys in the next room!";
-						next;
-						cutin "hu_laura02.bmp",2;
-						mes "[Laura]";
-						mes "Fine, it's your choice";
-						mes "whether you want to work";
-						mes "for us. I'm just disappointed";
-						mes "that someone like you won't";
-						mes "help us. I mean, don't you";
-						mes "have any patriotism at all?";
-						close2;
-						cutin "hu_laura02.bmp",255;
-						end;
-						
-					case 2:
-						break;
-				}
-				// Allow fall-through into the next case statment as this is a minor bug in aegis.
-				//break;
-			
-			case 2:
+				cutin "hu_laura02.bmp",2;
 				mes "[Laura]";
-				mes "Perfect! Now, you first";
-				mes "you need to go to the shrine";
-				mes "and survey the area for your";
-				mes "own benefit. Talk to the Boatman,^FFFFFF ^000000 and he'll take you there, okay?";
-				mes "Hurry up and come back soon!";
-				set hg_odin,12;
+				mes "Fine, it's your choice";
+				mes "whether you want to work";
+				mes "for us. I'm just disappointed";
+				mes "that someone like you won't";
+				mes "help us. I mean, don't you";
+				mes "have any patriotism at all?";
 				close2;
-				cutin "hu_laura04.bmp",255;
+				cutin "hu_laura02.bmp",255;
 				end;
+			}
+			// Allow fall-through into the next case statment as this is a minor bug in aegis.
+			//break;
+		case 2:
+			mes "[Laura]";
+			mes "Perfect! Now, you first";
+			mes "you need to go to the shrine";
+			mes "and survey the area for your";
+			mes "own benefit. Talk to the Boatman,^FFFFFF ^000000 and he'll take you there, okay?";
+			mes "Hurry up and come back soon!";
+			set hg_odin,12;
+			setquest 11003;
+			close2;
+			cutin "hu_laura04.bmp",255;
+			end;
 		}
-	}
-	else if(hg_odin > 1 && hg_odin < 6)
-	{
+	} else if (hg_odin > 1 && hg_odin < 6) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but";
 		mes "what are you guys";
@@ -9054,61 +8235,56 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "in the Odin Shrine on behalf";
 		mes "of the Rune-Midgarts Kingdom.";
 		next;
-		switch( select( "About Alex and Julian","Alright, now I understand." ) )
-		{
-			case 1:
-				cutin "hu_laura01.bmp",2;
-				mes "["+strcharinfo(0)+"]";
-				mes "These people in the other";
-				mes "room, Alex and Julian, are";
-				mes "they also working in this same";
-				mes "expedition in the Odin Shrine?";
-				next;
-				cutin "hu_laura02.bmp",2;
-				mes "[Laura]";
-				mes "...Oh. You must be working";
-				mes "for those rich Schwaltvalt";
-				mes "Republic kids. I can't work";
-				mes "with that impudent girl, at";
-				mes "all, so we're actually working";
-				mes "in separate offices.";
-				next;
-				cutin "hu_laura04.bmp",2;
-				mes "[Laura]";
-				mes "Sorry, let me introduce";
-				mes "myself. I'm Laura Laurence,";
-				mes "the leader of the Odin Shrine";
-				mes "expedition for the Rune Midgarts^FFFFFF ^000000 Kingdom. Ashe Milton is my";
-				mes "assistant for this excavation.";
-				next;
-				emotion e_heh,0,"Ashe";
-				mes "[Ashe]";
-				mes "Hello!";
-				next;
-				mes "[Laura]";
-				mes "If you'd rather do";
-				mes "a service for your";
-				mes "country and quit working";
-				mes "for those wealthy snobs, then";
-				mes "come back here and let me know.";
-				close2;
-				cutin "hu_laura04.bmp",255;
-				end;
-
-			case 2:
-				cutin "hu_laura01.bmp",2;
-				mes "[Laura]";
-				mes "......";
-				mes ".........";
-				mes "............";
-				close2;
-				cutin "hu_laura01.bmp",255;
-				end;
-
+		switch(select("About Alex and Julian:Alright, now I understand.")) {
+		case 1:
+			cutin "hu_laura01.bmp",2;
+			mes "["+strcharinfo(0)+"]";
+			mes "These people in the other";
+			mes "room, Alex and Julian, are";
+			mes "they also working in this same";
+			mes "expedition in the Odin Shrine?";
+			next;
+			cutin "hu_laura02.bmp",2;
+			mes "[Laura]";
+			mes "...Oh. You must be working";
+			mes "for those rich Schwaltvalt";
+			mes "Republic kids. I can't work";
+			mes "with that impudent girl, at";
+			mes "all, so we're actually working";
+			mes "in separate offices.";
+			next;
+			cutin "hu_laura04.bmp",2;
+			mes "[Laura]";
+			mes "Sorry, let me introduce";
+			mes "myself. I'm Laura Laurence,";
+			mes "the leader of the Odin Shrine";
+			mes "expedition for the Rune Midgarts^FFFFFF ^000000 Kingdom. Ashe Milton is my";
+			mes "assistant for this excavation.";
+			next;
+			emotion e_heh,0,"Ashe";
+			mes "[Ashe]";
+			mes "Hello!";
+			next;
+			mes "[Laura]";
+			mes "If you'd rather do";
+			mes "a service for your";
+			mes "country and quit working";
+			mes "for those wealthy snobs, then";
+			mes "come back here and let me know.";
+			close2;
+			cutin "hu_laura04.bmp",255;
+			end;
+		case 2:
+			cutin "hu_laura01.bmp",2;
+			mes "[Laura]";
+			mes "......";
+			mes ".........";
+			mes "............";
+			close2;
+			cutin "hu_laura01.bmp",255;
+			end;
 		}
-	}
-	else if(hg_odin == 6)
-	{
+	} else if (hg_odin == 6) {
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
 		mes "Hey, I know you...";
@@ -9152,14 +8328,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "[Laura]";
 		mes "RIGHT?!";
 		next;
-		switch( select( "Yeah, yeah, whatever.","Sure thing.","I s-s-s-suppose...!","Yes, Ma'am!" ) )
-		{
-			case 1:
-			case 2:
-			case 3:
-			case 4:
-				break;
-		}
+		select("Yeah, yeah, whatever.:Sure thing.:I s-s-s-suppose...!:Yes, Ma'am!");
 		set hg_odin,17;
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
@@ -9168,9 +8337,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		close2;
 		cutin "hu_laura04.bmp",255;
 		end;
-	}
-	else if(hg_odin == 12)
-	{
+	} else if (hg_odin == 12) {
 		cutin "hu_laura02.bmp",2;
 		mes "[Laura]";
 		mes "Ask the Boatman to take";
@@ -9181,9 +8348,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		close2;
 		cutin "hu_laura02.bmp",255;
 		end;
-	}
-	else if(hg_odin == 13)
-	{
+	} else if (hg_odin == 13) {
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
 		mes "Have you been to the";
@@ -9192,41 +8357,33 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "need to finish our research";
 		mes "for the good of mankind.";
 		next;
-		switch( select( "Yeah, yeah, whatever.","I see.","You're right, Ma'am." ) )
-		{
-			case 1:
-			case 2:
-			case 3:
-				break;
-		}
+		select("Yeah, yeah, whatever.:I see.:You're right, Ma'am.");
 		mes "[Laura]";
 		mes "Well, then.";
 		mes "Did you happen to";
 		mes "find anything while";
 		mes "you were there?";
 		next;
-		switch( select( "Jellopies.","No." ) )
-		{
-			case 1:
-				cutin "hu_laura01.bmp",2;
-				mes "[Laura]";
-				mes "You can freakin' find";
-				mes "Jellopy anywhere! I meant,";
-				mes "did you find anything special";
-				mes "while you were at the shrine!";
-				next;
-				break;
-				
-			case 2:
-				cutin "hu_laura01.bmp",2;
-				mes "[Laura]";
-				mes "Well, that's fine.";
-				mes "I did tell you to just";
-				mes "take a look around, so";
-				mes "I didn't expect you to";
-				mes "bring me anything.";
-				next;
-				break;
+		switch(select("Jellopies.:No.")) {
+		case 1:
+			cutin "hu_laura01.bmp",2;
+			mes "[Laura]";
+			mes "You can freakin' find";
+			mes "Jellopy anywhere! I meant,";
+			mes "did you find anything special";
+			mes "while you were at the shrine!";
+			next;
+			break;
+		case 2:
+			cutin "hu_laura01.bmp",2;
+			mes "[Laura]";
+			mes "Well, that's fine.";
+			mes "I did tell you to just";
+			mes "take a look around, so";
+			mes "I didn't expect you to";
+			mes "bring me anything.";
+			next;
+			break;
 		}
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
@@ -9236,286 +8393,266 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "be fair, I can offer you something from my special collection.";
 		mes "How does that sound?";
 		next;
-		switch( select( "Who are the guys in the other room?","Well...","Yes!" ) )
-		{
-			case 1:
+		switch(select("Who are the guys in the other room?:Well...:Yes!")) {
+		case 1:
+			cutin "hu_laura01.bmp",2;
+			mes "[Laura]";
+			mes "Oh, those are the";
+			mes "Schwartzvalt Republic";
+			mes "representatives for this";
+			mes "Odin Shrine expedition.";
+			mes "Personally, I think they're";
+			mes "just a bunch of rich phonies.";
+			next;
+			cutin "hu_laura03.bmp",2;
+			mes "[Laura]";
+			mes "And that Alex girl...";
+			mes "She may seem polite,";
+			mes "but she's always giving";
+			mes "these dirty looks, and";
+			mes "greets me with a fake";
+			mes "smile. I hate her!";
+			next;
+			emotion e_swt2,0,"Ashe";
+			mes "[Ashe]";
+			mes "Ms. Laurence...!";
+			mes "Stop it, please!";
+			mes "It's embarassing to";
+			mes "hear you talk about";
+			mes "a colleague like that.";
+			next;
+			mes "[Laura]";
+			mes "C-colleague?! No way!";
+			mes "I despise that spoiled brat,";
+			mes "and she doesn't deserve the";
+			mes "position that her rich daddy";
+			mes "probably bought for her! Grrr!";
+			mes "Come back later, I'm too mad!";
+			close2;
+			cutin "hu_laura03.bmp",255;
+			end;
+		case 2:
+			mes "[Laura]";
+			mes "If you're having second";
+			mes "thoughts, it might not be";
+			mes "the best idea to work for me.";
+			mes "I mean, I believe in following";
+			mes "your gut instincts, you know?";
+			close2;
+			cutin "hu_laura04.bmp",255;
+			end;
+		case 3:
+			set hg_odin,14;
+			changequest 11003,11004;
+			mes "[Laura]";
+			mes "That's what I've been";
+			mes "waiting to hear! Alright,";
+			mes "please fetch me ^3355FF5 Runes of";
+			mes "the Darkness^000000 from the Odin";
+			mes "Shrine. Go now, adventurer~";
+			close2;
+			cutin "hu_laura04.bmp",255;
+			end;
+		}
+	} else if (hg_odin == 14) {
+		cutin "hu_laura02.bmp",2;
+		mes "[Laura]";
+		mes "Hm? You've got a job";
+		mes "to do, don't you? What";
+		mes "are you still doing here?";
+		next;
+		switch(select("What was I supposed to gather?:Don't worry, I'm leaving.")) {
+		case 1:
+			mes "[Laura]";
+			mes "You're supposed";
+			mes "to bring me ^3355FF5 Runes";
+			mes "of the Darkness^000000. Now,";
+			mes "don't forget this time!";
+			close2;
+			cutin "hu_laura02.bmp",255;
+			end;
+		case 2:
+			mes "[Laura]";
+			mes "Well, try to hurry up";
+			mes "if you can. I'm already";
+			mes "behind schedule because";
+			mes "we have to work with those";
+			mes "snobby rich kids in the";
+			mes "other office. ^333333*Sigh...*^000000";
+			close2;
+			cutin "hu_laura02.bmp",255;
+			end;
+		}
+	} else if (hg_odin == 15) {
+		cutin "hu_laura04.bmp",2;
+		mes "[Laura]";
+		mes "Oh, you've come back.";
+		mes "So where are the Runes";
+		mes "of the Darkness you brought?";
+		next;
+		switch(select("Er, I don't have them yet...:Right here!")) {
+		case 1:
+			cutin "hu_laura03.bmp",2;
+			mes "[Laura]";
+			mes "This isn't really one";
+			mes "of those jobs where you";
+			mes "can take your time. Sure,^FFFFFF ^000000 I didn't give you a deadline, but";
+			mes "we can't make progress on our^FFFFFF ^000000 research until you make progress.";
+			close2;
+			cutin "hu_laura03.bmp",255;
+			end;
+		case 2:
+			if (countitem(7511) > 4) {
+				delitem 7511,5; //Rune_Of_Darkness
+				set hg_odin,16;
+				changequest 11004,11005;
+				getitem 603,1; //Old_Blue_Box
+				mes "[Laura]";
+				mes "Oooh, nice job. It's good";
+				mes "that we have more of these";
+				mes "to study. Though, it seems";
+				mes "that the more we research,";
+				mes "the quicker it seems that";
+				mes "we're not getting anywhere...";
+				next;
+				mes "[Laura]";
+				mes "Hey...";
+				mes "Ashe. Why aren't we";
+				mes "making any progress?";
+				mes "What exactly have you";
+				mes "been doing? None of those";
+				mes "runes have any writing?";
+				next;
+				mes "[Ashe]";
+				mes "Well, I think there's";
+				mes "supposed to be writing,";
+				mes "but these runes are pretty";
+				mes "old. I've got to polish this";
+				mes "gunk off without damaging";
+				mes "any writing that's there...";
+				next;
 				cutin "hu_laura01.bmp",2;
 				mes "[Laura]";
-				mes "Oh, those are the";
-				mes "Schwartzvalt Republic";
-				mes "representatives for this";
-				mes "Odin Shrine expedition.";
-				mes "Personally, I think they're";
-				mes "just a bunch of rich phonies.";
+				mes "By the way, what have the other guys been doing?";
+				mes "What, they don't do anything but wasting their time?";
+				mes "Ah~ I see. They are thinking that this is the perfect excuse";
+				mes "for them to relax and rest.";
+				mes "Well, somehow they are the citizens of this country, you know.";
+				next;
+				cutin "hu_laura02.bmp",2;
+				mes "[Laura]";
+				mes "What do you think those";
+				mes "Schwaltzvalt snobs are doing?";
+				mes "They must think this project";
+				mes "is an excuse for them to relax";
+				mes "and slack off! They can afford^FFFFFF ^000000 to, obviously. Hmpf! Rich people!";
 				next;
 				cutin "hu_laura03.bmp",2;
 				mes "[Laura]";
-				mes "And that Alex girl...";
-				mes "She may seem polite,";
-				mes "but she's always giving";
-				mes "these dirty looks, and";
-				mes "greets me with a fake";
-				mes "smile. I hate her!";
+				mes "They've got things so easy,";
+				mes "while we're barely covering";
+				mes "our research expenses!";
+				mes "In fact, we've had to cut";
+				mes "so many corners, skip";
+				mes "meals and amenities...";
 				next;
-				emotion e_swt2,0,"Ashe";
 				mes "[Ashe]";
-				mes "Ms. Laurence...!";
-				mes "Stop it, please!";
-				mes "It's embarassing to";
-				mes "hear you talk about";
-				mes "a colleague like that.";
+				mes "I know! How can we";
+				mes "carry on professional";
+				mes "research in a shack?";
+				mes "We're literally living at";
+				mes "poverty standards here...";
+				mes "Are we still researchers?";
 				next;
+				cutin "hu_laura02.bmp",2;
 				mes "[Laura]";
-				mes "C-colleague?! No way!";
-				mes "I despise that spoiled brat,";
-				mes "and she doesn't deserve the";
-				mes "position that her rich daddy";
-				mes "probably bought for her! Grrr!";
-				mes "Come back later, I'm too mad!";
-				close2;
-				cutin "hu_laura03.bmp",255;
-				end;
-				
-			case 2:
+				mes "I know that!";
+				mes "I know that already!";
+				mes "S-stop bringing it up!";
+				next;
+				cutin "hu_laura01.bmp",2;
 				mes "[Laura]";
-				mes "If you're having second";
-				mes "thoughts, it might not be";
-				mes "the best idea to work for me.";
-				mes "I mean, I believe in following";
-				mes "your gut instincts, you know?";
+				mes "This is pathetic.";
+				mes "I can't even afford the";
+				mes "energy to continue this";
+				mes "conversation. You too,";
+				mes "why don't you take a rest?";
 				close2;
-				cutin "hu_laura04.bmp",255;
+				cutin "hu_laura01.bmp",255;
 				end;
-
-			case 3:
-				set hg_odin,14;
+			} else if (!countitem(7511)) {
+				cutin "hu_laura02.bmp",2;
 				mes "[Laura]";
-				mes "That's what I've been";
-				mes "waiting to hear! Alright,";
-				mes "please fetch me ^3355FF5 Runes of";
-				mes "the Darkness^000000 from the Odin";
-				mes "Shrine. Go now, adventurer~";
-				close2;
-				cutin "hu_laura04.bmp",255;
-				end;
-		}
-	}
-	else if(hg_odin == 14)
-	{
-		cutin "hu_laura02.bmp",2;
-		mes "[Laura]";
-		mes "Hm? You've got a job";
-		mes "to do, don't you? What";
-		mes "are you still doing here?";
-		next;
-		switch( select( "What was I supposed to gather?","Don't worry, I'm leaving." ) )
-		{
-			case 1:
+				mes "..................";
+				mes "What is this?!";
+				mes "You're supposed to";
+				mes "bring me 5 of them!";
+				next;
+				cutin "hu_laura03.bmp",2;
+				mes "[Laura]";
+				mes "Is this your way of";
+				mes "saying that you don't";
+				mes "want to work for us?";
+				mes "Why don't you say it";
+				mes "to my face, eh?";
+				next;
+				mes "[Ashe]";
+				mes "Ms. Laurence, please,";
+				mes "calm down! We're in no";
+				mes "position to yell at anyone,";
+				mes "especially volunteers! You";
+				mes "of all people should know";
+				mes "that they're doing us a favor!";
+				next;
+				cutin "hu_laura02.bmp",2;
 				mes "[Laura]";
-				mes "You're supposed";
-				mes "to bring me ^3355FF5 Runes";
-				mes "of the Darkness^000000. Now,";
-				mes "don't forget this time!";
+				mes "Okay, Ashe, I get it!";
+				mes "And as for you, I'll give";
+				mes "you another chance. Next";
+				mes "time you see me, bring";
+				mes "5 Runes of the Darkness!";
 				close2;
 				cutin "hu_laura02.bmp",255;
 				end;
-
-			case 2:
+			} else if (countitem(7511) == 1) {
+				cutin "hu_laura03.bmp",2;
 				mes "[Laura]";
-				mes "Well, try to hurry up";
-				mes "if you can. I'm already";
-				mes "behind schedule because";
-				mes "we have to work with those";
-				mes "snobby rich kids in the";
-				mes "other office. ^333333*Sigh...*^000000";
+				mes "...Only one?";
+				mes "Look at me. I asked";
+				mes "you for five. I know that";
+				mes "one is better than nothing...";
+				mes "But it's pretty darn close. Go";
+				mes "get me 4 more this instant!";
 				close2;
-				cutin "hu_laura02.bmp",255;
+				cutin "hu_laura03.bmp",255;
 				end;
-		}
-	}
-	else if(hg_odin == 15)
-	{
-		cutin "hu_laura04.bmp",2;
-		mes "[Laura]";
-		mes "Oh, you've come back.";
-		mes "So where are the Runes";
-		mes "of the Darkness you brought?";
-		next;
-		switch( select( "Er, I don't have them yet...","Right here!" ) )
-		{
-			case 1:
+			} else if (countitem(7511) == 2) {
 				cutin "hu_laura03.bmp",2;
 				mes "[Laura]";
-				mes "This isn't really one";
-				mes "of those jobs where you";
-				mes "can take your time. Sure,^FFFFFF ^000000 I didn't give you a deadline, but";
-				mes "we can't make progress on our^FFFFFF ^000000 research until you make progress.";
+				mes "One, two...";
+				mes "Huh? Th-that's all?!";
+				mes "When I ask for 5 Runes";
+				mes "of the Darkness, I mean";
+				mes "5, not 2. Now hurry up";
+				mes "and just do what I asked!";
 				close2;
 				cutin "hu_laura03.bmp",255;
 				end;
-			
-			case 2:
-				if (countitem(7511) > 4)
-				{
-					delitem 7511,5;
-					set hg_odin,16;
-					getitem 603,1;
-					mes "[Laura]";
-					mes "Oooh, nice job. It's good";
-					mes "that we have more of these";
-					mes "to study. Though, it seems";
-					mes "that the more we research,";
-					mes "the quicker it seems that";
-					mes "we're not getting anywhere...";
-					next;
-					mes "[Laura]";
-					mes "Hey...";
-					mes "Ashe. Why aren't we";
-					mes "making any progress?";
-					mes "What exactly have you";
-					mes "been doing? None of those";
-					mes "runes have any writing?";
-					next;
-					mes "[Ashe]";
-					mes "Well, I think there's";
-					mes "supposed to be writing,";
-					mes "but these runes are pretty";
-					mes "old. I've got to polish this";
-					mes "gunk off without damaging";
-					mes "any writing that's there...";
-					next;
-					cutin "hu_laura01.bmp",2;
-					mes "[Laura]";
-					mes "By the way, what have the other guys been doing?";
-					mes "What, they don't do anything but wasting their time?";
-					mes "Ah~ I see. They are thinking that this is the perfect excuse";
-					mes "for them to relax and rest.";
-					mes "Well, somehow they are the citizens of this country, you know.";
-					next;
-					cutin "hu_laura02.bmp",2;
-					mes "[Laura]";
-					mes "What do you think those";
-					mes "Schwaltzvalt snobs are doing?";
-					mes "They must think this project";
-					mes "is an excuse for them to relax";
-					mes "and slack off! They can afford^FFFFFF ^000000 to, obviously. Hmpf! Rich people!";
-					next;
-					cutin "hu_laura03.bmp",2;
-					mes "[Laura]";
-					mes "They've got things so easy,";
-					mes "while we're barely covering";
-					mes "our research expenses!";
-					mes "In fact, we've had to cut";
-					mes "so many corners, skip";
-					mes "meals and amenities...";
-					next;
-					mes "[Ashe]";
-					mes "I know! How can we";
-					mes "carry on professional";
-					mes "research in a shack?";
-					mes "We're literally living at";
-					mes "poverty standards here...";
-					mes "Are we still researchers?";
-					next;
-					cutin "hu_laura02.bmp",2;
-					mes "[Laura]";
-					mes "I know that!";
-					mes "I know that already!";
-					mes "S-stop bringing it up!";
-					next;
-					cutin "hu_laura01.bmp",2;
-					mes "[Laura]";
-					mes "This is pathetic.";
-					mes "I can't even afford the";
-					mes "energy to continue this";
-					mes "conversation. You too,";
-					mes "why don't you take a rest?";
-					close2;
-					cutin "hu_laura01.bmp",255;
-					end;
-				}
-				else if(!countitem(7511))
-				{
-					cutin "hu_laura02.bmp",2;
-					mes "[Laura]";
-					mes "..................";
-					mes "What is this?!";
-					mes "You're supposed to";
-					mes "bring me 5 of them!";
-					next;
-					cutin "hu_laura03.bmp",2;
-					mes "[Laura]";
-					mes "Is this your way of";
-					mes "saying that you don't";
-					mes "want to work for us?";
-					mes "Why don't you say it";
-					mes "to my face, eh?";
-					next;
-					mes "[Ashe]";
-					mes "Ms. Laurence, please,";
-					mes "calm down! We're in no";
-					mes "position to yell at anyone,";
-					mes "especially volunteers! You";
-					mes "of all people should know";
-					mes "that they're doing us a favor!";
-					next;
-					cutin "hu_laura02.bmp",2;
-					mes "[Laura]";
-					mes "Okay, Ashe, I get it!";
-					mes "And as for you, I'll give";
-					mes "you another chance. Next";
-					mes "time you see me, bring";
-					mes "5 Runes of the Darkness!";
-					close2;
-					cutin "hu_laura02.bmp",255;
-					end;
-				}
-				else if(countitem(7511) == 1)
-				{
-					cutin "hu_laura03.bmp",2;
-					mes "[Laura]";
-					mes "...Only one?";
-					mes "Look at me. I asked";
-					mes "you for five. I know that";
-					mes "one is better than nothing...";
-					mes "But it's pretty darn close. Go";
-					mes "get me 4 more this instant!";
-					close2;
-					cutin "hu_laura03.bmp",255;
-					end;
-				}
-				else if(countitem(7511) == 2)
-				{
-					cutin "hu_laura03.bmp",2;
-					mes "[Laura]";
-					mes "One, two...";
-					mes "Huh? Th-that's all?!";
-					mes "When I ask for 5 Runes";
-					mes "of the Darkness, I mean";
-					mes "5, not 2. Now hurry up";
-					mes "and just do what I asked!";
-					close2;
-					cutin "hu_laura03.bmp",255;
-					end;
-				}
-				else
-				{
-					mes "[Laura]";
-					mes "One, two, three...";
-					mes "That's it? Don't you";
-					mes "know how to count to 5?";
-					mes "Go and get me more of those";
-					mes "Runes of the Darkness now!";
-					next;
-					cutin "hu_laura03.bmp",2;
-					close2;
-					cutin "hu_laura03.bmp",255;
-					end;
-				}
+			} else {
+				mes "[Laura]";
+				mes "One, two, three...";
+				mes "That's it? Don't you";
+				mes "know how to count to 5?";
+				mes "Go and get me more of those";
+				mes "Runes of the Darkness now!";
+				next;
+				cutin "hu_laura03.bmp",2;
+				close2;
+				cutin "hu_laura03.bmp",255;
+				end;
+			}
 		}
-	}
-	else if(hg_odin == 16)
-	{
+	} else if (hg_odin == 16) {
 		cutin "hu_laura02.bmp",2;
 		mes "[Laura]";
 		mes "I wonder how much progress";
@@ -9536,20 +8673,15 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "[Laura]";
 		mes "...Hey, you.";
 		next;
-		switch( select( "...","...Me?" ) )
+		if ( select( "...:...Me?" ) == 1)
 		{
-			case 1:
-				mes "[Laura]";
-				mes "Hey, hey!";
-				mes "Hey hey hey!";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "...Me?";
-				next;
-				break;
-				
-			case 2:
-				break;
+			mes "[Laura]";
+			mes "Hey, hey!";
+			mes "Hey hey hey!";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "...Me?";
+			next;
 		}
 		mes "[Laura]";
 		mes "Basically, I want you";
@@ -9576,15 +8708,13 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "[Laura]";
 		mes "RIGHT?!";
 		next;
-		switch( select( "Yeah, yeah, whatever.","Sure thing.","I s-s-s-suppose...!","Yes, Ma'am!" ) )
-		{
-			case 1:
-			case 2:
-			case 3:
-			case 4:
-				break;
-		}
+		select("Yeah, yeah, whatever.:Sure thing.:I s-s-s-suppose...!:Yes, Ma'am!");
 		set hg_odin,17;
+		for(set .@i,11002; .@i<=11005; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1 && checkquest(.@i) < 2)
+				completequest .@i;
+		}
+		setquest 11006;
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
 		mes "Good.";
@@ -9592,9 +8722,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		close2;
 		cutin "hu_laura04.bmp",255;
 		end;
-	}
-	else if(hg_odin == 17)
-	{
+	} else if (hg_odin == 17) {
 		cutin "hu_laura02.bmp",2;
 		mes "[Laura]";
 		mes "What are you standing";
@@ -9605,9 +8733,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		close2;
 		cutin "hu_laura02.bmp",255;
 		end;
-	}
-	else if(hg_odin == 18 || hg_odin == 19)
-	{
+	} else if (hg_odin == 18 || hg_odin == 19) {
 		cutin "hu_laura01.bmp",2;
 		mes "[Laura]";
 		mes "Frankly, I know I'm paying";
@@ -9616,8 +8742,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "learned about the Schwaltzvalt";
 		mes "Republic Research Team.";
 		next;
-		switch( select( "Giantes","Ymir's Heart","Nothing" ) )
-		{
+		switch(select("Giantes:Ymir's Heart:Nothing")) {
 			case 1:
 				cutin "hu_laura04.bmp",2;
 				mes "["+strcharinfo(0)+"]";
@@ -9651,7 +8776,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				mes "this? What exactly";
 				mes "is Ymir's Heart?";
 				next;
-				switch( select( "It's candy.","It's a book.","It's a place.","Ymir was a giant..." ) )
+				switch(select("It's candy.:It's a book.:It's a place.:Ymir was a giant..."))
 				{
 					case 1:
 						mes "["+strcharinfo(0)+"]";
@@ -9718,6 +8843,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				mes "Research Team. I'm sorry, but";
 				mes "you're the only one I can ask.";
 				set hg_odin,20;
+				changequest 11006,11007;
 				close2;
 				cutin "hu_laura04.bmp",255;
 				end;
@@ -9731,9 +8857,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				cutin "hu_laura01.bmp",255;
 				end;
 		}
-	}
-	else if(hg_odin == 20)
-	{
+	} else if (hg_odin == 20) {
 		cutin "hu_laura01.bmp",2;
 		mes "[Laura]";
 		mes "I wonder...";
@@ -9747,15 +8871,11 @@ hu_in01,14,11,4	script	Laura	70,{
 }
 
 hu_in01,18,167,4	script	Julian	86,{
-
-	if(!hg_odin)
-	{
+	if (!hg_odin) {
 		mes "[Julian]";
 		mes "^333333*Sigh...*^000000";
 		close;
-	}
-	else if(hg_odin == 1)
-	{
+	} else if (hg_odin == 1) {
 		mes "[Julian]";
 		mes "Say, are you here";
 		mes "for a job? We're looking";
@@ -9779,9 +8899,7 @@ hu_in01,18,167,4	script	Julian	86,{
 		mes "to find any relics from the Odin ^FFFFFF ^000000 Shrine. We'd appreciate it if you";
 		mes "brought as many as you can!";
 		close;
-	}
-	else if(hg_odin == 2)
-	{
+	} else if (hg_odin == 2) {
 		mes "[Julian]";
 		mes "You sure you want";
 		mes "to work for someone";
@@ -9796,18 +8914,14 @@ hu_in01,18,167,4	script	Julian	86,{
 		mes "[Julian]";
 		mes "See what I mean?";
 		close;
-	}
-	else if(hg_odin == 3)
-	{
+	} else if (hg_odin == 3) {
 		mes "[Julian]";
 		mes "Wow, you must really";
 		mes "like this kind of work,";
 		mes "huh? I didn't really expect";
 		mes "that you'd go to the shrine...";
 		close;
-	}
-	else if(hg_odin == 4)
-	{
+	} else if (hg_odin == 4) {
 		mes "[Julian]";
 		mes "I'm amazed to see you";
 		mes "working so hard. You must";
@@ -9815,9 +8929,7 @@ hu_in01,18,167,4	script	Julian	86,{
 		mes "I guess, but try not to be too";
 		mes "kind. Wouldn't want that...";
 		close;
-	}
-	else if(hg_odin == 5)
-	{
+	} else if (hg_odin == 5) {
 		mes "[Julian]";
 		mes "Geez...";
 		mes "You're a really nice";
@@ -9825,9 +8937,7 @@ hu_in01,18,167,4	script	Julian	86,{
 		mes "Just try not to be taken";
 		mes "for a sucker, okay?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Julian]";
 		mes "Why are both of our";
 		mes "team leaders so bull";
@@ -9840,10 +8950,8 @@ hu_in01,18,167,4	script	Julian	86,{
 }
 
 hu_in01,16,21,0	script	Ashe#5	139,2,2,{
-
 OnTouch:
-	if (hg_odin == 18)
-	{
+	if (hg_odin == 18) {
 		mes "[Ashe]";
 		mes "......?";
 		next;
@@ -9856,9 +8964,7 @@ OnTouch:
 }
 
 hu_in01,16,20,4	script	Ashe	95,{
-
-	switch(hg_odin)
-	{
+	switch(hg_odin) {
 		case 0:
 			mes "[Ashe]";
 			mes "Hello, may I help you?";
@@ -9956,7 +9062,7 @@ hu_in01,16,20,4	script	Ashe	95,{
 			close;
 			
 		case 15:
-			if(countitem(7511) > 4)
+			if (countitem(7511) > 4)
 			{
 				mes "[Ashe]";
 				mes "Well, it looks like";
@@ -10007,10 +9113,8 @@ hu_in01,16,20,4	script	Ashe	95,{
 }
 
 hu_in01,174,90,0	script	Entrance	139,2,2,{
-
 OnTouch:
-	if(hg_odin == 22 || hg_odin == 23)
-	{
+	if (hg_odin == 22 || hg_odin == 23) {
 		mes "[Laura]";
 		mes "So it means that everyone fooled me!";
 		next;
@@ -10020,9 +9124,7 @@ OnTouch:
 }
 
 hu_in01,159,84,3	script	Laura#2	70,{
-
-	if(hg_odin == 22 || hg_odin == 23)
-	{
+	if (hg_odin == 22 || hg_odin == 23) {
 		cutin "hu_laura03.bmp",2;
 		emotion e_an,0,"Laura#2";
 		mes "[Laura]";
@@ -10171,9 +9273,7 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		close2;
 		cutin "hu_alex04.bmp",255;
 		end;
-	}
-	else if(hg_odin > 23)
-	{
+	} else if (hg_odin > 23) {
 		cutin "hu_laura03.bmp",2;
 		emotion e_an,0,"Laura#2";
 		mes "[Laura]";
@@ -10194,17 +9294,13 @@ hu_in01,159,84,3	script	Laura#2	70,{
 hu_in01,158,84,5	duplicate(Laura#2)	Alex#2	803,0,0
 
 hu_in01,162,85,4	script	Ashe#2	95,{
-
-	if(hg_odin == 22 || hg_odin == 23)
-	{
+	if (hg_odin == 22 || hg_odin == 23) {
 		mes "[Ashe]";
 		mes "This...";
 		mes "This doesn't";
 		mes "look good at all!";
 		close;
-	}
-	else if(hg_odin == 25)
-	{
+	} else if (hg_odin == 25) {
 		mes "^3355FFAshe picked up";
 		mes "the file that Laura";
 		mes "tossed away.^000000";
@@ -10225,15 +9321,14 @@ hu_in01,162,85,4	script	Ashe#2	95,{
 		mes "you for all your help, friend.";
 		next;
 		set hg_odin,59;
+		changequest 11007,11008;
 		mes "[Ashe]";
 		mes "Don't worry, my comrade";
 		mes "at Morroc's South Gate will";
 		mes "explain everything once you";
 		mes "find him. Please hurry!";
 		close;
-	}
-	else if(hg_odin == 59)
-	{
+	} else if (hg_odin == 59) {
 		mes "[Ashe]";
 		mes "Don't worry, my comrade";
 		mes "at Morroc's South Gate will";
@@ -10245,10 +9340,8 @@ hu_in01,162,85,4	script	Ashe#2	95,{
 }
 
 hu_in01,171,90,0	script	Ashe#3	139,2,2,{
-
 OnTouch:
-	if(hg_odin == 25)
-	{
+	if (hg_odin == 25) {
 		mes "^3355FFAshe picked up";
 		mes "the file that Laura";
 		mes "tossed away.^000000";
@@ -10279,9 +9372,7 @@ OnTouch:
 }
 
 hu_in01,155,82,4	script	Julian#2	86,{
-
-	if (hg_odin == 22 || hg_odin == 23)
-	{
+	if (hg_odin == 22 || hg_odin == 23) {
 		mes "[Julian]";
 		mes "I...";
 		mes "I don't know";
@@ -10302,10 +9393,8 @@ moc_fild12,160,372,0	script	Hit	139,{
 }
 
 moc_fild12,160,365,0	script	Ashe#4	139,4,4,{
-
 OnTouch:
-	if(hg_odin == 59)
-	{
+	if (hg_odin == 59) {
 		mes "[???]";
 		mes "...Silence.";
 		next;
@@ -10339,8 +9428,7 @@ OnTouch:
 		mes "I leave, have you got any";
 		mes "questions? Otherwise, I'll go.";
 		next;
-		switch( select( "Who's Ashe?","What happened to Laura?" ) )
-		{
+		switch(select("Who's Ashe?:What happened to Laura?")) {
 			case 1:
 				mes "[???]";
 				mes "You'll never see her";
@@ -10391,8 +9479,9 @@ OnTouch:
 		mes "used... Like that one lady,";
 		mes "that archaeologist, Laura.";
 		next;
-		getexp 70000,0;
+		getexp (checkre(3))?100000:700000,0;
 		set hg_odin,60;
+		completequest 11008;
 		mes "[???]";
 		mes "...Thanks for";
 		mes "the file. Take care.";
@@ -10402,7 +9491,6 @@ OnTouch:
 }
 
 hugel,209,109,2	script	Boatman#hugel	709,{
-
 	mes "[Boatman]";
 	mes "Ah, hello~";
 	mes "Would you like to sail";
@@ -10410,8 +9498,7 @@ hugel,209,109,2	script	Boatman#hugel	709,{
 	mes "fare for 1 passenger is";
 	mes "800 zeny. Shall we board?";
 	next;
-	switch( select( "No, thanks.","Sure!" ) )
-	{
+	switch(select("No, thanks.:Sure!")) {
 		case 1:
 			mes "[Boatman]";
 			mes "Ah, alright.";
@@ -10440,24 +9527,22 @@ hugel,209,109,2	script	Boatman#hugel	709,{
 			close2;
 			set Zeny,Zeny -800;
 			if (hg_odin == 2) set hg_odin,3;
-			else if(hg_odin == 4) set hg_odin,5;
-			else if(hg_odin == 12) set hg_odin,13;
-			else if(hg_odin == 14) set hg_odin,15;
+			else if (hg_odin == 4) set hg_odin,5;
+			else if (hg_odin == 12) set hg_odin,13;
+			else if (hg_odin == 14) set hg_odin,15;
 			warp "odin_tem01",100,146;
 			end;
 	}
 }
 
 odin_tem01,93,146,4	script	Boatman	709,{
-
 	mes "[Boatman]";
 	mes "Ah, would you";
 	mes "like to sail back to";
 	mes "Hugel now, or did you";
 	mes "want to explore a bit more?";
 	next;
-	switch( select( "I still need to look around...","Yes, take me back to Hugel." ) )
-	{
+	switch(select("I still need to look around...:Yes, take me back to Hugel.")) {
 		case 1:
 			mes "[Boatman]";
 			mes "Well, alright.";
@@ -10479,35 +9564,32 @@ odin_tem01,93,146,4	script	Boatman	709,{
 }
 
 odin_tem03,4,2,0	script	OdinInit	-1,{
-
 OnInit:
 	initnpctimer;
 	end;
 
 OnTimer100000:
 	stopnpctimer;
-	switch(rand(1,5))
-	{
-		case 1:
-			donpcevent "warpinside#1::OnEnter";
-			end;
-		case 2:
-			donpcevent "warpinside#2::OnEnter";
-			end;
-		case 3:
-			donpcevent "warpinside#3::OnEnter";
-			end;
-		case 4:
-			donpcevent "warpinside#4::OnEnter";
-			end;
-		case 5:
-			donpcevent "warpinside#5::OnEnter";
-			end;
+	switch(rand(1,5)) {
+	case 1:
+		donpcevent "warpinside#1::OnEnter";
+		end;
+	case 2:
+		donpcevent "warpinside#2::OnEnter";
+		end;
+	case 3:
+		donpcevent "warpinside#3::OnEnter";
+		end;
+	case 4:
+		donpcevent "warpinside#4::OnEnter";
+		end;
+	case 5:
+		donpcevent "warpinside#5::OnEnter";
+		end;
 	}
 }
 
 odin_tem03,266,302,0	script	warpinside#1	139,3,3,{
-
 OnInit:
 	disablenpc "warpinside#1";
 	end;
@@ -10517,25 +9599,20 @@ OnEnter:
 	end;
 
 OnTouch:
-	if(hg_odin > 19 && hg_odin < 23)
-	{
-		switch(rand(1,4))
-		{
-			case 1:
-				donpcevent "warpinside#2::OnEnter";
-				break;
-				
-			case 2:
-				donpcevent "warpinside#3::OnEnter";
-				break;
-				
-			case 3:
-				donpcevent "warpinside#4::OnEnter";
-				break;
-				
-			case 4:
-				donpcevent "warpinside#5::OnEnter";
-				break;
+	if (hg_odin > 19 && hg_odin < 23) {
+		switch(rand(1,4)) {
+		case 1:
+			donpcevent "warpinside#2::OnEnter";
+			break;
+		case 2:
+			donpcevent "warpinside#3::OnEnter";
+			break;
+		case 3:
+			donpcevent "warpinside#4::OnEnter";
+			break;
+		case 4:
+			donpcevent "warpinside#5::OnEnter";
+			break;
 		}
 		disablenpc "warpinside#1";
 		set hg_odin,21;
@@ -10545,7 +9622,6 @@ OnTouch:
 }
 
 odin_tem03,288,271,0	script	warpinside#2	139,3,3,{
-
 OnInit:
 	disablenpc "warpinside#2";
 	end;
@@ -10555,25 +9631,20 @@ OnEnter:
 	end;
 
 OnTouch:
-	if(hg_odin > 19 && hg_odin < 23)
-	{
-		switch(rand(1,4))
-		{
-			case 1:
-				donpcevent "warpinside#1::OnEnter";
-				break;
-				
-			case 2:
-				donpcevent "warpinside#3::OnEnter";
-				break;
-				
-			case 3:
-				donpcevent "warpinside#4::OnEnter";
-				break;
-				
-			case 4:
-				donpcevent "warpinside#5::OnEnter";
-				break;
+	if (hg_odin > 19 && hg_odin < 23) {
+		switch(rand(1,4)) {
+		case 1:
+			donpcevent "warpinside#1::OnEnter";
+			break;
+		case 2:
+			donpcevent "warpinside#3::OnEnter";
+			break;
+		case 3:
+			donpcevent "warpinside#4::OnEnter";
+			break;
+		case 4:
+			donpcevent "warpinside#5::OnEnter";
+			break;
 		}
 		disablenpc "warpinside#2";
 		set hg_odin,21;
@@ -10583,7 +9654,6 @@ OnTouch:
 }
 
 odin_tem03,283,241,0	script	warpinside#3	139,3,3,{
-
 OnInit:
 	disablenpc "warpinside#3";
 	end;
@@ -10593,25 +9663,20 @@ OnEnter:
 	end;
 
 OnTouch:
-	if(hg_odin > 19 && hg_odin < 23)
-	{
-		switch(rand(1,4))
-		{
-			case 1:
-				donpcevent "warpinside#1::OnEnter";
-				break;
-				
-			case 2:
-				donpcevent "warpinside#2::OnEnter";
-				break;
-				
-			case 3:
-				donpcevent "warpinside#4::OnEnter";
-				break;
-				
-			case 4:
-				donpcevent "warpinside#5::OnEnter";
-				break;
+	if (hg_odin > 19 && hg_odin < 23) {
+		switch(rand(1,4)) {
+		case 1:
+			donpcevent "warpinside#1::OnEnter";
+			break;
+		case 2:
+			donpcevent "warpinside#2::OnEnter";
+			break;
+		case 3:
+			donpcevent "warpinside#4::OnEnter";
+			break;
+		case 4:
+			donpcevent "warpinside#5::OnEnter";
+			break;
 		}
 		disablenpc "warpinside#3";
 		set hg_odin,21;
@@ -10621,7 +9686,6 @@ OnTouch:
 }
 
 odin_tem03,179,275,0	script	warpinside#4	139,3,3,{
-
 OnInit:
 	disablenpc "warpinside#4";
 	end;
@@ -10631,25 +9695,20 @@ OnEnter:
 	end;
 
 OnTouch:
-	if(hg_odin > 19 && hg_odin < 23)
-	{
-		switch(rand(1,4))
-		{
-			case 1:
-				donpcevent "warpinside#1::OnEnter";
-				break;
-				
-			case 2:
-				donpcevent "warpinside#2::OnEnter";
-				break;
-				
-			case 3:
-				donpcevent "warpinside#3::OnEnter";
-				break;
-				
-			case 4:
-				donpcevent "warpinside#5::OnEnter";
-				break;
+	if (hg_odin > 19 && hg_odin < 23) {
+		switch(rand(1,4)) {
+		case 1:
+			donpcevent "warpinside#1::OnEnter";
+			break;
+		case 2:
+			donpcevent "warpinside#2::OnEnter";
+			break;
+		case 3:
+			donpcevent "warpinside#3::OnEnter";
+			break;
+		case 4:
+			donpcevent "warpinside#5::OnEnter";
+			break;
 		}
 		disablenpc "warpinside#4";
 		set hg_odin,21;
@@ -10659,7 +9718,6 @@ OnTouch:
 }
 
 odin_tem03,320,264,0	script	warpinside#5	139,3,3,{
-
 OnInit:
 	disablenpc "warpinside#5";
 	end;
@@ -10669,25 +9727,20 @@ OnEnter:
 	end;
 
 OnTouch:
-	if(hg_odin > 19 && hg_odin < 23)
-	{
-		switch(rand(1,4))
-		{
-			case 1:
-				donpcevent "warpinside#1::OnEnter";
-				break;
-				
-			case 2:
-				donpcevent "warpinside#2::OnEnter";
-				break;
-				
-			case 3:
-				donpcevent "warpinside#3::OnEnter";
-				break;
-				
-			case 4:
-				donpcevent "warpinside#4::OnEnter";
-				break;
+	if (hg_odin > 19 && hg_odin < 23) {
+		switch(rand(1,4)) {
+		case 1:
+			donpcevent "warpinside#1::OnEnter";
+			break;
+		case 2:
+			donpcevent "warpinside#2::OnEnter";
+			break;
+		case 3:
+			donpcevent "warpinside#3::OnEnter";
+			break;
+		case 4:
+			donpcevent "warpinside#4::OnEnter";
+			break;
 		}
 		disablenpc "warpinside#5";
 		set hg_odin,21;
@@ -10697,7 +9750,6 @@ OnTouch:
 }
 
 hu_in01,99,90,0	script	Empty	139,3,3,{
-
 OnTouch:
 	mes "^3355FFThis place is empty.";
 	mes "Everyone must";
@@ -10706,10 +9758,8 @@ OnTouch:
 }
 
 que_hugel,35,29,5	script	object#1	139,2,2,{
-
 OnTouch:
-	if(hg_odin == 21)
-	{
+	if (hg_odin == 21) {
 		mes "^3355FFA weathered structure";
 		mes "of the Odin Shrine is";
 		mes "half buried beneath the";
@@ -10720,62 +9770,58 @@ OnTouch:
 		mes "......";
 		mes ".........";
 		next;
-		switch( select( "Pass","Explore" ) )
-		{
-			case 1:
-				mes "^3355FFYou decided to pass";
-				mes "by the shrine's remnants.^000000";
-				close;
-				
-			case 2:
-				if (rand(1,3) == 1)
-				{
-					mes "^3355FFYou catch a bright";
-					mes "shimmer among the";
-					mes "remnants of the shrine.^000000";
+		switch(select("Pass:Explore")) {
+		case 1:
+			mes "^3355FFYou decided to pass";
+			mes "by the shrine's remnants.^000000";
+			close;
+		case 2:
+			if (rand(1,3) == 1) {
+				mes "^3355FFYou catch a bright";
+				mes "shimmer among the";
+				mes "remnants of the shrine.^000000";
+				next;
+				switch(select("Ignore:Pick it up")) {
+				case 1:
+					mes "^3355FFYou decide to continue";
+					mes "searching through the";
+					mes "shrine's ruins.^000000";
+					close;
+				case 2:
+					mes "^3355FFYou find a shining stone";
+					mes "within the ruins, and carefully";
+					mes "put it into your bag.^000000";
 					next;
-					switch( select( "Ignore","Pick it up" ) )
-					{
-						case 1:
-							mes "^3355FFYou decide to continue";
-							mes "searching through the";
-							mes "shrine's ruins.^000000";
-							close;
-						
-						case 2:
-							mes "^3355FFYou find a shining stone";
-							mes "within the ruins, and carefully";
-							mes "put it into your bag.^000000";
-							next;
-							mes "^FF0000Thud!^000000";
-							next;
-							mes "["+strcharinfo(0)+"]";
-							mes "What...?";
-							mes "What was";
-							mes "that noise?!";
-							next;
-							specialeffect EF_LORD;
-							specialeffect EF_LORD;
-							specialeffect EF_LORD;
-							mes "["+strcharinfo(0)+"]";
-							mes "Wa...waaaahhhh!";
-							close2;
-							set hg_odin,22;
-							warp "que_hugel",163,31;
-							end;
-					}
+					mes "^FF0000Thud!^000000";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "What...?";
+					mes "What was";
+					mes "that noise?!";
+					next;
+					specialeffect EF_LORD;
+					specialeffect EF_LORD;
+					specialeffect EF_LORD;
+					mes "["+strcharinfo(0)+"]";
+					mes "Wa...waaaahhhh!";
+					close2;
+					set hg_odin,22;
+					warp "que_hugel",163,31;
+					end;
 				}
-				mes "^3355FFUnfortunately, you";
-				mes "were unable to find";
-				mes "anything in the ruins.^000000";
-				close;
+			}
+			mes "^3355FFUnfortunately, you";
+			mes "were unable to find";
+			mes "anything in the ruins.^000000";
+			close;
 		}
+	} else if (hg_odin == 22) {
+		warp "que_hugel",163,31;
+		end;
 	}
-	else if(hg_odin == 22) { warp "que_hugel",163,31; end; }
 }
 
 que_hugel,163,31,0	script	object#2	139,3,3,{
-
 OnTouch:
 	mes "^3355FFWhen you come back";
 	mes "to your senses, you";
@@ -10785,10 +9831,8 @@ OnTouch:
 }
 
 que_hugel,163,178,0	script	object#3	139,3,3,{
-
 OnTouch:
-	if(hg_odin == 22)
-	{
+	if (hg_odin == 22) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Huh?";
 		mes "What's happening?";
@@ -10803,10 +9847,8 @@ OnTouch:
 }
 
 hu_in01,15,108,0	script	alex#warp	45,1,1,{
-
 OnTouch:
-	if(hg_odin == 17)
-	{
+	if (hg_odin == 17) {
 		mes "[Alex]";
 		mes "Haven't you found it yet?";
 		mes "You said that it'd be here!";
@@ -10884,38 +9926,31 @@ OnTouch:
 		mes "We'll continue this";
 		mes "conversation later.";
 		close;
-	}
-	else if(hg_odin == 18)
-	{
+	} else if (hg_odin == 18) {
 		mes "......";
 		mes ".........";
 		close;
-	}
-	else
-	{
+	} else {
 		warp "hu_in01",15,155;
 		end;
 	}
 }
 
 hugel,52,90,0	script	alex#warp2	45,1,1,{
-
 OnTouch:
-	if(hg_odin > 59) warp "hu_in01",102,90;
-	else if(hg_odin > 21 && hg_odin < 60) warp "hu_in01",173,90;
+	if (hg_odin > 59) warp "hu_in01",102,90;
+	else if (hg_odin > 21 && hg_odin < 60) warp "hu_in01",173,90;
 	else warp "hu_in01",33,90;
 	end;
 }
 
 hu_in01,155,70,0	script	alex#warp3	45,1,1,{
-
 OnTouch:
 	mes "^3355FFThe door is locked.^000000";
 	close;
 }
 
 hu_in01,155,108,0	script	alex#warp4	45,1,1,{
-
 OnTouch:
 	mes "^3355FFThe door is locked.^000000";
 	close;
diff --git a/npc/quests/quests_izlude.txt b/npc/quests/quests_izlude.txt
index 8dc2e8f31..e95b8b2b7 100644
--- a/npc/quests/quests_izlude.txt
+++ b/npc/quests/quests_izlude.txt
@@ -1,20 +1,20 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Izlude
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Evera and The rAthena Dev Team
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Edgar's Offer:
-//= - [Aegis conversion]
+//= - [Official Conversion]
 //= - Variables in use: MISC_QUEST (Bit 16)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Initial release [Evera]
 //= 1.1 Updated to 10.3 standard. [L0ne_W0lf]
 //============================================================
 
-// Edgar's Offer
+// Edgar's Offer :: iz_npc
 //============================================================
 -	script	::Edgar_izlude	-1,{
 	if (MISC_QUEST & 16) {
@@ -32,7 +32,7 @@
 				mes "get some more cash?";
 				close ;
 			}
-			set zeny,zeny-250;
+			set Zeny, Zeny-250;
 			warp "alberta",195,164;
 			end;
 		}
@@ -41,7 +41,7 @@
 		close;
 	}
 	mes "[Edgar]";
-	mes "My town, Izlude,  is connected to Alberta by the harbor in the West. There is so much traffic between us, I almost become an Albertian.  Hehehe~";
+	mes "My town, Izlude, is connected to Alberta by the harbor in the West. There is so much traffic between us, I almost become an Albertian.  Hehehe~";
 	next;
 	mes "[Edgar]";
 	mes "There's this guy I know pretty well, Phelix, who lives in Alberta. That guy is really stingy... He charges for everything!";
@@ -79,7 +79,7 @@
 				mes "some more.";
 				close;
 			}
-			set zeny,zeny-250;
+			set Zeny, Zeny-250;
 			warp "alberta",195,164;
 			end;
 		}
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index 0f1fbfe77..7e894b47c 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -3,1218 +3,946 @@
 //===== By ===================================================
 //= MasterOfMuppets
 //===== Version ==============================================
-//= 1.7
+//= 1.9
 //===== Description ==========================================
-//= [Partial Aegis COnversion]
+//= [Partial Official Conversion]
 //= Juperos Ruins related Quests/Events
 //===== Comments =============================================
 //= 1.0 First version, partly implemented [MasterOfMuppets]
 //= 1.1 Added official Juperos Ruins History Quest. Thanks
-//= to Keplerk for his first version. [SinSloth]
+//=     to Keplerk for his first version. [SinSloth]
 //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.3 Removed semi-official core access NPCs, replaced with [L0ne_W0lf]
-//=	event-driven story progressive NPCs. Optimization needed.
+//=     event-driven story progressive NPCs. Optimization needed.
 //= 1.3a Adjusted the elevafor timer. (132000 -> 142000) [L0ne_W0lf]
 //= 1.3b Minor updates to juperos elevator NPCs. [L0ne_W0lf]
 //= 1.4 Fixed Elevator not working after failing once. [L0ne_W0lf]
 //= 1.5 Lots of Fixes, missing stopnpctimers, cleanup. [Zephyrus]
 //= 1.6 Added missing close in "Popular Feats" [L0ne_W0lf]
 //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 1.8 Updated RE/Pre-RE EXP. [Euphy]
+//= 1.9 Added GM management NPC. [Euphy]
 //============================================================
 
 yuno_in04,190,125,4	script	Scholar	700,{
-
-	switch(yuno_hist)
-	{
-		case 0:
+	switch(yuno_hist) {
+	case 0:
+		mes "[Scholar]";
+		mes "...Mm? ";
+		mes "...Yes?";
+		next;
+		mes "[Scholar]";
+		mes "...";
+		mes "......";
+		mes "May I help you?";
+		next;
+		switch(select("Oh! N-Nothing!:Excuse me...")) {
+		case 1:
 			mes "[Scholar]";
-			mes "...Mm? ";
-			mes "...Yes?";
+			mes "...";
+			mes "......";
+			mes "Hmm?";
+			mes "...........";
+			mes "Hmpf.";
+			close;
+		case 2:
+			mes "[Scholar]";
+			mes "...";
+			mes "......";
+			mes "Hmm?";
+			mes "...........";
+			mes "Hmmm...";
 			next;
 			mes "[Scholar]";
+			mes "You must be lost.";
+			mes "This is the scholarly";
+			mes "research section, you know,";
+			mes "content you couldn't possibly";
+			mes "fathom. The popular novels and picture books are someplace else.";
+			next;
+			mes "["+strcharinfo(0)+"]";
 			mes "...";
 			mes "......";
-			mes "May I help you?";
 			next;
-			switch( select( "Oh! N-Nothing!","Excuse me..." ) )
-			{
-				case 1:
-					mes "[Scholar]";
-					mes "...";
-					mes "......";
-					mes "Hmm?";
-					mes "...........";
-					mes "Hmpf.";
-					close;
-			
-				case 2:
-					mes "[Scholar]";
-					mes "...";
-					mes "......";
-					mes "Hmm?";
-					mes "...........";
-					mes "Hmmm...";
-					next;
-					mes "[Scholar]";
-					mes "You must be lost.";
-					mes "This is the scholarly";
-					mes "research section, you know,";
-					mes "content you couldn't possibly";
-					mes "fathom. The popular novels and picture books are someplace else.";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "...";
-					mes "......";
-					next;
-					mes "[Scholar]";
-					mes "Why don't you rummage";
-					mes "through the bookshelves?";
-					mes "I'm sure you can find some";
-					mes "book there that can hold your";
-					mes "interest. Well, depending on";
-					mes "your actual attention span...";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "(What's her damage?!";
-					mes "Does she have an attitude problem or is she just stuck-up?)";
-					close;
-			}
-
+			mes "[Scholar]";
+			mes "Why don't you rummage";
+			mes "through the bookshelves?";
+			mes "I'm sure you can find some";
+			mes "book there that can hold your";
+			mes "interest. Well, depending on";
+			mes "your actual attention span...";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "(What's her damage?!";
+			mes "Does she have an attitude problem or is she just stuck-up?)";
+			close;
+		}
+	case 1:
+		mes "[Scholar]";
+		mes "...Mm? ";
+		mes "...Yes?";
+		next;
+		mes "[Scholar]";
+		mes "...";
+		mes "......";
+		mes "May I help you?";
+		next;
+		switch(select("Oh! N-Nothing!:By any chance...")) {
 		case 1:
 			mes "[Scholar]";
-			mes "...Mm? ";
-			mes "...Yes?";
+			mes "...";
+			mes "......";
+			mes "Hmm?";
+			mes "...........";
+			mes "Hmpf.";
+			close;
+		case 2:
+			mes "["+strcharinfo(0)+"]";
+			mes "By any chance...";
+			mes "Are you conducting";
+			mes "research about Juperos?";
 			next;
 			mes "[Scholar]";
+			mes "Why yes, that is";
+			mes "correct. But how did";
+			mes "you come to learn about";
+			mes "my current research project?";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Oh, I managed to read";
+			mes "a thesis paper entitled,";
+			mes "''The Fall of Juperos,'' and";
+			mes "I just thought that the writing";
+			mes "style and your personality";
+			mes "seem to match for some reason.";
+			next;
+			mes "[Scholar]";
+			mes "Oh...! You read my";
+			mes "thesis? So what did";
+			mes "you think about it?";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "So far, it's alright, but";
+			mes "quite frankly it's incomplete.";
+			mes "I mean, you don't have much in";
+			mes "in the way of conjecture, much";
+			mes "less any evidence to back up";
+			mes "any of your statements.";
+			next;
+			mes "[Scholar]";
+			mes "....";
+			mes "Let me apologize for";
+			mes "being rude to you earlier.";
+			mes "As you know, my name is";
+			mes "Fayruz Khrhiyha. May I ask";
+			mes "what your name might be?";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "I'm "+strcharinfo(0)+",";
+			mes "a brave adventurer in the";
+			mes "service of his royal majesty,";
+			mes "the wise and benevolent";
+			mes "King Tristram III.";
+			set yuno_hist,2;
+			next;
+			mes "[Fayruz]";
+			mes "Well, "+strcharinfo(0)+",";
+			mes "I understand that my thesis";
+			mes "still requires more evidence.";
+			mes "But I'd need some ancient";
+			mes "documents from Juperos";
+			mes "to complete my research...";
+			next;
+			mes "[Fayruz]";
+			mes "If you happen to travel";
+			mes "through Juperos and find";
+			mes "any ancient documents, would";
+			mes "you bring them to me? Having";
+			mes "those would help my research";
+			mes "efforts immensely. Thank you...";
+			close;
+		}
+	case 2:
+		if ((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355))) {
+			mes "[Fayruz]";
+			mes "Ah, it's you! Listen,";
+			mes "I just found a record of";
+			mes "an adventurer who explored";
+			mes "Juperos. There's mention";
+			mes "of a stone statue here that";
+			mes "just might be noteworthy...";
+			next;
+			mes "[Fayruz]";
+			mes "If you happen to find";
+			mes "yourself in Juperos,";
+			mes "would you find the stone";
+			mes "statue at the entrance of";
+			mes "its dungeon and read the";
+			mes "engraved message for me?";
+			next;
+			mes "[Fayruz]";
+			mes "According to my notes,";
+			mes "there's a spell that will";
+			mes "make its reader memorize";
+			mes "its message, even if they don't";
+			mes "know the language. So come";
+			mes "to me if you manage to read it.";
+			close;
+		}
+		mes "[Fayruz]";
+		mes "If you ever chance to";
+		mes "travel through Juperos,";
+		mes "would you let me know if you";
+		mes "find anything that might help";
+		mes "my research there? I'd be";
+		mes "very grateful for your help.";
+		close;
+	case 3:
+		mes "[Fayruz]";
+		mes "Well, you look";
+		mes "quite pleased.";
+		mes "May I asked what";
+		mes "happened to put that";
+		mes "expression on your face?";
+		next;
+		switch(select("I found something in Juperos.:Nothing much.")) {
+		case 1:
+			mes "[" +strcharinfo(0)+"]";
+			mes "I went to Juperos like";
+			mes "you asked and found that";
+			mes "stone statue you were talking";
+			mes "about. Just like you said, there was an engraved message on it.";
+			next;
+			mes "[Fayruz]";
+			mes "Fascinating!";
+			mes "So is it really enchanted";
+			mes "so anyone can memorize it?";
+			mes "Wh-what does the message say?";
+			next;
+			mes "^3355FFYou recite the message";
+			mes "engraved on the stone";
+			mes "statue, unable to interpret";
+			mes "the sounds you're uttering,";
+			mes "but weirdly enough, you can";
+			mes "easily recall them from memory.^000000";
+			next;
+			mes "[Fayruz]";
+			mes "Ah, I see! Wait,";
+			mes "give me a moment to";
+			mes "properly translate this...";
+			next;
 			mes "...";
 			mes "......";
-			mes "May I help you?";
+			mes ".........";
 			next;
-			switch( select( "Oh! N-Nothing!","By any chance..." ) )
-			{
-				case 1:
-					mes "[Scholar]";
-					mes "...";
-					mes "......";
-					mes "Hmm?";
-					mes "...........";
-					mes "Hmpf.";
-					close;
-			
-				case 2:
-					mes "["+strcharinfo(0)+"]";
-					mes "By any chance...";
-					mes "Are you conducting";
-					mes "research about Juperos?";
-					next;
-					mes "[Scholar]";
-					mes "Why yes, that is";
-					mes "correct. But how did";
-					mes "you come to learn about";
-					mes "my current research project?";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "Oh, I managed to read";
-					mes "a thesis paper entitled,";
-					mes "''The Fall of Juperos,'' and";
-					mes "I just thought that the writing";
-					mes "style and your personality";
-					mes "seem to match for some reason.";
-					next;
-					mes "[Scholar]";
-					mes "Oh...! You read my";
-					mes "thesis? So what did";
-					mes "you think about it?";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "So far, it's alright, but";
-					mes "quite frankly it's incomplete.";
-					mes "I mean, you don't have much in";
-					mes "in the way of conjecture, much";
-					mes "less any evidence to back up";
-					mes "any of your statements.";
-					next;
-					mes "[Scholar]";
-					mes "....";
-					mes "Let me apologize for";
-					mes "being rude to you earlier.";
-					mes "As you know, my name is";
-					mes "Fayruz Khrhiyha. May I ask";
-					mes "what your name might be?";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "I'm "+strcharinfo(0)+",";
-					mes "a brave adventurer in the";
-					mes "service of his royal majesty,";
-					mes "the wise and benevolent";
-					mes "King Tristram III.";
-					set yuno_hist,2;
-					next;
-					mes "[Fayruz]";
-					mes "Well, "+strcharinfo(0)+",";
-					mes "I understand that my thesis";
-					mes "still requires more evidence.";
-					mes "But I'd need some ancient";
-					mes "documents from Juperos";
-					mes "to complete my research...";
-					next;
-					mes "[Fayruz]";
-					mes "If you happen to travel";
-					mes "through Juperos and find";
-					mes "any ancient documents, would";
-					mes "you bring them to me? Having";
-					mes "those would help my research";
-					mes "efforts immensely. Thank you...";
-					close;
-			}
-
+			mes "[Fayruz]";
+			mes "It means, ''Do you wish to";
+			mes "see the end of the madness?";
+			mes "He is waiting where the three";
+			mes "columns were destroyed, where";
+			mes "two hundred illusions wander.''";
+			next;
+			mes "[Fayruz]";
+			mes "''You will see him, the one";
+			mes "who was vain and extravagant,";
+			mes "with your own eyes at the place where the light passes through.";
+			set yuno_hist,4;
+			next;
+			mes "[Fayruz]";
+			mes "Ah, usually, descriptions";
+			mes "of the ''vain and extravagant";
+			mes "one'' refer to the mad scientist rumored to have lived in that";
+			mes "ancient era. But if this is true, I may have to rework my thesis...";
+			next;
+			mes "[Fayruz]";
+			mes "I have another favor to";
+			mes "ask of you. If you find any";
+			mes "object of historical significance in Juperos, would you bring it to";
+			mes "me? I'll reward you, of course.";
+			next;
+			mes "[Fayruz]";
+			mes "It would be most helpful";
+			mes "if you could manage to find";
+			mes "documents that existed from that era. Fortunately, back then,";
+			mes "they made all their records on material more durable than paper.";
+			close;
 		case 2:
-			if((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355)))
-			{
+			mes "[Fayruz]";
+			mes "Nothing, huh?";
+			mes "My life is also fairly";
+			mes "uneventful, but somehow,";
+			mes "I'm don't think I'm content.";
+			close;
+		}
+	case 4:
+		mes "[Fayruz]";
+		mes "Oh hello, "+strcharinfo(0)+".";
+		mes "So what brings you to";
+		mes "the Juno Library today?";
+		next;
+		switch(select("Nice weather today, isn't it?:I found something in Juperos.:Nothing much.")) {
+		case 1:
+			mes "[Fayruz]";
+			mes "Well, I wouldn't know.";
+			mes "It's late whenever I go";
+			mes "out, so I always happen to";
+			mes "miss the sunlight. I guess";
+			mes "I really miss nice weather";
+			mes "sometimes, you know?";
+			close;
+		case 2:
+			if ((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355))) {
 				mes "[Fayruz]";
-				mes "Ah, it's you! Listen,";
-				mes "I just found a record of";
-				mes "an adventurer who explored";
-				mes "Juperos. There's mention";
-				mes "of a stone statue here that";
-				mes "just might be noteworthy...";
+				mes "Oh, really?!";
+				mes "That's great news!";
+				mes "W-what did you find?";
 				next;
-				mes "[Fayruz]";
-				mes "If you happen to find";
-				mes "yourself in Juperos,";
-				mes "would you find the stone";
-				mes "statue at the entrance of";
-				mes "its dungeon and read the";
-				mes "engraved message for me?";
+				mes "^3355FFIn her excitement,";
+				mes "Fayruz begins to";
+				mes "rummage through your";
+				mes "things before you get";
+				mes "the chance to answer her.^000000";
 				next;
 				mes "[Fayruz]";
-				mes "According to my notes,";
-				mes "there's a spell that will";
-				mes "make its reader memorize";
-				mes "its message, even if they don't";
-				mes "know the language. So come";
-				mes "to me if you manage to read it.";
-				close;
+				mes "Oh, this must be it!";
+				mes "Would you mind if I keep";
+				mes "this Transparent Plate for";
+				mes "my research? In return, I'll";
+				mes "tell you some tales about";
+				mes "Juperos that I've learned.";
+				next;
+				switch(select("Please, be my guest.:No way, you can't have it.")) {
+				case 1:
+					if (countitem(7352)) callfunc "Func_JupHist",7352,1;
+					else if (countitem(7353)) callfunc "Func_JupHist",7353,2;
+					else if (countitem(7354)) callfunc "Func_JupHist",7354,4;
+					else if (countitem(7355)) callfunc "Func_JupHist",7352,8;
+				case 2:
+					mes "[Fayruz]";
+					mes "Mm? Are you serious?";
+					mes "This object is very valuable";
+					mes "to a researcher like me, but";
+					mes "I have no idea what use it";
+					mes "would be for an adventurer.";
+					mes "Well, you have your reasons...";
+					close;
+				}
 			}
 			mes "[Fayruz]";
-			mes "If you ever chance to";
-			mes "travel through Juperos,";
-			mes "would you let me know if you";
-			mes "find anything that might help";
-			mes "my research there? I'd be";
-			mes "very grateful for your help.";
+			mes "Oh, really?!";
+			mes "That's great news!";
+			mes "W-what did you find?";
+			next;
+			mes "^3355FFIn her excitement,";
+			mes "Fayruz begins to";
+			mes "rummage through your";
+			mes "things before you get";
+			mes "the chance to answer her.^000000";
+			next;
+			mes "[Fayruz]";
+			mes "Oh. There isn't anything";
+			mes "here that would help in my";
+			mes "research, but thank you anyway.";
+			mes "If you find anything else while";
+			mes "you're in Juperos, please come back and show it to me, alright?";
 			close;
-
 		case 3:
 			mes "[Fayruz]";
-			mes "Well, you look";
-			mes "quite pleased.";
-			mes "May I asked what";
-			mes "happened to put that";
-			mes "expression on your face?";
+			mes "Ah, I see. Well, while";
+			mes "you're here, why don't you";
+			mes "read something? There are";
+			mes "many books that cover some";
+			mes "interesting topics, like the";
+			mes "Schwaltzvalt economy...";
 			next;
-			switch( select( "I found something in Juperos.","Nothing much." ) )
-			{
-		
-				case 1:
-					mes "[" +strcharinfo(0)+"]";
-					mes "I went to Juperos like";
-					mes "you asked and found that";
-					mes "stone statue you were talking";
-					mes "about. Just like you said, there was an engraved message on it.";
-					next;
-					mes "[Fayruz]";
-					mes "Fascinating!";
-					mes "So is it really enchanted";
-					mes "so anyone can memorize it?";
-					mes "Wh-what does the message say?";
-					next;
-					mes "^3355FFYou recite the message";
-					mes "engraved on the stone";
-					mes "statue, unable to interpret";
-					mes "the sounds you're uttering,";
-					mes "but weirdly enough, you can";
-					mes "easily recall them from memory.^000000";
-					next;
-					mes "[Fayruz]";
-					mes "Ah, I see! Wait,";
-					mes "give me a moment to";
-					mes "properly translate this...";
-					next;
-					mes "...";
-					mes "......";
-					mes ".........";
-					next;
-					mes "[Fayruz]";
-					mes "It means, ''Do you wish to";
-					mes "see the end of the madness?";
-					mes "He is waiting where the three";
-					mes "columns were destroyed, where";
-					mes "two hundred illusions wander.''";
-					next;
-					mes "[Fayruz]";
-					mes "''You will see him, the one";
-					mes "who was vain and extravagant,";
-					mes "with your own eyes at the place where the light passes through.";
-					set yuno_hist,4;
-					next;
-					mes "[Fayruz]";
-					mes "Ah, usually, descriptions";
-					mes "of the ''vain and extravagant";
-					mes "one'' refer to the mad scientist rumored to have lived in that";
-					mes "ancient era. But if this is true, I may have to rework my thesis...";
-					next;
-					mes "[Fayruz]";
-					mes "I have another favor to";
-					mes "ask of you. If you find any";
-					mes "object of historical significance in Juperos, would you bring it to";
-					mes "me? I'll reward you, of course.";
-					next;
-					mes "[Fayruz]";
-					mes "It would be most helpful";
-					mes "if you could manage to find";
-					mes "documents that existed from that era. Fortunately, back then,";
-					mes "they made all their records on material more durable than paper.";
-					close;
-
-				case 2:
-					mes "[Fayruz]";
-					mes "Nothing, huh?";
-					mes "My life is also fairly";
-					mes "uneventful, but somehow,";
-					mes "I'm don't think I'm content.";
-					close;
+			mes "[Fayruz]";
+			mes "Oh, in any case, please";
+			mes "don't forget the favor I asked";
+			mes "of you. If you find anything";
+			mes "in Juperos that's historically";
+			mes "significant, I'd appreciate it";
+			mes "if you bring it right away.";
+			close;
+		}
+	case 5:
+		mes "[Fayruz]";
+		mes "Oh, "+strcharinfo(0)+"!";
+		mes "Have you come back with";
+		mes "something from Juperos?";
+		mes "I've been hoping you'd come";
+		mes "back with something that'd";
+		mes "help me in my research!";
+		next;
+		switch(select("Take a look at this.:Oh, I'm sorry...")) {
+		case 1:
+			switch(jupe_hist) {
+				case 1: callfunc "Func_JupHist",7353,7354,7355,7352;
+				case 2: callfunc "Func_JupHist",7352,7354,7355,7353;
+				case 4: callfunc "Func_JupHist",7352,7353,7355,7354;
+				case 8: callfunc "Func_JupHist",7352,7353,7354,7355;
 			}
-
-		case 4:
+		case 2:
 			mes "[Fayruz]";
-			mes "Oh hello, "+strcharinfo(0)+".";
-			mes "So what brings you to";
-			mes "the Juno Library today?";
+			mes "Ah, I see. Well, while";
+			mes "you're here, why don't you";
+			mes "read something? There are";
+			mes "many books that cover some";
+			mes "interesting topics, like...";
+			mes "like... Self-Honesty (?).";
 			next;
-			switch( select ( "Nice weather today, isn't it?","I found something in Juperos.","Nothing much.") )
-			{
-				case 1:
-					mes "[Fayruz]";
-					mes "Well, I wouldn't know.";
-					mes "It's late whenever I go";
-					mes "out, so I always happen to";
-					mes "miss the sunlight. I guess";
-					mes "I really miss nice weather";
-					mes "sometimes, you know?";
-					close;
-			
-				case 2:
-					if((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355)))
-					{
-						mes "[Fayruz]";
-						mes "Oh, really?!";
-						mes "That's great news!";
-						mes "W-what did you find?";
-						next;
-						mes "^3355FFIn her excitement,";
-						mes "Fayruz begins to";
-						mes "rummage through your";
-						mes "things before you get";
-						mes "the chance to answer her.^000000";
-						next;
-						mes "[Fayruz]";
-						mes "Oh, this must be it!";
-						mes "Would you mind if I keep";
-						mes "this Transparent Plate for";
-						mes "my research? In return, I'll";
-						mes "tell you some tales about";
-						mes "Juperos that I've learned.";
-						next;
-						switch( select ("Please, be my guest.","No way, you can't have it.") )
-						{
-							case 1:
-								if(countitem(7352)) callfunc "Func_JupHist",7352,1;
-								else if(countitem(7353)) callfunc "Func_JupHist",7353,2;
-								else if(countitem(7354)) callfunc "Func_JupHist",7354,4;
-								else if(countitem(7355)) callfunc "Func_JupHist",7352,8;
-
-		
-							case 2:
-								mes "[Fayruz]";
-								mes "Mm? Are you serious?";
-								mes "This object is very valuable";
-								mes "to a researcher like me, but";
-								mes "I have no idea what use it";
-								mes "would be for an adventurer.";
-								mes "Well, you have your reasons...";
-								close;
-						}
-					}
-					mes "[Fayruz]";
-					mes "Oh, really?!";
-					mes "That's great news!";
-					mes "W-what did you find?";
-					next;
-					mes "^3355FFIn her excitement,";
-					mes "Fayruz begins to";
-					mes "rummage through your";
-					mes "things before you get";
-					mes "the chance to answer her.^000000";
-					next;
-					mes "[Fayruz]";
-					mes "Oh. There isn't anything";
-					mes "here that would help in my";
-					mes "research, but thank you anyway.";
-					mes "If you find anything else while";
-					mes "you're in Juperos, please come back and show it to me, alright?";
-					close;
-		
-				case 3:
-					mes "[Fayruz]";
-					mes "Ah, I see. Well, while";
-					mes "you're here, why don't you";
-					mes "read something? There are";
-					mes "many books that cover some";
-					mes "interesting topics, like the";
-					mes "Schwaltzvalt economy...";
-					next;
-					mes "[Fayruz]";
-					mes "Oh, in any case, please";
-					mes "don't forget the favor I asked";
-					mes "of you. If you find anything";
-					mes "in Juperos that's historically";
-					mes "significant, I'd appreciate it";
-					mes "if you bring it right away.";
-					close;
-				
+			mes "[Fayruz]";
+			mes "Oh, in any case, please";
+			mes "don't forget the favor I asked";
+			mes "of you. If you find anything";
+			mes "in Juperos that's historically";
+			mes "significant, I'd appreciate it";
+			mes "if you bring it right away.";
+			close;
+		}
+	case 6:
+		mes "[Fayruz]";
+		mes "Oh, "+strcharinfo(0)+"!";
+		mes "The Transparent Plate";
+		mes "that you brought for me";
+		mes "last time is really helping me";
+		mes "in my research. If you get the";
+		mes "chance, please bring me more!";
+		set yuno_hist,7;
+		next;
+		mes "[Fayruz]";
+		mes "This new data is adding";
+		mes "a lot more credibility to my";
+		mes "thesis. Oh, I'll be with you";
+		mes "in a moment, let me finish";
+		mes "translating this one last";
+		mes "passage really quickly...";
+		close;
+	case 7:
+		mes "[Fayruz]";
+		mes "Hello, "+strcharinfo(0)+"~";
+		mes "Oh, were you able to look";
+		mes "in Juperos for anything that";
+		mes "might help me in my research?";
+		next;
+		switch(select("Yeah, take a look at this.:No, I'm sorry...")) {
+		case 1:
+			switch(jupe_hist) {
+				case 3: callfunc "Func_JupHist",7354,7355,7352,7353;
+				case 5: callfunc "Func_JupHist",7353,7355,7352,7354;
+				case 6: callfunc "Func_JupHist",7352,7355,7353,7354;
+				case 9: callfunc "Func_JupHist",7353,7354,7352,7355;
+				case 10: callfunc "Func_JupHist",7352,7354,7353,7355;
+				case 12: callfunc "Func_JupHist",7352,7353,7354,7355;
 			}
-
-		case 5:
+		case 2:
+			mes "[Fayruz]";
+			mes "Oh, that's fine.";
+			mes "Besides, I don't really";
+			mes "have a deadline to complete";
+			mes "this research project. Still,";
+			mes "I just want you to know that";
+			mes "I really appreciate your help.";
+			close;
+		}
+	case 8:
+		mes "[Fayruz]";
+		mes ""+strcharinfo(0)+"...";
+		mes "I'm having great difficulty in";
+		mes "translating that Transparent";
+		mes "Plate you brought for me that";
+		mes "last time. I'm so frustrated...";
+		next;
+		mes "[Fayruz]";
+		mes "Wait a minute...";
+		mes "This here means...";
+		mes "Alright. Okay. Yes.";
+		mes "Yes! Of course, how";
+		mes "could I not see it before!";
+		set yuno_hist,9;
+		next;
+		mes "[Fayruz]";
+		mes "I'll be with you";
+		mes "in just a second!";
+		mes "I think I just made";
+		mes "a real through...!";
+		next;
+	case 9:
+		mes "[Fayruz]";
+		mes "Ah, I've been";
+		mes "expecting you, "+strcharinfo(0)+".";
+		mes "So did you have been to Juperos again? I'm really hoping that you";
+		mes "were able to find something new that would help in my research...";
+		next;
+		switch(select("Actually, I did find this...:I'm sorry, I haven't...")) {
+		case 1:
+			switch(jupe_hist) {
+				case 7: callfunc "Func_JupHist",7355,7352,7353,7354;
+				case 11: callfunc "Func_JupHist",7354,7352,7353,7355;
+				case 13: callfunc "Func_JupHist",7353,7352,7354,7355;
+				case 14: callfunc "Func_JupHist",7352,7353,7354,7355;
+			}
+		case 2:
 			mes "[Fayruz]";
-			mes "Oh, "+strcharinfo(0)+"!";
-			mes "Have you come back with";
-			mes "something from Juperos?";
-			mes "I've been hoping you'd come";
-			mes "back with something that'd";
-			mes "help me in my research!";
+			mes "Ah, I see. Well, while";
+			mes "you're here, why don't you";
+			mes "read something? There are";
+			mes "many books that cover some";
+			mes "interesting topics, like";
+			mes "modern adventure history.";
 			next;
-			switch( select( "Take a look at this.","Oh, I'm sorry...") )
-			{
-				case 1:
-					switch(jupe_hist)
-					{
-						case 1:
-							callfunc "Func_JupHist",7353,7354,7355,7352;
-
-						case 2:
-							callfunc "Func_JupHist",7352,7354,7355,7353;
-
-						case 4:
-							callfunc "Func_JupHist",7352,7353,7355,7354;
-
-						case 8:
-							callfunc "Func_JupHist",7352,7353,7354,7355;
-					}
-
-				case 2:
-					mes "[Fayruz]";
-				mes "Ah, I see. Well, while";
-				mes "you're here, why don't you";
-				mes "read something? There are";
-				mes "many books that cover some";
-				mes "interesting topics, like...";
-				mes "like... Self-Honesty (?).";
+			mes "[Fayruz]";
+			mes "Oh, in any case, please";
+			mes "don't forget the favor I asked";
+			mes "of you. If you find anything";
+			mes "in Juperos that's historically";
+			mes "significant, I'd appreciate it";
+			mes "if you bring it right away.";
+			close;
+		}
+	case 10:
+		mes "[Fayruz]";
+		mes "Oh hello, "+strcharinfo(0)+"...";
+		mes "So what exactly brings you";
+		mes "to the Juno Library this time?";
+		next;
+		switch(select("I found another Transparent Plate.:Just visiting, really.")) {
+		case 1:
+			if ((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355))) {
+				mes "[Fayruz]";
+				mes "Hmm, well, we've made as";
+				mes "much headway as we can";
+				mes "with the Transparent Plates";
+				mes "you've already given me, but";
+				mes "it can't hurt to have too much";
+				mes "evidence to back my theories.";
 				next;
 				mes "[Fayruz]";
-				mes "Oh, in any case, please";
-				mes "don't forget the favor I asked";
-				mes "of you. If you find anything";
-				mes "in Juperos that's historically";
-				mes "significant, I'd appreciate it";
-				mes "if you bring it right away.";
+				mes "I really appreciate";
+				mes "your continuing efforts";
+				mes "to help me. Please, would";
+				mes "you take this as my way";
+				mes "saying ''Thanks?'' You've been";
+				mes "great, "+strcharinfo(0)+"...";
+				if (countitem(7352)) delitem 7352,1;
+				else if (countitem(7353)) delitem 7353,1;
+				else if (countitem(7354)) delitem 7354,1;
+				else delitem 7355,1;
+				getitem 644,1;
 				close;
 			}
-
-		case 6:
 			mes "[Fayruz]";
-			mes "Oh, "+strcharinfo(0)+"!";
-			mes "The Transparent Plate";
-			mes "that you brought for me";
-			mes "last time is really helping me";
-			mes "in my research. If you get the";
-			mes "chance, please bring me more!";
-			set yuno_hist,7;
-			next;
+			mes "Mmm...?";
+			mes "It doesn't look like";
+			mes "you brought another";
+			mes "Transparent Plate.";
+			mes "Are you sure that you";
+			mes "didn't misplace it?";
+			close;
+		case 2:
 			mes "[Fayruz]";
-			mes "This new data is adding";
-			mes "a lot more credibility to my";
-			mes "thesis. Oh, I'll be with you";
-			mes "in a moment, let me finish";
-			mes "translating this one last";
-			mes "passage really quickly...";
+			mes "Ah, I see. Well,";
+			mes "thanks to your help,";
+			mes "I've made a great deal";
+			mes "of progress on my thesis.";
+			mes "I really appreciate what you";
+			mes "have done for me, adventurer.";
 			close;
+		}
+	}
+}
 
-		case 7:
+function	script	Func_JupHist	{
+	switch(yuno_hist) {
+	case 4:
+		mes "[Fayruz]";
+		mes "Thank you so much,";
+		mes "you don't know what";
+		mes "this means to me! Okay,";
+		mes "please relax and take a";
+		mes "seat. Close your eyes while";
+		mes "I tell you this ancient story.";
+		next;
+		mes "^3355FFFayruz begins to";
+		mes "relate an ancient tale";
+		mes "about Juperos that seems";
+		mes "typical for a classic story, but her way of storytelling subtly";
+		mes "draws you into a vicarious, yet extremely vivid experience.";
+		next;
+		mes "^3355FFYou feel the protagonist's";
+		mes "glories and tragedies as if";
+		mes "you were actually there with";
+		mes "the hero on his journeys. The";
+		mes "tale eventually comes to an end";
+		mes "and you awaken from the trance,";
+		mes "gently brought back to reality.^000000";
+		delitem getarg(0),1;
+		set yuno_hist,5;
+		set jupe_hist,getarg(1);
+		getexp (checkre(3))?10000:100000,0;
+		next;
+		mes "[Fayruz]";
+		mes "Everyone can relate";
+		mes "to these old, classic";
+		mes "stories. I hope this tale had";
+		mes "as meaning for you as it did";
+		mes "for me when I first heard it.";
+		next;
+		mes "[Fayruz]";
+		mes "If you can find me";
+		mes "another artifact from";
+		mes "Juperos, I'll share another";
+		mes "tale like that with you. Now";
+		mes "how does that sound? Okay";
+		mes "then, I'll see you, adventurer~";
+		close;
+	case 5:
+		if ((countitem(getarg(0))) || (countitem(getarg(1))) || (countitem(getarg(2)))) {
 			mes "[Fayruz]";
-			mes "Hello, "+strcharinfo(0)+"~";
-			mes "Oh, were you able to look";
-			mes "in Juperos for anything that";
-			mes "might help me in my research?";
+			mes "Oh, that's unexpected.";
+			mes "This Transparent Plate";
+			mes "seems to have been made";
+			mes "in a different era than the";
+			mes "one you gave me earlier.";
+			mes "How intriguing...";
 			next;
-			switch( select( "Yeah, take a look at this.","No, I'm sorry...") )
-			{
-				case 1:
-					switch(jupe_hist)
-					{
-						case 3:
-							callfunc "Func_JupHist",7354,7355,7352,7353;
-
-						case 5:
-							callfunc "Func_JupHist",7353,7355,7352,7354;
-
-						case 6:
-							callfunc "Func_JupHist",7352,7355,7353,7354;
-
-						case 9:
-							callfunc "Func_JupHist",7353,7354,7352,7355;
-
-						case 10:
-							callfunc "Func_JupHist",7352,7354,7353,7355;
-
-						case 12:
-							callfunc "Func_JupHist",7352,7353,7354,7355;
-					}
-
-				case 2:
-					mes "[Fayruz]";
-					mes "Oh, that's fine.";
-					mes "Besides, I don't really";
-					mes "have a deadline to complete";
-					mes "this research project. Still,";
-					mes "I just want you to know that";
-					mes "I really appreciate your help.";
-					close;
+			mes "[Fayruz]";
+			mes "*Sigh* I really wish";
+			mes "that I could explore";
+			mes "Juperos on my own, but";
+			mes "I'm just not strong enough.";
+			mes "In a way, I'm quite jealous of you. But it can't be helped...";
+			next;
+			mes "[Fayruz]";
+			mes "You know, that reminds";
+			mes "me of this great story of";
+			mes "a tragic hero that I'd like to";
+			mes "share with you. Let your";
+			mes "mind wander as I relate this ageless, yet bittersweet tale...";
+			next;
+			mes "^3355FFFayruz tells you a story";
+			mes "with a bright beginning, full";
+			mes "of hope that fills you with the";
+			mes "bliss of the heavens, but then";
+			mes "suddenly plummets you into all the despair and torment of hell.^000000";
+			next;
+			mes "^3355FFThe story finally";
+			mes "reaches its ending";
+			mes "and you're surprised";
+			mes "to find yourself sitting";
+			mes "in the Juno Library.^000000";
+			next;
+			mes "[Fayruz]";
+			mes "I know it's a very";
+			mes "depressing story, but";
+			mes "I hope you enjoyed it.";
+			mes "I think you'd agree that";
+			mes "it contains a truth about";
+			mes "mankind that can't be ignored.";
+			if (countitem(getarg(0))) {
+				delitem getarg(0),1;
+				if (getarg(0) == 7352) set jupe_hist,jupe_hist +1;
+				else set jupe_hist,jupe_hist +2;
 			}
-
-		case 8:
+			else if (countitem(getarg(1))) {
+				delitem getarg(1),1;
+				if (getarg(1) == 7353) set jupe_hist,jupe_hist +2;
+				else set jupe_hist,jupe_hist +4;
+			}
+			else {
+				delitem getarg(2),1;
+				if (getarg(2) == 7354) set jupe_hist,jupe_hist +4;
+				else set jupe_hist,jupe_hist +8;
+			}
+			set yuno_hist,6;
+			getexp (checkre(3))?10000:100000,0;
+			next;
 			mes "[Fayruz]";
-			mes ""+strcharinfo(0)+"...";
-			mes "I'm having great difficulty in";
-			mes "translating that Transparent";
-			mes "Plate you brought for me that";
-			mes "last time. I'm so frustrated...";
+			mes "By now I'm sure you've";
+			mes "figured that these classic";
+			mes "tales are like condensed";
+			mes "experiences, refined and";
+			mes "immutable truths that we";
+			mes "can see in our own reality.";
 			next;
 			mes "[Fayruz]";
-			mes "Wait a minute...";
-			mes "This here means...";
-			mes "Alright. Okay. Yes.";
-			mes "Yes! Of course, how";
-			mes "could I not see it before!";
-			set yuno_hist,9;
+			mes "If you find more of";
+			mes "these Transparent";
+			mes "Plates in Juperos, I'd be";
+			mes "very happy to share another";
+			mes "story with you, "+strcharinfo(0)+".";
+			close;
+		}
+		else if (countitem(getarg(3))) {
+			mes "[Fayruz]";
+			mes "Oh, this one seems";
+			mes "to have been created";
+			mes "in a similar era as the";
+			mes "one you gave me earlier.";
+			mes "I'm not sure how much new";
+			mes "information this may provide...";
 			next;
 			mes "[Fayruz]";
-			mes "I'll be with you";
-			mes "in just a second!";
-			mes "I think I just made";
-			mes "a real through...!";
+			mes "Still, I'm sure this will";
+			mes "helpful in my research. I just";
+			mes "won't be as making progress";
+			mes "as quickly as I had projected.";
+			mes "Please, I'd like you to take this as a token of my gratitude.";
+			delitem getarg(3),1;
+			getitem 644,1;
 			next;
-
-		case 9:
 			mes "[Fayruz]";
-			mes "Ah, I've been";
-			mes "expecting you, "+strcharinfo(0)+".";
-			mes "So did you have been to Juperos again? I'm really hoping that you";
-			mes "were able to find something new that would help in my research...";
+			mes "Now if you'll excuse";
+			mes "me, I need to go back";
+			mes "to compiling my research...";
+			mes "Thank you so much for";
+			mes "your help, "+strcharinfo(0)+".";
+			close;
+		}
+		else {
+			mes "[Fayruz]";
+			mes "Oh. There isn't anything";
+			mes "here that would help in my";
+			mes "research, but thank you anyway.";
+			mes "If you find anything else while";
+			mes "you're in Juperos, please come back and show it to me, alright?";
+			close;
+		}
+	case 7:
+		if ((countitem(getarg(0))) || (countitem(getarg(1)))) {
+			mes "[Fayruz]";
+			mes "Is this another";
+			mes "Transparent Plate?";
+			mes "Yes, it's quite different";
+			mes "than the last one you";
+			mes "brought over to me...";
+			mes "This is so exciting!";
 			next;
-			switch( select("Actually, I did find this...","I'm sorry, I haven't...") )
-			{
-				case 1:
-					switch(jupe_hist)
-					{
-						case 7:
-							callfunc "Func_JupHist",7355,7352,7353,7354;
-
-						case 11:
-							callfunc "Func_JupHist",7354,7352,7353,7355;
-
-						case 13:
-							callfunc "Func_JupHist",7353,7352,7354,7355;
-
-						case 14:
-							callfunc "Func_JupHist",7352,7353,7354,7355;
-					}
-
-				case 2:
-					mes "[Fayruz]";
-					mes "Ah, I see. Well, while";
-					mes "you're here, why don't you";
-					mes "read something? There are";
-					mes "many books that cover some";
-					mes "interesting topics, like";
-					mes "modern adventure history.";
-					next;
-					mes "[Fayruz]";
-					mes "Oh, in any case, please";
-					mes "don't forget the favor I asked";
-					mes "of you. If you find anything";
-					mes "in Juperos that's historically";
-					mes "significant, I'd appreciate it";
-					mes "if you bring it right away.";
-					close;
-			}
-
-		case 10:
 			mes "[Fayruz]";
-			mes "Oh hello, "+strcharinfo(0)+"...";
-			mes "So what exactly brings you";
-			mes "to the Juno Library this time?";
+			mes "Oh. You must be thinking";
+			mes "that I'm a complete academia";
+			mes "addict. Well, my life might be";
+			mes "a little uneventful, but there";
+			mes "are other things I think about!";
+			mes "Like, well... It's weird but...";
 			next;
-			switch( select("I found another Transparent Plate.","Just visiting, really.") )
-			{
-				case 1:
-					if((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355)))
-					{
-						mes "[Fayruz]";
-						mes "Hmm, well, we've made as";
-						mes "much headway as we can";
-						mes "with the Transparent Plates";
-						mes "you've already given me, but";
-						mes "it can't hurt to have too much";
-						mes "evidence to back my theories.";
-						next;
-						mes "[Fayruz]";
-						mes "I really appreciate";
-						mes "your continuing efforts";
-						mes "to help me. Please, would";
-						mes "you take this as my way";
-						mes "saying ''Thanks?'' You've been";
-						mes "great, "+strcharinfo(0)+"...";
-						if(countitem(7352)) delitem 7352,1;
-						else if(countitem(7353)) delitem 7353,1;
-						else if(countitem(7354)) delitem 7354,1;
-						else delitem 7355,1;
-						getitem 644,1;
-						close;
-					}
-					mes "[Fayruz]";
-					mes "Mmm...?";
-					mes "It doesn't look like";
-					mes "you brought another";
-					mes "Transparent Plate.";
-					mes "Are you sure that you";
-					mes "didn't misplace it?";
-					close;
-
-				case 2:
-					mes "[Fayruz]";
-					mes "Ah, I see. Well,";
-					mes "thanks to your help,";
-					mes "I've made a great deal";
-					mes "of progress on my thesis.";
-					mes "I really appreciate what you";
-					mes "have done for me, adventurer.";
-					close;
+			mes "[Fayruz]";
+			mes "You see, there's this";
+			mes "guy that I like. I'm not sure";
+			mes "where he might be now, but";
+			mes "his name is Nadim Amal. He's";
+			mes "my friend's brother who I first";
+			mes "met 10 years ago. ^333333*Sigh...*^000000";
+			next;
+			mes "[Fayruz]";
+			mes "Just recently, I saw";
+			mes "him with his sister, my";
+			mes "friend from Morroc. It's";
+			mes "weird to think that I'd have";
+			mes "these feelings for him after";
+			mes "all this time, isn't it? Oh...!";
+			next;
+			mes "[Fayruz]";
+			mes "I really should repay";
+			mes "you for this Transparent";
+			mes "Plate. Why don't I tell you";
+			mes "the scariest story that I know?";
+			next;
+			mes "^3355FFFayruz tells you a";
+			mes "creepy horror story that";
+			mes "makes you shiver with fear.";
+			mes "You've heard other ghost";
+			mes "stories, but you've never been";
+			mes "so deeply immersed in one before.^000000";
+			next;
+			mes "It is only when the";
+			mes "story ends and you return";
+			mes "to your senses that you notice that you're soaked in cold sweat.^000000";
+			next;
+			mes "[Fayruz]";
+			mes "It may be a natural";
+			mes "response, but all people";
+			mes "fear the unknown in one way";
+			mes "or another. Scary stories are";
+			mes "appealing because we actually";
+			mes "like the strange and grotesque.";
+			if (countitem(getarg(0))) {
+				delitem getarg(0),1;
+				if (getarg(0) == 7352) set jupe_hist,jupe_hist +1;
+				else if (getarg(0) == 7353) set jupe_hist,jupe_hist +2;
+				else set jupe_hist,jupe_hist +4;
 			}
-	}
-
-
-}
-
-function	script	Func_JupHist	{
-
-	switch(yuno_hist)
-	{
-		case 4:
+			else if (countitem(getarg(1))) {
+				delitem getarg(1),1;
+				if (getarg(1) == 7353) set jupe_hist,jupe_hist +2;
+				else if (getarg(1) == 7354) set jupe_hist,jupe_hist +4;
+				else set jupe_hist,jupe_hist +8;
+			}
+			set yuno_hist,8;
+			getexp (checkre(3))?10000:100000,0;
+			next;
+			mes "[Fayruz]";
+			mes "Well... That's just my";
+			mes "opinion. Anyway, if you";
+			mes "find anything else in Juperos";
+			mes "that may help in my research,";
+			mes "please come back and show it";
+			mes "to me, alright? See you later~";
+			close;
+		}
+		else if ((countitem(getarg(2))) || (countitem(getarg(3)))) {
 			mes "[Fayruz]";
-			mes "Thank you so much,";
-			mes "you don't know what";
-			mes "this means to me! Okay,";
-			mes "please relax and take a";
-			mes "seat. Close your eyes while";
-			mes "I tell you this ancient story.";
+			mes "Oh, this one seems";
+			mes "to have been created";
+			mes "in a similar era as the";
+			mes "one you gave me earlier.";
+			mes "I'm not sure how much new";
+			mes "information this may provide...";
 			next;
-			mes "^3355FFFayruz begins to";
-			mes "relate an ancient tale";
-			mes "about Juperos that seems";
-			mes "typical for a classic story, but her way of storytelling subtly";
-			mes "draws you into a vicarious, yet extremely vivid experience.";
+			mes "[Fayruz]";
+			mes "Still, I'm sure this will";
+			mes "helpful in my research. I just";
+			mes "won't be as making progress";
+			mes "as quickly as I had projected.";
+			mes "Please, I'd like you to take this as a token of my gratitude.";
+			next;
+			mes "[Fayruz]";
+			mes "Now if you'll excuse";
+			mes "me, I need to go back";
+			mes "to compiling my research...";
+			mes "Thank you so much for";
+			mes "your help, "+strcharinfo(0)+".";
+			if (countitem(getarg(2))) delitem getarg(2),1;
+			else if (countitem(getarg(3))) delitem getarg(3),1;
+			getitem 644,1;
+			close;
+		}
+		else {
+			mes "[Fayruz]";
+			mes "Oh. There isn't anything";
+			mes "here that would help in my";
+			mes "research, but thank you anyway.";
+			mes "If you find anything else while";
+			mes "you're in Juperos, please come back and show it to me, alright?";
+			close;
+		}
+	case 9:
+		if (countitem(getarg(0))) {
+			mes "[Fayruz]";
+			mes "Oooh...! This one is";
+			mes "much different than the";
+			mes "other ones you gave me";
+			mes "before. This should provide";
+			mes "a wealth of brand new insights";
+			mes "into the Juperos civilization!";
+			next;
+			mes "[Fayruz]";
+			mes "All the Transparent";
+			mes "Plates you've given me";
+			mes "should contain more than";
+			mes "enough data for me to fully";
+			mes "complete my research thesis.";
+			mes "Once again, thank you so much~";
 			next;
-			mes "^3355FFYou feel the protagonist's";
-			mes "glories and tragedies as if";
-			mes "you were actually there with";
-			mes "the hero on his journeys. The";
-			mes "tale eventually comes to an end";
-			mes "and you awaken from the trance,";
-			mes "gently brought back to reality.^000000";
+			mes "[Fayruz]";
+			mes "Still, that doesn't mean that";
+			mes "I will stop collecting data for";
+			mes "my research. Anyway, I have one last story to tell you, about";
+			mes "a man of pure heart chosen by the gods to serve and protect mankind.";
+			next;
+			mes "[Fayruz]";
+			mes "For this purpose he was given";
+			mes "gaudy armor which contained";
+			mes "amazing powers, as well as a";
+			mes "book detailing the instructions";
+			mes "for its use. However, he promptly";
+			mes "lost these instructions...";
+			next;
+			mes "^3355FFThe story about the";
+			mes "greatest Juperosian hero";
+			mes "that Fayruz tells you is very";
+			mes "humorous at first, but then it";
+			mes "covers the entire spectrum";
+			mes "of emotion and humanity...";
+			next;
+			mes "^3355FFThe story ends and you";
+			mes "are left with a swelling";
+			mes "feeling of indefatigable";
+			mes "hope and inspiration...";
+			mes "You can make it if you try!^000000";
+			if (getarg(0) == 7352) set jupe_hist,jupe_hist+1;
+			else if (getarg(0) == 7353) set jupe_hist,jupe_hist+2;
+			else if (getarg(0) == 7354) set jupe_hist,jupe_hist+4;
+			else set jupe_hist,jupe_hist+8;
+			set yuno_hist,10;
 			delitem getarg(0),1;
-			set yuno_hist,5;
-			set jupe_hist,getarg(1);
-			getexp 10000,0;
+			getexp (checkre(3))?10000:100000,0;
+			next;
+			mes "[Fayruz]";
+			mes "Well, that is the";
+			mes "last and the best story";
+			mes "that I have to share";
+			mes "with you. Perhaps next";
+			mes "time, I'll fill you in on my";
+			mes "research progress~";
+			close;
+		}
+		else if ((countitem(getarg(1))) || (countitem(getarg(2))) || (countitem(getarg(3)))) {
+			mes "[Fayruz]";
+			mes "Hmm...";
+			mes "This one seems to be created in a similar time";
+			mes "as the previous one.";
 			next;
 			mes "[Fayruz]";
-			mes "Everyone can relate";
-			mes "to these old, classic";
-			mes "stories. I hope this tale had";
-			mes "as meaning for you as it did";
-			mes "for me when I first heard it.";
+			mes "Don't you worry.";
+			mes "This will help my research of course,";
+			mes "although I do not think this will";
+			mes "help me in advancing my research";
+			mes "with a great speed unlike this other one.";
 			next;
 			mes "[Fayruz]";
-			mes "If you can find me";
-			mes "another artifact from";
-			mes "Juperos, I'll share another";
-			mes "tale like that with you. Now";
-			mes "how does that sound? Okay";
-			mes "then, I'll see you, adventurer~";
+			mes "Please take this as a token of my gratitude.";
+			next;
+			mes "[Fayruz]";
+			mes "Now, excuse me. I need to go back to my research.";
+			if (countitem(getarg(1))) delitem getarg(1),1;
+			else if (countitem(getarg(2))) delitem getarg(2),1;
+			else delitem getarg(3),1;
+			getitem 644,1;
 			close;
-
-		case 5:
-			if((countitem(getarg(0))) || (countitem(getarg(1))) || (countitem(getarg(2))))
-			{
-				mes "[Fayruz]";
-				mes "Oh, that's unexpected.";
-				mes "This Transparent Plate";
-				mes "seems to have been made";
-				mes "in a different era than the";
-				mes "one you gave me earlier.";
-				mes "How intriguing...";
-				next;
-				mes "[Fayruz]";
-				mes "*Sigh* I really wish";
-				mes "that I could explore";
-				mes "Juperos on my own, but";
-				mes "I'm just not strong enough.";
-				mes "In a way, I'm quite jealous of you. But it can't be helped...";
-				next;
-				mes "[Fayruz]";
-				mes "You know, that reminds";
-				mes "me of this great story of";
-				mes "a tragic hero that I'd like to";
-				mes "share with you. Let your";
-				mes "mind wander as I relate this ageless, yet bittersweet tale...";
-				next;
-				mes "^3355FFFayruz tells you a story";
-				mes "with a bright beginning, full";
-				mes "of hope that fills you with the";
-				mes "bliss of the heavens, but then";
-				mes "suddenly plummets you into all the despair and torment of hell.^000000";
-				next;
-				mes "^3355FFThe story finally";
-				mes "reaches its ending";
-				mes "and you're surprised";
-				mes "to find yourself sitting";
-				mes "in the Juno Library.^000000";
-				next;
-				mes "[Fayruz]";
-				mes "I know it's a very";
-				mes "depressing story, but";
-				mes "I hope you enjoyed it.";
-				mes "I think you'd agree that";
-				mes "it contains a truth about";
-				mes "mankind that can't be ignored.";
-				if(countitem(getarg(0)))
-				{
-					delitem getarg(0),1;
-					if(getarg(0) == 7352) set jupe_hist,jupe_hist +1;
-					else set jupe_hist,jupe_hist +2;
-				}
-				else if(countitem(getarg(1)))
-				{
-					delitem getarg(1),1;
-					if(getarg(1) == 7353) set jupe_hist,jupe_hist +2;
-					else set jupe_hist,jupe_hist +4;
-				}
-				else
-				{
-					delitem getarg(2),1;
-					if(getarg(2) == 7354) set jupe_hist,jupe_hist +4;
-					else set jupe_hist,jupe_hist +8;
-				}
-				set yuno_hist,6;
-				getexp 10000,0;
-				next;
-				mes "[Fayruz]";
-				mes "By now I'm sure you've";
-				mes "figured that these classic";
-				mes "tales are like condensed";
-				mes "experiences, refined and";
-				mes "immutable truths that we";
-				mes "can see in our own reality.";
-				next;
-				mes "[Fayruz]";
-				mes "If you find more of";
-				mes "these Transparent";
-				mes "Plates in Juperos, I'd be";
-				mes "very happy to share another";
-				mes "story with you, "+strcharinfo(0)+".";
-				close;
-			}
-			else if(countitem(getarg(3)))
-			{
-				mes "[Fayruz]";
-				mes "Oh, this one seems";
-				mes "to have been created";
-				mes "in a similar era as the";
-				mes "one you gave me earlier.";
-				mes "I'm not sure how much new";
-				mes "information this may provide...";
-				next;
-				mes "[Fayruz]";
-				mes "Still, I'm sure this will";
-				mes "helpful in my research. I just";
-				mes "won't be as making progress";
-				mes "as quickly as I had projected.";
-				mes "Please, I'd like you to take this as a token of my gratitude.";
-				delitem getarg(3),1;
-				getitem 644,1;
-				next;
-				mes "[Fayruz]";
-				mes "Now if you'll excuse";
-				mes "me, I need to go back";
-				mes "to compiling my research...";
-				mes "Thank you so much for";
-				mes "your help, "+strcharinfo(0)+".";
-				close;
-			}
-			else
-			{
-				mes "[Fayruz]";
-				mes "Oh. There isn't anything";
-				mes "here that would help in my";
-				mes "research, but thank you anyway.";
-				mes "If you find anything else while";
-				mes "you're in Juperos, please come back and show it to me, alright?";
-				close;
-			}
-
-		case 7:
-			if((countitem(getarg(0))) || (countitem(getarg(1))))
-			{
-				mes "[Fayruz]";
-				mes "Is this another";
-				mes "Transparent Plate?";
-				mes "Yes, it's quite different";
-				mes "than the last one you";
-				mes "brought over to me...";
-				mes "This is so exciting!";
-				next;
-				mes "[Fayruz]";
-				mes "Oh. You must be thinking";
-				mes "that I'm a complete academia";
-				mes "addict. Well, my life might be";
-				mes "a little uneventful, but there";
-				mes "are other things I think about!";
-				mes "Like, well... It's weird but...";
-				next;
-				mes "[Fayruz]";
-				mes "You see, there's this";
-				mes "guy that I like. I'm not sure";
-				mes "where he might be now, but";
-				mes "his name is Nadim Amal. He's";
-				mes "my friend's brother who I first";
-				mes "met 10 years ago. ^333333*Sigh...*^000000";
-				next;
-				mes "[Fayruz]";
-				mes "Just recently, I saw";
-				mes "him with his sister, my";
-				mes "friend from Morroc. It's";
-				mes "weird to think that I'd have";
-				mes "these feelings for him after";
-				mes "all this time, isn't it? Oh...!";
-				next;
-				mes "[Fayruz]";
-				mes "I really should repay";
-				mes "you for this Transparent";
-				mes "Plate. Why don't I tell you";
-				mes "the scariest story that I know?";
-				next;
-				mes "^3355FFFayruz tells you a";
-				mes "creepy horror story that";
-				mes "makes you shiver with fear.";
-				mes "You've heard other ghost";
-				mes "stories, but you've never been";
-				mes "so deeply immersed in one before.^000000";
-				next;
-				mes "It is only when the";
-				mes "story ends and you return";
-				mes "to your senses that you notice that you're soaked in cold sweat.^000000";
-				next;
-				mes "[Fayruz]";
-				mes "It may be a natural";
-				mes "response, but all people";
-				mes "fear the unknown in one way";
-				mes "or another. Scary stories are";
-				mes "appealing because we actually";
-				mes "like the strange and grotesque.";
-				if(countitem(getarg(0)))
-				{
-					delitem getarg(0),1;
-					if(getarg(0) == 7352) set jupe_hist,jupe_hist +1;
-					else if(getarg(0) == 7353) set jupe_hist,jupe_hist +2;
-					else set jupe_hist,jupe_hist +4;
-				}
-				else if(countitem(getarg(1)))
-				{
-					delitem getarg(1),1;
-					if(getarg(1) == 7353) set jupe_hist,jupe_hist +2;
-					else if(getarg(1) == 7354) set jupe_hist,jupe_hist +4;
-					else set jupe_hist,jupe_hist +8;
-				}
-				set yuno_hist,8;
-				getexp 10000,0;
-				next;
-				mes "[Fayruz]";
-				mes "Well... That's just my";
-				mes "opinion. Anyway, if you";
-				mes "find anything else in Juperos";
-				mes "that may help in my research,";
-				mes "please come back and show it";
-				mes "to me, alright? See you later~";
-				close;
-			}
-			else if((countitem(getarg(2))) || (countitem(getarg(3))))
-			{
-				mes "[Fayruz]";
-				mes "Oh, this one seems";
-				mes "to have been created";
-				mes "in a similar era as the";
-				mes "one you gave me earlier.";
-				mes "I'm not sure how much new";
-				mes "information this may provide...";
-				next;
-				mes "[Fayruz]";
-				mes "Still, I'm sure this will";
-				mes "helpful in my research. I just";
-				mes "won't be as making progress";
-				mes "as quickly as I had projected.";
-				mes "Please, I'd like you to take this as a token of my gratitude.";
-				next;
-				mes "[Fayruz]";
-				mes "Now if you'll excuse";
-				mes "me, I need to go back";
-				mes "to compiling my research...";
-				mes "Thank you so much for";
-				mes "your help, "+strcharinfo(0)+".";
-				if(countitem(getarg(2))) delitem getarg(2),1;
-				else if(countitem(getarg(3))) delitem getarg(3),1;
-				getitem 644,1;
-				close;
-			}
-			else
-			{
-				mes "[Fayruz]";
-				mes "Oh. There isn't anything";
-				mes "here that would help in my";
-				mes "research, but thank you anyway.";
-				mes "If you find anything else while";
-				mes "you're in Juperos, please come back and show it to me, alright?";
-				close;
-			}
-
-		case 9:
-			if(countitem(getarg(0)))
-			{
-				mes "[Fayruz]";
-				mes "Oooh...! This one is";
-				mes "much different than the";
-				mes "other ones you gave me";
-				mes "before. This should provide";
-				mes "a wealth of brand new insights";
-				mes "into the Juperos civilization!";
-				next;
-				mes "[Fayruz]";
-				mes "All the Transparent";
-				mes "Plates you've given me";
-				mes "should contain more than";
-				mes "enough data for me to fully";
-				mes "complete my research thesis.";
-				mes "Once again, thank you so much~";
-				next;
-				mes "[Fayruz]";
-				mes "Still, that doesn't mean that";
-				mes "I will stop collecting data for";
-				mes "my research. Anyway, I have one last story to tell you, about";
-				mes "a man of pure heart chosen by the gods to serve and protect mankind.";
-				next;
-				mes "[Fayruz]";
-				mes "For this purpose he was given";
-				mes "gaudy armor which contained";
-				mes "amazing powers, as well as a";
-				mes "book detailing the instructions";
-				mes "for its use. However, he promptly";
-				mes "lost these instructions...";
-				next;
-				mes "^3355FFThe story about the";
-				mes "greatest Juperosian hero";
-				mes "that Fayruz tells you is very";
-				mes "humorous at first, but then it";
-				mes "covers the entire spectrum";
-				mes "of emotion and humanity...";
-				next;
-				mes "^3355FFThe story ends and you";
-				mes "are left with a swelling";
-				mes "feeling of indefatigable";
-				mes "hope and inspiration...";
-				mes "You can make it if you try!^000000";
-				if(getarg(0) == 7352) set jupe_hist,jupe_hist+1;
-				else if(getarg(0) == 7353) set jupe_hist,jupe_hist+2;
-				else if(getarg(0) == 7354) set jupe_hist,jupe_hist+4;
-				else set jupe_hist,jupe_hist+8;
-				set yuno_hist,10;
-				delitem getarg(0),1;
-				getexp 10000,0;
-				next;
-				mes "[Fayruz]";
-				mes "Well, that is the";
-				mes "last and the best story";
-				mes "that I have to share";
-				mes "with you. Perhaps next";
-				mes "time, I'll fill you in on my";
-				mes "research progress~";
-				close;
-			}
-			else if((countitem(getarg(1))) || (countitem(getarg(2))) || (countitem(getarg(3))))
-			{
-				mes "[Fayruz]";
-				mes "Hmm...";
-				mes "This one seems to be created in a similar time";
-				mes "as the previous one.";
-				next;
-				mes "[Fayruz]";
-				mes "Don't you worry.";
-				mes "This will help my research of course,";
-				mes "although I do not think this will";
-				mes "help me in advancing my research";
-				mes "with a great speed unlike this other one.";
-				next;
-				mes "[Fayruz]";
-				mes "Please take this as a token of my gratitude.";
-				next;
-				mes "[Fayruz]";
-				mes "Now, excuse me. I need to go back to my research.";
-				if(countitem(getarg(1))) delitem getarg(1),1;
-				else if(countitem(getarg(2))) delitem getarg(2),1;
-				else delitem getarg(3),1;
-				getitem 644,1;
-				close;
-			}
-			else
-			{
-				mes "[Fayruz]";
-				mes "Oh. There isn't anything";
-				mes "here that would help in my";
-				mes "research, but thank you anyway.";
-				mes "If you find anything else while";
-				mes "you're in Juperos, please come back and show it to me, alright?";
-				close;
-			}
+		}
+		else {
+			mes "[Fayruz]";
+			mes "Oh. There isn't anything";
+			mes "here that would help in my";
+			mes "research, but thank you anyway.";
+			mes "If you find anything else while";
+			mes "you're in Juperos, please come back and show it to me, alright?";
+			close;
+		}
 	}
 }
 
 yuno_in04,186,125,4	script	Bundle of Files	111,{
-
 	mes "^8B6914*Thesis: The Fall of Juperos*";
 	mes "By Fayruz Khrhiyha";
 	mes "Sage Castle Researcher^000000";
 	next;
-	switch( select("Table of Contents.","Leave it alone.") )
-	{
-		case 1:
-			if(yuno_hist > 4)
-			{
-				mes "^8B6914 1. Preface";
-				mes " 2. Juperos Background";
-				mes " 3. Theory Behind Its Fall^000000";
-				next;
-				switch( select("Preface","Juperos Background","Theory Behind Its Fall","Leave it alone.") )
-				{
-					case 1:
-						mes "^8B6914Scholars are certain";
-						mes "that the Juperos civilization";
-						mes "used to be located above the";
-						mes "ground, but it is now buried";
-						mes "beneath the El Mes Plateau.";
-						mes "The reasons for the city's";
-						if(yuno_hist < 9)
-						{
-							mes "ruin are still nebulous...^000000";
-							next;
-							mes "^8B6914There is much speculation";
-							mes "about the reasons for Jupero's";
-							mes "downfall, but any documentation";
-							mes "from that time period has been";
-							mes "difficult to find. As for now, any evidence we have regarding";
-							mes "Juperos is inconclusive.^000000";
-							next;
-							mes "^8B6914In spite of this lack";
-							mes "of empirical or concrete";
-							mes "data on the civilization of";
-							mes "Juperos, our modern world";
-							mes "may be able to learn much";
-							mes "from that ancient city's ruins.";
-							mes "..................^000000";
-							if(yuno_hist < 7)
-							{
-								next;
-								mes "["+strcharinfo(0)+"]";
-								mes "Hmmm...";
-								mes "A whole chapter";
-								mes "dedicated to saying,";
-								mes "''We know absolutely";
-								mes "nothing about something.''";
-								mes "I should write a book~";
-							}
-							close;
-						}
-						mes "ruin are still in debate...^000000";
-						next;
-						mes "^8B6914However, new findings";
-						mes "regarding the history";
-						mes "of Juperos have allowed";
-						mes "us to make a few conclusions.^000000";
-						close;
-				
-					case 2:
-						if(yuno_hist < 9)
-						{
-							mes "^8B6914...";
-							mes "......";
-							mes "..........^000000";
-							next;
-							mes "["+strcharinfo(0)+"]";
-							mes "This is all just idle";
-							mes "conjecture! This paper";
-							mes "isn't developed enough";
-							mes "yet to be a real thesis...";
-							close;
-						}
-						else if(yuno_hist == 9)
-						{
-							mes "^8B6914Juperos was built over";
-							mes "a thousand years ago in";
-							mes "an era of peace just after";
-							mes "a major war. Contrary to";
-							mes "popular belief, there isn't any";
-							mes "evidence proving that Juno may";
-							mes "have descended from Juperos.^000000";
-							next;
-							mes "^8B6914In fact, there is a";
-							mes "strong possibility that";
-							mes "another war, between Juno";
-							mes "and Juperos, resulted in Juno's";
-							mes "independence from Juperos and";
-							mes "the destruction of any existing";
-							mes "documentation from that era.^000000";
-							next;
-							mes "["+strcharinfo(0)+"]";
-							mes "Yes... Of course!";
-							mes "It all makes sense now!";
-							close;
-						}
-						mes "^8B6914Juperos was built over";
-						mes "a thousand years ago in";
-						mes "an era of peace just after";
-						mes "a major war. There is now";
-						mes "direct evidence linking Juno";
-						mes "to Juperos proving that Juno";
-						mes "was but a part of Juperos.^000000";
-						next;
-						mes "^8B6914Just like Juno, Juperos";
-						mes "was a society that prided";
-						mes "itself on its advancement";
-						mes "in the sciences which played";
-						mes "a permeating role in civilized";
-						mes "life. Science was reponsible for Juperos's rise and downfall.";
-						close;
-
-					case 3:
-						if(yuno_hist < 10)
-						{
-							mes "^8B6914...";
-							mes "......";
-							mes "..........^000000";
-							next;
-							mes "["+strcharinfo(0)+"]";
-							mes "Huh. This writer keeps";
-							mes "talking about theories,";
-							mes "but the more I read, the";
-							mes "less clear I am on what";
-							mes "the theory actually is.";
-							mes "I don't think there is one...";
-							emotion 4,1;
-							close;
-						}
-						mes "^8B6914What is most unsettling";
-						mes "is recent evidence, including";
-						mes "a first hand written account,";
-						mes "regarding the role of one of";
-						mes "Jupero's foremost scientists";
-						mes "in that city's rise and fall.";
-						next;
-						mes "^8B6914If these writings are";
-						mes "authentic, then what actually";
-						mes "happened was that a scientific";
-						mes "revolution occurred as a direct";
-						mes "result of one scientist's effort to manipulate the energies of the";
-						mes "artifact known as Ymir's heart.";
-						next;
-						mes "^8B6914This one man and Ymir's";
-						mes "Heart are credited with";
-						mes "the success and prosperity";
-						mes "of the Jupero's civilization.";
-						mes "However, there are various accounts prior to Jupero's fall";
-						mes "detailing his work with chimera...^000000";
-						next;
-						mes "^8B6914This scientist, supposedly";
-						mes "in his passion to benefit his";
-						mes "people by finding a scientific";
-						mes "method for immortality by using";
-						mes "chimera for testing, was driven";
-						mes "insane. He experimented on";
-						mes "himself with disatrous results.^000000";
-						next;
-						mes "^8B6914There was an error in the";
-						mes "energy calibration of Ymir's";
-						mes "Heart and the scientist was";
-						mes "transformed into the monster";
-						mes "we now know as Chimera. He";
-						mes "and his test subjects were set";
-						mes "loose into the city of Juperos.^000000";
-						next;
-						mes "^8B6914These immortal Chimeras";
-						mes "razed the entire city, killing";
-						mes "countless people. Apparently,";
-						mes "a team of scientists were able";
-						mes "to salvage a fragment of Ymir's";
-						mes "Heart, and use it to lauch part";
-						mes "of Juperos into the sky.^000000";
-						next;
-						mes "^8B6914That section of Juperos";
-						mes "eventually developed into";
-						mes "the city of Juno. Since the";
-						mes "scientists who launched Juno into the sky all immediately died";
-						mes "afterwards from an unknown cause, they left no documentation.^000000";
-						next;
-						mes "^8B6914The Chimera, and the";
-						mes "laboratory in which it";
-						mes "was created, is rumored to";
-						mes "remain beneath the ruins of";
-						mes "the once great city of Juperos.^000000";
-						close;
-
-					case 4:
-						mes "["+strcharinfo(0)+"]";
-						mes "Ugh... My head hurts";
-						mes "too much from reading";
-						mes "a book for smarty people.";
-						mes "I know! I'll play videogames!";
-						close;
-				}
-			}
-			switch( select( "Preface","Close the file.") )
-			{
-				case 1:
-					mes "^8B6914Scholars are certain";
-					mes "that the Juperos civilization";
-					mes "used to be located above the";
-					mes "ground, but it is now buried";
-					mes "beneath the El Mes Plateau.";
-					mes "The reasons for the city's";
+	switch(select("Table of Contents.:Leave it alone.")) {
+	case 1:
+		if (yuno_hist > 4) {
+			mes "^8B6914 1. Preface";
+			mes " 2. Juperos Background";
+			mes " 3. Theory Behind Its Fall^000000";
+			next;
+			switch(select("Preface:Juperos Background:Theory Behind Its Fall:Leave it alone.")) {
+			case 1:
+				mes "^8B6914Scholars are certain";
+				mes "that the Juperos civilization";
+				mes "used to be located above the";
+				mes "ground, but it is now buried";
+				mes "beneath the El Mes Plateau.";
+				mes "The reasons for the city's";
+				if (yuno_hist < 9) {
 					mes "ruin are still nebulous...^000000";
 					next;
 					mes "^8B6914There is much speculation";
@@ -1231,72 +959,239 @@ yuno_in04,186,125,4	script	Bundle of Files	111,{
 					mes "may be able to learn much";
 					mes "from that ancient city's ruins.";
 					mes "..................^000000";
-					if(!yuno_hist) set yuno_hist,1;
+					if (yuno_hist < 7) {
+						next;
+						mes "["+strcharinfo(0)+"]";
+						mes "Hmmm...";
+						mes "A whole chapter";
+						mes "dedicated to saying,";
+						mes "''We know absolutely";
+						mes "nothing about something.''";
+						mes "I should write a book~";
+					}
+					close;
+				}
+				mes "ruin are still in debate...^000000";
+				next;
+				mes "^8B6914However, new findings";
+				mes "regarding the history";
+				mes "of Juperos have allowed";
+				mes "us to make a few conclusions.^000000";
+				close;
+			case 2:
+				if (yuno_hist < 9) {
+					mes "^8B6914...";
+					mes "......";
+					mes "..........^000000";
 					next;
 					mes "["+strcharinfo(0)+"]";
-					mes "This...";
-					mes "This is supposed to";
-					mes "be a research thesis?";
-					mes "There's barely any";
-					mes "research in it...";
+					mes "This is all just idle";
+					mes "conjecture! This paper";
+					mes "isn't developed enough";
+					mes "yet to be a real thesis...";
 					close;
-				
-				case 2:
+				}
+				else if (yuno_hist == 9) {
+					mes "^8B6914Juperos was built over";
+					mes "a thousand years ago in";
+					mes "an era of peace just after";
+					mes "a major war. Contrary to";
+					mes "popular belief, there isn't any";
+					mes "evidence proving that Juno may";
+					mes "have descended from Juperos.^000000";
+					next;
+					mes "^8B6914In fact, there is a";
+					mes "strong possibility that";
+					mes "another war, between Juno";
+					mes "and Juperos, resulted in Juno's";
+					mes "independence from Juperos and";
+					mes "the destruction of any existing";
+					mes "documentation from that era.^000000";
+					next;
 					mes "["+strcharinfo(0)+"]";
-					mes "Hmm...";
-					mes "This isn't heavy";
-					mes "enough to be a real";
-					mes "academic work. It must";
-					mes "not even be finished yet.";
+					mes "Yes... Of course!";
+					mes "It all makes sense now!";
 					close;
-			}
-		case 2:
-			if(yuno_hist < 5)
-			{
-				mes "["+strcharinfo(0)+"]";
-				mes "Nah...";
-				mes "I'm tired of reading.";
-				mes "Ironically enough.";
-				close;
-			}
-			else if(yuno_hist < 7)
-			{
-				mes "["+strcharinfo(0)+"]";
-				mes "I don't feel like";
-				mes "reading this. Not";
-				mes "enough pictures...";
-				close;
-			}
-			else if(yuno_hist < 9)
-			{
-				mes "["+strcharinfo(0)+"]";
-				mes "It looks very sophisticated...";
+				}
+				mes "^8B6914Juperos was built over";
+				mes "a thousand years ago in";
+				mes "an era of peace just after";
+				mes "a major war. There is now";
+				mes "direct evidence linking Juno";
+				mes "to Juperos proving that Juno";
+				mes "was but a part of Juperos.^000000";
+				next;
+				mes "^8B6914Just like Juno, Juperos";
+				mes "was a society that prided";
+				mes "itself on its advancement";
+				mes "in the sciences which played";
+				mes "a permeating role in civilized";
+				mes "life. Science was reponsible for Juperos's rise and downfall.";
 				close;
-			}
-			else if(yuno_hist < 10)
-			{
-				mes "["+strcharinfo(0)+"]";
-				mes "I know this book...";
-				mes "But I don't feel like";
-				mes "reading it right now.";
+			case 3:
+				if (yuno_hist < 10) {
+					mes "^8B6914...";
+					mes "......";
+					mes "..........^000000";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "Huh. This writer keeps";
+					mes "talking about theories,";
+					mes "but the more I read, the";
+					mes "less clear I am on what";
+					mes "the theory actually is.";
+					mes "I don't think there is one...";
+					emotion e_swt,1;
+					close;
+				}
+				mes "^8B6914What is most unsettling";
+				mes "is recent evidence, including";
+				mes "a first hand written account,";
+				mes "regarding the role of one of";
+				mes "Jupero's foremost scientists";
+				mes "in that city's rise and fall.";
+				next;
+				mes "^8B6914If these writings are";
+				mes "authentic, then what actually";
+				mes "happened was that a scientific";
+				mes "revolution occurred as a direct";
+				mes "result of one scientist's effort to manipulate the energies of the";
+				mes "artifact known as Ymir's heart.";
+				next;
+				mes "^8B6914This one man and Ymir's";
+				mes "Heart are credited with";
+				mes "the success and prosperity";
+				mes "of the Jupero's civilization.";
+				mes "However, there are various accounts prior to Jupero's fall";
+				mes "detailing his work with chimera...^000000";
+				next;
+				mes "^8B6914This scientist, supposedly";
+				mes "in his passion to benefit his";
+				mes "people by finding a scientific";
+				mes "method for immortality by using";
+				mes "chimera for testing, was driven";
+				mes "insane. He experimented on";
+				mes "himself with disatrous results.^000000";
+				next;
+				mes "^8B6914There was an error in the";
+				mes "energy calibration of Ymir's";
+				mes "Heart and the scientist was";
+				mes "transformed into the monster";
+				mes "we now know as Chimera. He";
+				mes "and his test subjects were set";
+				mes "loose into the city of Juperos.^000000";
+				next;
+				mes "^8B6914These immortal Chimeras";
+				mes "razed the entire city, killing";
+				mes "countless people. Apparently,";
+				mes "a team of scientists were able";
+				mes "to salvage a fragment of Ymir's";
+				mes "Heart, and use it to lauch part";
+				mes "of Juperos into the sky.^000000";
+				next;
+				mes "^8B6914That section of Juperos";
+				mes "eventually developed into";
+				mes "the city of Juno. Since the";
+				mes "scientists who launched Juno into the sky all immediately died";
+				mes "afterwards from an unknown cause, they left no documentation.^000000";
+				next;
+				mes "^8B6914The Chimera, and the";
+				mes "laboratory in which it";
+				mes "was created, is rumored to";
+				mes "remain beneath the ruins of";
+				mes "the once great city of Juperos.^000000";
 				close;
-			}
-			else
-			{
+			case 4:
 				mes "["+strcharinfo(0)+"]";
-				mes "This thesis is";
-				mes "looking pretty good~";
-				mes "Of course, I did have";
-				mes "a hand in making it...";
+				mes "Ugh... My head hurts";
+				mes "too much from reading";
+				mes "a book for smarty people.";
+				mes "I know! I'll play videogames!";
 				close;
 			}
+		}
+		switch(select("Preface:Close the file.")) {
+		case 1:
+			mes "^8B6914Scholars are certain";
+			mes "that the Juperos civilization";
+			mes "used to be located above the";
+			mes "ground, but it is now buried";
+			mes "beneath the El Mes Plateau.";
+			mes "The reasons for the city's";
+			mes "ruin are still nebulous...^000000";
+			next;
+			mes "^8B6914There is much speculation";
+			mes "about the reasons for Jupero's";
+			mes "downfall, but any documentation";
+			mes "from that time period has been";
+			mes "difficult to find. As for now, any evidence we have regarding";
+			mes "Juperos is inconclusive.^000000";
+			next;
+			mes "^8B6914In spite of this lack";
+			mes "of empirical or concrete";
+			mes "data on the civilization of";
+			mes "Juperos, our modern world";
+			mes "may be able to learn much";
+			mes "from that ancient city's ruins.";
+			mes "..................^000000";
+			if (!yuno_hist) set yuno_hist,1;
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "This...";
+			mes "This is supposed to";
+			mes "be a research thesis?";
+			mes "There's barely any";
+			mes "research in it...";
+			close;
+		case 2:
+			mes "["+strcharinfo(0)+"]";
+			mes "Hmm...";
+			mes "This isn't heavy";
+			mes "enough to be a real";
+			mes "academic work. It must";
+			mes "not even be finished yet.";
+			close;
+		}
+	case 2:
+		if (yuno_hist < 5) {
+			mes "["+strcharinfo(0)+"]";
+			mes "Nah...";
+			mes "I'm tired of reading.";
+			mes "Ironically enough.";
+			close;
+		}
+		else if (yuno_hist < 7) {
+			mes "["+strcharinfo(0)+"]";
+			mes "I don't feel like";
+			mes "reading this. Not";
+			mes "enough pictures...";
+			close;
+		}
+		else if (yuno_hist < 9) {
+			mes "["+strcharinfo(0)+"]";
+			mes "It looks very sophisticated...";
+			close;
+		}
+		else if (yuno_hist < 10) {
+			mes "["+strcharinfo(0)+"]";
+			mes "I know this book...";
+			mes "But I don't feel like";
+			mes "reading it right now.";
+			close;
+		}
+		else {
+			mes "["+strcharinfo(0)+"]";
+			mes "This thesis is";
+			mes "looking pretty good~";
+			mes "Of course, I did have";
+			mes "a hand in making it...";
+			close;
+		}
 	}
 }
 
 yuno_in04,188,118,4	script	Book#juperos	111,{
-
-	if(yuno_hist > 7)
-	{
+	if (yuno_hist > 7) {
 		mes "^8B6914*Self-Honesty*";
 		mes "*'Benefits Fo' Life!'*";
 		mes "By Stephen Oyoung";
@@ -1356,9 +1251,7 @@ yuno_in04,188,118,4	script	Book#juperos	111,{
 // Bronze Statue - juperos_01 99 112
 
 juperos_01,99,112,4	script	Bronze Statue#1	844,{
-
-	if(yuno_hist > 3)
-	{
+	if (yuno_hist > 3) {
 		mes "^3355FF''Do you wish to see";
 		mes "the end of the madness?";
 		mes "He is waiting where the three";
@@ -1366,8 +1259,7 @@ juperos_01,99,112,4	script	Bronze Statue#1	844,{
 		mes "two hundred illusions wander.''^000000";
 		close;
 	}
-	else if(yuno_hist == 3)
-	{
+	else if (yuno_hist == 3) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I better go and";
 		mes "see Fayruz in the";
@@ -1375,62 +1267,57 @@ juperos_01,99,112,4	script	Bronze Statue#1	844,{
 		mes "her about the inscription.";
 		close;
 	}
-	else
-	{
+	else {
 		mes "^3355FFThere's a peculiar";
 		mes "engraving on the";
 		mes "Bronze Statue's rod.^000000";
 		next;
-		switch( select( "Investigate","Ignore it" ) )
-		{
-			case 1 :
-				mes "^3355FFIt's an inscription that's";
-				mes "written in an old language";
-				mes "that you can't understand,";
-				mes "but have no problem reading";
-				mes "and making out the sounds";
-				mes "for some weird reason.^000000";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "This is creepy!";
-				mes "I know that I'm not";
-				mes "supposed to be able";
-				mes "to read this, but here";
-				mes "I am. I know what sounds";
-				mes "all of these letters make...";
-				next;
-				if(yuno_hist == 2)
-				{
-					mes "["+strcharinfo(0)+"]";
-					mes "Then again, Fayruz did";
-					mes "say this was enchanted.";
-					mes "Okay, I guess I'll go back";
-					mes "to the Juno Library and";
-					mes "tell her what I found.";
-					set yuno_hist,3;
-					close;
-				}
+		switch(select("Investigate:Ignore it")) {
+		case 1:
+			mes "^3355FFIt's an inscription that's";
+			mes "written in an old language";
+			mes "that you can't understand,";
+			mes "but have no problem reading";
+			mes "and making out the sounds";
+			mes "for some weird reason.^000000";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "This is creepy!";
+			mes "I know that I'm not";
+			mes "supposed to be able";
+			mes "to read this, but here";
+			mes "I am. I know what sounds";
+			mes "all of these letters make...";
+			next;
+			if (yuno_hist == 2) {
 				mes "["+strcharinfo(0)+"]";
-				mes "Huh. Only a scholar,";
-				mes "maybe someone even in";
-				mes "Juno, could make sense";
-				mes "of what this stuff says.";
-				close;
-			
-			case 2 : 
+				mes "Then again, Fayruz did";
+				mes "say this was enchanted.";
+				mes "Okay, I guess I'll go back";
+				mes "to the Juno Library and";
+				mes "tell her what I found.";
+				set yuno_hist,3;
 				close;
+			}
+			mes "["+strcharinfo(0)+"]";
+			mes "Huh. Only a scholar,";
+			mes "maybe someone even in";
+			mes "Juno, could make sense";
+			mes "of what this stuff says.";
+			close;
+		case 2: 
+			close;
 		}
 	}
 }
 
 yuno_in04,169,109,1	script	Ambitious Hollgrehenn	111,{
-
 	mes "*Hollgrehenn: The Ambition*";
 	mes "By Aragham Caul*";
-	mes "";
-	mes "";
-	mes "";
-	mes "";
+	mes " ";
+	mes " ";
+	mes " ";
+	mes " ";
 	mes "Publisher:";
 	mes "Muha Books, Co.";
 	next;
@@ -1450,7 +1337,6 @@ yuno_in04,169,109,1	script	Ambitious Hollgrehenn	111,{
 }
 
 yuno_in04,174,111,1	script	Penniless Hollgrehenn	111,{
-
 	mes "^8B6914*Penniless Hollgrehenn*";
 	mes " * Pennyless Hollgrehenn * ";
 	mes "By Hollgrehenn";
@@ -1470,7 +1356,6 @@ yuno_in04,174,111,1	script	Penniless Hollgrehenn	111,{
 }
 
 yuno_in04,102,106,1	script	Popular Feasts	111,{
-
 	mes "^8B6914*Popular Feasts*";
 	mes "By Cabbage Pickle Community";
 	mes " ";
@@ -1479,47 +1364,43 @@ yuno_in04,102,106,1	script	Popular Feasts	111,{
 	mes "Publisher:";
 	mes "Muha Books, Co.^000000";
 	next;
-	switch( select( " 1. Fried Yoyo Tails"," 14. Poring Salad"," 252. Beak Soup" ) )
-	{
-		case 1:
-			mes "^8B6914...";
-			mes "If possible, try";
-			mes "to use tails cut";
-			mes "from live Yoyos.";
-			mes "Now, as for skinning...^000000";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Um...";
-			mes "Barf?";
-			close;
-
-		case 2:
-			mes "["+strcharinfo(0)+"]";
-			mes "Hey, this page is gone!";
-			mes "I guess Poring Salad is";
-			mes "the most popular feast";
-			mes "in this entire book.";
-			close;
-
-		case 3:
-			mes "^8B6914...";
-			mes "Fry the cut beaks";
-			mes "using herbal oil until";
-			mes "crisp. Then, pour the";
-			mes "feathers into a blender...^000000";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Hmm...";
-			mes "Sounds a little";
-			mes "too gourmet for my";
-			mes "taste. And by ''gourmet,''";
-			mes "I mean, ''totally gross.''";
-			close;
+	switch(select(" 1. Fried Yoyo Tails: 14. Poring Salad: 252. Beak Soup")) {
+	case 1:
+		mes "^8B6914...";
+		mes "If possible, try";
+		mes "to use tails cut";
+		mes "from live Yoyos.";
+		mes "Now, as for skinning...^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Um...";
+		mes "Barf?";
+		close;
+	case 2:
+		mes "["+strcharinfo(0)+"]";
+		mes "Hey, this page is gone!";
+		mes "I guess Poring Salad is";
+		mes "the most popular feast";
+		mes "in this entire book.";
+		close;
+	case 3:
+		mes "^8B6914...";
+		mes "Fry the cut beaks";
+		mes "using herbal oil until";
+		mes "crisp. Then, pour the";
+		mes "feathers into a blender...^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Hmm...";
+		mes "Sounds a little";
+		mes "too gourmet for my";
+		mes "taste. And by ''gourmet,''";
+		mes "I mean, ''totally gross.''";
+		close;
 	}
 }
 
 yuno_in04,111,108,1	script	Hamerun, Rat Hunter	111,{
-
 	mes "["+strcharinfo(0)+"]";
 	mes "I can't...";
 	mes "reach it...!";
@@ -1527,183 +1408,170 @@ yuno_in04,111,108,1	script	Hamerun, Rat Hunter	111,{
 }
 
 yuno_in04,167,127,1	script	Red Book	111,{
-
 	mes "^3355FFYou find a book";
 	mes "with red binding.^000000";
 	next;
-	switch( select( "Read.","Leave it alone." ) )
-	{
-		case 1:
-			mes "^8B6914...^000000";
-			next;
-			mes "^8B6914...";
-			mes "......^000000";
-			next;
-			mes "^8B6914...";
-			mes "......";
-			mes ".........^000000";
-			next;
-			mes "^8B6914...";
-			mes "......";
-			mes ".........";
-			mes "............^000000";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "This is...";
-			mes "A compilation of";
-			mes "Shakespeare in ";
-			mes "coloring book format?";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Wait...";
-			mes "Why would fans of";
-			mes "Shakespeare even";
-			mes "want a coloring book?";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Hmm... Well...";
-			mes "I suppose little kids who";
-			mes "read Shakespeare would";
-			mes "appreciate something like that.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Hold on...";
-			mes "Do little kids who";
-			mes "are able to read the";
-			mes "works of Shakespeare";
-			mes "even exist? I hope not...";
-			close;
-
-		case 2:
-			mes "["+strcharinfo(0)+"]";
-			mes "What a strange";
-			mes "and mysterious book.";
-			mes "I'll never know what's";
-			mes "inside unless I read it!";
-			mes "Come on! Doesn't the red";
-			mes "binding mean something?";
-			close;
+	switch(select("Read.:Leave it alone.")) {
+	case 1:
+		mes "^8B6914...^000000";
+		next;
+		mes "^8B6914...";
+		mes "......^000000";
+		next;
+		mes "^8B6914...";
+		mes "......";
+		mes ".........^000000";
+		next;
+		mes "^8B6914...";
+		mes "......";
+		mes ".........";
+		mes "............^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "This is...";
+		mes "A compilation of";
+		mes "Shakespeare in ";
+		mes "coloring book format?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Wait...";
+		mes "Why would fans of";
+		mes "Shakespeare even";
+		mes "want a coloring book?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Hmm... Well...";
+		mes "I suppose little kids who";
+		mes "read Shakespeare would";
+		mes "appreciate something like that.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Hold on...";
+		mes "Do little kids who";
+		mes "are able to read the";
+		mes "works of Shakespeare";
+		mes "even exist? I hope not...";
+		close;
+	case 2:
+		mes "["+strcharinfo(0)+"]";
+		mes "What a strange";
+		mes "and mysterious book.";
+		mes "I'll never know what's";
+		mes "inside unless I read it!";
+		mes "Come on! Doesn't the red";
+		mes "binding mean something?";
+		close;
 	}
 }
 
 yuno_in04,121,109,1	script	Scroll	111,{
-
 	mes "^3355FFYou've found an";
 	mes "antiquated scroll";
 	mes "that's collected a";
 	mes "layer of fine dust.^000000";
 	next;
-	switch( select( "Peruse","Leave it alone" ) )
-	{
-		case 1:
-			mes "^8B6914Item Upgrade Introduction";
-			mes " ";
-			mes " ";
-			mes " ";
-			mes "1. Item Upgrade Definition";
-			mes " ";
-			mes "The key to success when";
-			mes "upgrading items comes from";
-			mes "only one place: Your ''Mind.''";
-			mes " ";
-			mes " ";
-			mes " ";
-			mes "2. Power of a Positive Attitude";
-			mes "Before trying to upgrade";
-			mes "an item, plan out how high";
-			mes "you want to upgrade and how";
-			mes "much you'll spend beforehand.";
-			mes "But like all ladies, Lady Luck";
-			mes "smiles when you fully splurge.^000000";
-			mes " ";
-			mes " ";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Wait, wait...";
-			mes "This thing IS old.";
-			mes "I mean, it's obviously";
-			mes "written from a patriarchal";
-			mes "standpoint that promotes";
-			mes "bipartisan gender roles.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "I'm...";
-			mes "I'm so offended.";
-			close;
-
-		case 2:
-			mes "["+strcharinfo(0)+"]";
-			mes "This scroll is far too";
-			mes "primitive. There's been";
-			mes "all sorts of technological";
-			mes "reading advances that I can't";
-			mes "live without... Like pages.";
-			close;
+	switch(select("Peruse:Leave it alone")) {
+	case 1:
+		mes "^8B6914Item Upgrade Introduction";
+		mes " ";
+		mes " ";
+		mes " ";
+		mes "1. Item Upgrade Definition";
+		mes " ";
+		mes "The key to success when";
+		mes "upgrading items comes from";
+		mes "only one place: Your ''Mind.''";
+		mes " ";
+		mes " ";
+		mes " ";
+		mes "2. Power of a Positive Attitude";
+		mes "Before trying to upgrade";
+		mes "an item, plan out how high";
+		mes "you want to upgrade and how";
+		mes "much you'll spend beforehand.";
+		mes "But like all ladies, Lady Luck";
+		mes "smiles when you fully splurge.^000000";
+		mes " ";
+		mes " ";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Wait, wait...";
+		mes "This thing IS old.";
+		mes "I mean, it's obviously";
+		mes "written from a patriarchal";
+		mes "standpoint that promotes";
+		mes "bipartisan gender roles.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I'm...";
+		mes "I'm so offended.";
+		close;
+	case 2:
+		mes "["+strcharinfo(0)+"]";
+		mes "This scroll is far too";
+		mes "primitive. There's been";
+		mes "all sorts of technological";
+		mes "reading advances that I can't";
+		mes "live without... Like pages.";
+		close;
 	}
 }
 
 yuno_in04,118,116,4	script	Paper	111,{
-
 	mes "^3355FFIt's a piece of";
 	mes "paper that looks";
 	mes "like a personal letter.^000000";
 	next;
-	switch( select("Read it.","Leave it alone.") )
-	{
-		case 1:
-			if(yuno_hist > 7)
-			{
-				mes "^8B6914P.S.";
-				mes "Please...";
-				mes "Come back to me.";
-				mes " ";
-				mes " ";		  
-				mes "Love,";
-				mes "Fayruz^000000";
-				close;
-			}
-			mes "^8B6914...";
-			mes "I can't forget your smile.";
-			mes "No matter what, even if you";
-			mes "hate me, I'll always have these";
-			mes "feelings just for you. You are";
-			mes "the one who is most special,";
-			mes "who means the most to my heart.^000000";
-			next;
-			mes "^8B6914I know we've had our";
-			mes "differences, but please";
-			mes "don't refuse my love. By";
-			mes "your hands, I hope that";
-			mes "you can forgive me for us.";
-			mes "- Love, Fayruz^000000";
-			next;
-			if(getpartnerid())
-			{
-				mes "["+strcharinfo(0)+"]";
-				mes "Ahhhhhh~";
-				mes "Love sure is nice!";
-				close;
-			}
-			mes "["+strcharinfo(0)+"]";
-			mes "What th--?!";
-			mes "Booooooooo!";
-			mes "Love stinks!";
+	switch(select("Read it.:Leave it alone.")) {
+	case 1:
+		if (yuno_hist > 7) {
+			mes "^8B6914P.S.";
+			mes "Please...";
+			mes "Come back to me.";
+			mes " ";
+			mes " ";		  
+			mes "Love,";
+			mes "Fayruz^000000";
 			close;
-	
-		case 2:
+		}
+		mes "^8B6914...";
+		mes "I can't forget your smile.";
+		mes "No matter what, even if you";
+		mes "hate me, I'll always have these";
+		mes "feelings just for you. You are";
+		mes "the one who is most special,";
+		mes "who means the most to my heart.^000000";
+		next;
+		mes "^8B6914I know we've had our";
+		mes "differences, but please";
+		mes "don't refuse my love. By";
+		mes "your hands, I hope that";
+		mes "you can forgive me for us.";
+		mes "- Love, Fayruz^000000";
+		next;
+		if (getpartnerid()) {
 			mes "["+strcharinfo(0)+"]";
-			mes "I guess I better";
-			mes "not look at this.";
-			mes "I mean, I might";
-			mes "regret reading it.";
+			mes "Ahhhhhh~";
+			mes "Love sure is nice!";
 			close;
+		}
+		mes "["+strcharinfo(0)+"]";
+		mes "What th--?!";
+		mes "Booooooooo!";
+		mes "Love stinks!";
+		close;
+	case 2:
+		mes "["+strcharinfo(0)+"]";
+		mes "I guess I better";
+		mes "not look at this.";
+		mes "I mean, I might";
+		mes "regret reading it.";
+		close;
 	}
 }
 
 juperos_01,123,92,4	script	Stone Statue	844,{
-	
-	if(yuno_hist)
-	{
+	if (yuno_hist) {
 		mes "^3355FFIt's a stone statue";
 		mes "that looks exactly like";
 		mes "the one in the Juno Library.";
@@ -1723,7 +1591,6 @@ juperos_01,123,92,4	script	Stone Statue	844,{
 }
 
 juperos_01,99,71,4	script	Bronze Statue#2	844,{
-
 	mes "^3355FFIt's an elaborate";
 	mes "bronze statue that";
 	mes "is twice the height of";
@@ -1732,14 +1599,12 @@ juperos_01,99,71,4	script	Bronze Statue#2	844,{
 }
 
 juperos_01,79,92,4	script	Sculpture	844,{
-
 	mes "^3355FFIt's a sculpture that";
 	mes "looks familiar to you.^000000";
 	close;
 }
 
 juperos_01,215,127,4	script	Machine Statue	844,{
-
 	mes "^3355FFThis is the bust of a";
 	mes "humanoid machine with";
 	mes "a familiar Crest Piece";
@@ -1831,7 +1696,7 @@ OnInit:
 	initnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	killmonster "juperos_02","3F Gate Switch#jupe::OnMyMobDead";
 	end;
 
@@ -1910,7 +1775,7 @@ OnTimer483000:
 OnTimer506000:
 OnTimer529000:
 OnTimer552000:
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	end;
 
 OnTimer556000:
@@ -1922,7 +1787,7 @@ OnTimer561000:
 	end;
 
 OnTimer598000:
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	end;
 
 OnTimer600000:
@@ -2047,7 +1912,7 @@ jupe_area1,88,224,0	script	#hole#1-1	844,{
 		end;
 	}
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -2065,7 +1930,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "Warp#1-1";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -2088,7 +1953,7 @@ OnInit:
 OnTouch:
 	donpcevent "Red Alarm On#1-1::OnEnable";
 	disablenpc "Red Alarm#1-1";
-	donpcevent "#hole#1-1::Onstop_timer";
+	donpcevent "#hole#1-1::OnStop_Timer";
 	set $@JupreArea1InUse,1;
 	disablenpc "#hole#1-1";
 	end;
@@ -2341,7 +2206,7 @@ jupe_area1,25,238,0	script	#hole#1-2	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -2359,7 +2224,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "Warp#1-2";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -2628,7 +2493,7 @@ jupe_area1,36,146,0	script	#hole#1-3	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -2646,7 +2511,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "Warp#1-3";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -2917,7 +2782,7 @@ jupe_area1,50,49,0	script	#hole#1-4	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -2935,7 +2800,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "Warp#1-4";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -3114,7 +2979,7 @@ jupe_area1,112,162,0	script	Lever#ufe	844,{
 	next;
 	switch(select("Pull.:Cancel.")) {
 	case 1:
-		if($@JupreArea1InUse == 1) close;
+		if ($@JupreArea1InUse == 1) close;
 		initnpctimer;
 		donpcevent "LeverWarp#ufe::OnEnable";
 		disablenpc "Lever#ufe";
@@ -3141,7 +3006,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "LeverWarp#ufe";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -3256,7 +3121,7 @@ jupe_area2,74,224,0	script	#hole#2-1	844,{
 		end;
 	}
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -3274,7 +3139,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "Warp#2-1";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -3297,7 +3162,7 @@ OnInit:
 OnTouch:
 	donpcevent "Red Alarm On#2-1::OnEnable";
 	disablenpc "Red Alarm#2-1";
-	donpcevent "#hole#2-1::Onstop_timer";
+	donpcevent "#hole#2-1::OnStop_Timer";
 	set $@JupreArea2InUse,1;
 	disablenpc "#hole#2-1";
 	end;
@@ -3550,7 +3415,7 @@ jupe_area2,138,238,0	script	#hole#2-2	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -3568,7 +3433,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "Warp#2-2";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -3837,7 +3702,7 @@ jupe_area2,127,146,0	script	#hole#2-3	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -3855,7 +3720,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "Warp#2-3";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -4128,7 +3993,7 @@ jupe_area2,113,49,0	script	#hole#2-4	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -4146,7 +4011,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "Warp#2-4";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -4327,7 +4192,7 @@ jupe_area2,51,162,0	script	Lever#ufe2	844,{
 	next;
 	switch(select("Pull.:Cancel.")) {
 	case 1:
-		if($@JupreArea2InUse == 1) close;
+		if ($@JupreArea2InUse == 1) close;
 		initnpctimer;
 		donpcevent "LeverWarp#ufe2::OnEnable";
 		disablenpc "Lever#ufe2";
@@ -4354,7 +4219,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "LeverWarp#ufe2";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -4972,8 +4837,7 @@ OnTimer8000:
 OnMyMobDead:
 	set .MyMobs,.MyMobs-1;
 	if (.MyMobs < 1) {
-		if(getvariableofnpc(.MyMobs,"Guard-1#ufe") < 1 && getvariableofnpc(.MyMobs,"Guard-2#ufe") < 1 && getvariableofnpc(.MyMobs,"Guard-3#ufe") < 1)
-		{
+		if (getvariableofnpc(.MyMobs,"Guard-1#ufe") < 1 && getvariableofnpc(.MyMobs,"Guard-2#ufe") < 1 && getvariableofnpc(.MyMobs,"Guard-3#ufe") < 1) {
 			donpcevent "GuardEnd#ufe::OnEnable";
 			stopnpctimer;
 		}
@@ -5112,3 +4976,69 @@ OnTouch:
 	}
 	end;
 }
+
+//============================================================
+// GM Management NPC
+//============================================================
+sec_in02,39,167,0	script	Juperos Manager	864,{
+	callfunc "F_GM_NPC";
+	mes "[Juperos Manager]";
+	mes "I'm the NPC in";
+	mes "charge of managing";
+	mes "the global variables for";
+	mes "the quests related to";
+	mes "Juperos. GM, please";
+	mes "enter the password.";
+	next;
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "[Juperos Manager]";
+		mes "Incorrect password.";
+		close;
+	} else {
+		mes "[Juperos Manager]";
+		mes "Select a map. Remember:";
+		mes "Make sure that users aren't";
+		mes "doing the quest on the map";
+		mes "you're going to reset, or else";
+		mes "you'll cancel their progress";
+		mes "through the quest.";
+		next;
+		switch(select("jupe_Area1:jupe_Area2:jupe_ele_r:jupe_ele")) {
+		case 1:
+			set .@loc$,"jupe_Area1";
+			set .@var$,"$@JupreArea1InUse";
+			break;
+		case 2:
+			set .@loc$,"jupe_Area2";
+			set .@var$,"$@JupreArea2InUse";
+			break;
+		case 3:
+			set .@loc$,"jupe_ele_r";
+			set .@var$,"$@JupeElevatorInUse";
+			break;
+		case 4:
+			set .@loc$,"jupe_ele";
+			set .@var$,"$@JupeElevatorInUse2";
+			break;
+		}
+		mes "[Juperos Manager]";
+		mes "You've decided";
+		mes "to reset "+.@loc$+".";
+		mes "Shall we proceed?";
+		next;
+		switch(select("Yes.:No.")) {
+		case 1:
+			mes "[Juperos Manager]";
+			mes "The global variable in";
+			mes .@loc$+" has been";
+			mes "reset to 0. Thank you.";
+			setd .@var$,0;
+			close;
+		case 2:
+			mes "[Juperos Manager]";
+			mes "This command";
+			mes "has been canceled.";
+			close;
+		}
+	}
+}
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 1085774e0..7cc121cab 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -1,65 +1,13 @@
 //===== Hercules Script ======================================
 //= Quest NPCs located in Lighthalzen
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets,
 //= Lupus, Lord Gywall
-//===== Current Version: ===================================== 
-//= 4.8
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 5.1
+//===== Description: =========================================
 //= Quests related to Lighthalzen City.
-//===== Additional Comments: ================================= 
-//= Grammar/script check please. This was a quick job.
-//= Things to add: Look at the thread "Lighthalzen Guard" in SVN script
-//= 0.3 Initial Release
-//= 0.5 Added mobsters spawn and Einbroch pollution. Alert lasts either 10 minutes or all mob killed.
-//= 0.6-0.9 fix small bug. Added Bio-lab entrance Quest. Added Getting security-card Quest.
-//= 1.0 Patched "mobsters spawn & Alert" like Real-RO.
-//= 1.0a fixed rand(1,10) + comparision. There just can't be 'X < 1' [Lupus]
-//= 1.1 Changed the mobster spawn to g_mobster to prevent exploits [MasterOfMuppets]
-//= 1.2 Added the cube room quest by DeNy, translated by vicious_pucca. [MasterOfMuppets]
-//=	Thanks to Linuxwolf for a grammar check as well =).
-//= 1.2a Moved Biolab entrance to lhz_dun warps. [Vicious]
-//= 1.3 Fixed password bug, fixed endless item exploit, some typos [Lupus]
-//= 1.4 Fixed password abuse. When people don't read the password under the picture
-//= 	and enter Zero shit 8) (TODO: I saw some "Sticks" abuses, too.. where you could skip a part of quest...)
-//= 1.5 Fixed Mobster's OnDead event(it has to start with "On"!) [Playtester]
-//= 1.5a Fixed "free stick" bug, thx 2 Neouni [Lupus]
-//= 1.6 Added Gywall's Pickpocket Quest
-//= 1.7 Implemented the Friendship quest [MasterOfMuppets]
-//= 1.8 Changed the name of the mobsters to Gangster, as it should be. [MasterOfMuppets]
-//= 1.9 Added extra input check on Biolab so that the first letter of the word could be capitalized or undercase. [Evera]
-//= 2.0 Removed Duplicates [Silent]
-//= 2.1 Added first part of Bio Ethics Quest [Evera]
-//= 2.2 Added bit to say Bio Ethics is unfinished, and if a player attempts, it warps them
-//= 	out after finished part... Don't want players getting stuck ;_; [Evera]
-//= 2.3 Finished Bio Ethics Quest. Need bug testers before moving to trunk, my
-//=	mind was somewhere else when writing @_@ [Evera]
-//= 2.4	Fixed the bug where a str&int debug was shown in the console for
-//=	test tube in bio labs quest. [Evera]
-//= 2.5	Fixed Kellasus giving you extra skills in Bio Ethics quest [Evera]
-//= 2.6	Fixed exploit letting any class get homunculus from Bio Ethics Quest [Evera]
-//= 2.6a Moved Bio Ethics Quest to Alchemist SKILL QUESTS [Lupus]
-//= 2.7 fixed bugs that let people bypass some quest parts V_V [Lupus]
-//=	reused cubekey var for 4 Cube Room key vars
-//= 2.8 More optimization. Also fixed bug with "2x short sticks -> long" [Lupus]
-//=	Now uses MISC_QUEST&512 instead of 'hzdun'. WIP
-//= 2.9 Fixed Friendship Quest levelup exploit (u could get EXP twice) [Lupus]
-//= 3.0 Added Cursed Spirit Quest. [SinSloth]
-//=	Moved a book non-related to Lighthalzen quests.
-//= 3.1 Added Schwartzvalt Trilogy Quest. [SinSloth]
-//= 3.2 Updated some NPCs regarding Hugel Rebellion Quest. [SinSloth]
-//= 3.2 Removed the NPC "#kiz03-4" as I couldn't find any [L0ne_W0lf]
-//=	reference to it in the Aegis script.
-//= 3.3 Fixed a wrong negative value checking in Schwartzvalt Trilogy quest. [SinSloth]
-//= 3.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
-//= 3.5 Touch-ups to the Friendship quest. Added EXP reward. [L0ne_W0lf]
-//=	Added cutins for "Maku" npc, and changed "set HP" to percentheal.
-//= 3.5a Adjusted EXP given by "Benkasttein" to be the same as that given by Maku. [L0ne_W0lf]
-//= 3.6 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 3.7 Counter-fixed negative value checking to now look for both positive and negative values
-//=     since its symbol depends on the time. [SinSloth]
-//= 3.8 Removed bio ethic quest definition from header. [L0ne_W0lf]
-//= 3.9 Added Rekenber Job quest. Don't know why it hasn't been there before though. [SinSloth]
+//===== Additional Comments: =================================
 //= 4.0 Updated several NPCs to Official (iRO) dialog, and restrucured. [L0ne_W0lf]
 //= 4.1 Updated Dungeon quest, and Friendhsip quest to 10.3 standards. [L0ne_W0lf]
 //= 4.2 Fixed wrong variable type in use in "Box#cube1". [L0ne_W0lf]
@@ -70,13 +18,16 @@
 //=     Tube just makes sure you have 1 or more permits.
 //= 4.4 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 4.5 Corrected an Incorrect check of the Shinokas_Quest. (bugreport:2276) [Samuray22]
-//=	  Replaced effect numerics with constants.
+//=     Replaced effect numerics with constants.
 //= 4.5 Official Gangster Alert script. [Gepard]
 //= 4.6 Added quest log entries for:
 //=     - Cursed Spirit Quest
 //= 4.7 Fixed missing label. (bugreport:4654) [L0ne_W0lf]
 //= 4.8 Fixed Cursed Spirit Quest EXP reward. [Euphy]
-//============================================================ 
+//= 4.9 Fixed incorrect use of 'close'. [Joseph]
+//= 5.0 Updated RE/Pre-RE EXP. [Euphy]
+//= 5.1 Added GM management NPCs. [Euphy]
+//============================================================
 
 // Gangster Alert [Official Conversion]
 //============================================================
@@ -464,6 +415,7 @@ lighthalzen,341,224,3	script	Fishbone	868,{
 				mes "exactly 20 Jellopy on";
 				mes "you, okay? Seeya pal~";
 				set lhz_sincube,5;
+				setquest 12014;
 				close;
 			}
 			mes "[Fishbone]";
@@ -624,6 +576,7 @@ lighthalzen,341,224,3	script	Fishbone	868,{
 			mes "about what happened to";
 			mes "you. So did you get what";
 			mes "you wanted over there?";
+			completequest 12014;
 			next;
 			mes "["+strcharinfo(0)+"]";
 			mes "Yeah...";
@@ -1766,8 +1719,8 @@ OnTouch:
 	case 1:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 100) {
-			set zeny,zeny-100;
+		if (Zeny >= 100) {
+			set Zeny, Zeny-100;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1782,8 +1735,8 @@ OnTouch:
 	case 2:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 200) {
-			set zeny,zeny-200;
+		if (Zeny >= 200) {
+			set Zeny, Zeny-200;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1799,8 +1752,8 @@ OnTouch:
 	case 3:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 10) {
-			set zeny,zeny-10;
+		if (Zeny >= 10) {
+			set Zeny, Zeny-10;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1839,8 +1792,8 @@ OnTouch:
 	case 1:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 100) {
-			set zeny,zeny-100;
+		if (Zeny >= 100) {
+			set Zeny, Zeny-100;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1855,8 +1808,8 @@ OnTouch:
 	case 2:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 200) {
-			set zeny,zeny-200;
+		if (Zeny >= 200) {
+			set Zeny, Zeny-200;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1872,8 +1825,8 @@ OnTouch:
 	case 3:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 10) {
-			set zeny,zeny-10;
+		if (Zeny >= 10) {
+			set Zeny, Zeny-10;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1912,8 +1865,8 @@ OnTouch:
 	case 2:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 100) {
-			set zeny,zeny-100;
+		if (Zeny >= 100) {
+			set Zeny, Zeny-100;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1929,8 +1882,8 @@ OnTouch:
 	case 4:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 200) {
-			set zeny,zeny-200;
+		if (Zeny >= 200) {
+			set Zeny, Zeny-200;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1946,8 +1899,8 @@ OnTouch:
 	case 5:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 10) {
-			set zeny,zeny-10;
+		if (Zeny >= 10) {
+			set Zeny, Zeny-10;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -2064,7 +2017,7 @@ OnTouch:
 						mes "but I hope we never bump";
 						mes "into each other ever again!";
 					}
-					set zeny,zeny-.@price;
+					set Zeny, Zeny-.@price;
 					getitem 12016,.@number; //Speed_Up_Potion
 				}
 			}
@@ -2171,6 +2124,7 @@ lhz_in02,201,210,5	script	Digotz	869,{
 		mes "dearly loved his friends.^000000";
 		next;
 		set friendship,15;
+		changequest 12005,12006;
 		getitem 1201,1; //Knife
 		close;
 	}
@@ -2378,6 +2332,7 @@ lhz_in02,201,210,5	script	Digotz	869,{
 		mes "argument. Still, he couldn't";
 		mes "do anything about Maku now...";
 		set friendship,7;
+		changequest 12002,12003;
 		next;
 		mes "[Digotz]";
 		mes "I don't know why,";
@@ -2539,6 +2494,7 @@ lhz_in02,201,210,5	script	Digotz	869,{
 		mes "pals anymore. You know what?";
 		mes "Just forget everything I said.";
 		set friendship,2;
+		changequest 12000,12001;
 		close;
 	}
 	mes "[Digotz]";
@@ -2739,14 +2695,14 @@ lighthalzen,337,232,3	script	Maku	870,{
 		next;
 		delitem 7351,1; //Friend's_Diary
 		set friendship,14;
-		if (BaseLevel > 90) {
-			getexp 70000,0;
-		}
-		else if (BaseLevel > 75) {
-			getexp 40000,0;
-		}
-		else {
-			getexp 20000,0;
+		if (checkre(3)) {
+			if (BaseLevel > 90) getexp 70000,0;
+			else if (BaseLevel > 75) getexp 40000,0;
+			else getexp 20000,0;
+		} else {
+			if (BaseLevel > 90) getexp 700000,0;
+			else if (BaseLevel > 75) getexp 400000,0;
+			else getexp 200000,0;
 		}
 		cutin "lhz_macu04",2;
 		mes "[Maku]";
@@ -2998,6 +2954,7 @@ lighthalzen,337,232,3	script	Maku	870,{
 		mes "out and he probably hates";
 		mes "my penniless guts and...";
 		set friendship,3;
+		changequest 12001,12002;
 		next;
 		mes "[Maku]";
 		mes "Crud, just listen to";
@@ -3052,6 +3009,7 @@ lighthalzen,337,232,3	script	Maku	870,{
 		mes "anyway? Sure, we all";
 		mes "do it, but still...";
 		set friendship,1;
+		setquest 12000;
 		next;
 		mes "[Maku]";
 		mes "Well, when you get";
@@ -3189,14 +3147,15 @@ yuno_in04,96,106,5	script	Passionate Student	754,{
 		mes "rich and poor areas as my thanks.";
 		next;
 		set friendship,16;
-		if (BaseLevel > 90) {
-			getexp 70000,0;
-		}
-		else if (BaseLevel > 75) {
-			getexp 40000,0;
-		}
-		else {
-			getexp 20000,0;
+		completequest 12006;
+		if (checkre(3)) {
+			if (BaseLevel > 90) getexp 70000,0;
+			else if (BaseLevel > 75) getexp 40000,0;
+			else getexp 20000,0;
+		} else {
+			if (BaseLevel > 90) getexp 700000,0;
+			else if (BaseLevel > 75) getexp 400000,0;
+			else getexp 200000,0;
 		}
 		getitem 7350,1; //Pass
 		mes "[Benkaistein]";
@@ -3239,6 +3198,7 @@ yuno_in04,96,106,5	script	Passionate Student	754,{
 		mes "times we used to share.";
 		next;
 		set friendship,12;
+		changequest 12004,12005;
 		mes "[Benkaistein]";
 		mes "Anyway, this should at";
 		mes "least help them realize";
@@ -3288,6 +3248,7 @@ yuno_in04,96,106,5	script	Passionate Student	754,{
 		mes "to finish this thesis. Let's see... What can I possibly do from here?";
 		next;
 		set friendship,10;
+		changequest 12003,12004;
 		mes "[Benkaistein]";
 		mes "Oh, I know what I can do!";
 		mes "Wait, but where did I put it?";
@@ -3408,7 +3369,7 @@ OnTouch_:
 		}
 		else if (lhz_curse < 26) {
 			set @lhz_ghost,rand(1,5);
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			soundeffect "loli_ruri_stand.wav",0;
 			if (@lhz_ghost == 1) {
 				mes "[??????]";
@@ -3448,7 +3409,7 @@ OnTouch_:
 		}
 		else if (lhz_curse < 26) {
 			set @lhz_ghost,rand(1,10);
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			soundeffect "tao_gunka_stand.wav",0;
 			if (@lhz_ghost == 1) {
 				mes "[??????]";
@@ -3488,7 +3449,7 @@ OnTouch_:
 		}
 		else if (lhz_curse < 26) {
 			set @lhz_ghost,rand(1,10);
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			soundeffect "tao_gunka_stand.wav",0;
 			if (@lhz_ghost == 1) {
 				mes "[??????]";
@@ -3522,13 +3483,13 @@ OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[?????]";
@@ -3560,8 +3521,8 @@ OnTouch_:
 			mes "just in my head, were they?";
 			mes "Hello...? Anybody there...?";
 			close2;
-			sc_end SC_Blind;
-			sc_start SC_Curse,5000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,5000,0;
 			if (!lhz_spi01) set lhz_spi01,1;
 		}
 	}
@@ -3572,14 +3533,14 @@ lhz_in03,178,22,0	script	#kiz04	-1,2,2,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			soundeffect "tao_gunka_stand.wav",0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[?????]";
@@ -3639,8 +3600,8 @@ OnTouch_:
 			mes "these voices coming from?";
 			close2;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_end SC_Blind;
-			sc_start SC_Curse,5000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,5000,0;
 			if (!lhz_spi02) set lhz_spi02,1;
 		}
 	}
@@ -3651,13 +3612,13 @@ lighthalzen,295,227,0	script	#kiz05	-1,2,2,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "loli_ruri_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[?????]";
@@ -3685,8 +3646,8 @@ OnTouch_:
 			mes "I must be hallucinating!";
 			close2;
 			soundeffect "loli_ruri_stand.wav",0;
-			sc_end SC_Blind;
-			sc_start SC_Curse,3000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,3000,0;
 			if (!lhz_spi03) set lhz_spi03,1;
 		}
 	}
@@ -3697,13 +3658,13 @@ lighthalzen,364,315,0	script	#kiz06	-1,3,3,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[?????]";
@@ -3744,8 +3705,8 @@ OnTouch_:
 			mes "............";
 			close2;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_end SC_Blind;
-			sc_start SC_Curse,5000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,5000,0;
 			if (!lhz_spi04) set lhz_spi04,1;
 		}
 	}
@@ -3756,13 +3717,13 @@ lhz_in01,113,150,0	script	#kiz07	-1,3,3,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[?????]";
@@ -3798,8 +3759,8 @@ OnTouch_:
 			mes "............";
 			close2;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_end SC_Blind;
-			sc_start SC_Curse,3000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,3000,0;
 			if (lhz_curse == 6) set lhz_curse,7;
 		}
 	}
@@ -3810,13 +3771,13 @@ lhz_in01,272,227,0	script	#kiz08	-1,2,2,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[????]";
@@ -3882,8 +3843,8 @@ OnTouch_:
 			mes "............";
 			close2;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_end SC_Blind;
-			sc_start SC_Curse,3000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,3000,0;
 			if (lhz_curse == 11) set lhz_curse,12;
 		}
 	}
@@ -3898,12 +3859,12 @@ OnTouch_:
 			next;
 			mes "............";
 			soundeffect "loli_ruri_stand.wav",0;
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			close2;
 			warp "lhz_que01",26,27;
 		}
 		else if (((lhz_curse > 0) && (lhz_curse < 12)) && ((lhz_curse > 12) && (lhz_curse < 26))) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 	}
 	end;
@@ -4200,13 +4161,13 @@ OnTouch_:
 			mes "......";
 			mes ".........";
 			soundeffect "loli_ruri_stand.wav",0;
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			close2;
 			warp "lhz_que01",98,59;
 			end;
 		}
 		else if (((lhz_curse > 0) && (lhz_curse < 16)) && ((lhz_curse > 16) && (lhz_curse < 26))) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 	}
 	end;
@@ -4407,7 +4368,7 @@ lighthalzen,346,263,3	script	Elder#lhz	846,{
 				mes "down your spine, cold sweats,";
 				mes "maybe even hearing voices?";
 				soundeffect "loli_ruri_stand.wav",0;
-				sc_start SC_Curse,5000,0;
+				sc_start SC_CURSE,5000,0;
 				next;
 				select("Yes! How do I get rid of them?");
 				mes "[Elder]";
@@ -5228,7 +5189,7 @@ OnTouch_:
 
 lhz_in03,12,162,0	warp	#to_lhz		1,1,lighthalzen,321,322
 
-lighthalzen,319,321,0	script	#li_bother	-1,3,3,{
+lighthalzen,319,321,0	script	#li_bother	-1,2,2,{ //3,3
 OnTouch_:
 	if ((lhz_curse == 24 ) || (lhz_curse == 25)) {
 		mes ".............";
@@ -5267,16 +5228,20 @@ OnTouch_:
 		mes "^FF0000Regenschirm Laboratory^000000.";
 		set lhz_curse,26;
 		changequest 2093,2094;
-		if (BaseLevel < 70)
-			getexp 800000,300000;
-		else if ((BaseLevel > 69) && (BaseLevel < 80))
-			getexp 1000000,500000;
-		else if ((BaseLevel > 79) && (BaseLevel < 90))
-			getexp 1500000,800000;
-		else if (BaseLevel > 89)
-			getexp 2000000,1000000;
+		if (checkre(3)) {
+			if (BaseLevel < 70) getexp 30000,30000;
+			else if ((BaseLevel > 69) && (BaseLevel < 80)) getexp 40000,70000;
+			else if ((BaseLevel > 79) && (BaseLevel < 90)) getexp 70000,90000;
+			else getexp 90000,90000;
+		} else {
+			if (BaseLevel < 70) getexp 800000,300000;
+			else if ((BaseLevel > 69) && (BaseLevel < 80)) getexp 1000000,500000;
+			else if ((BaseLevel > 79) && (BaseLevel < 90)) getexp 1500000,800000;
+			else getexp 2000000,1000000;
+		}
+		close;
 	}
-	close;
+	end;
 }
 
 lhz_in01,114,181,5	script	Representative#li_01	71,{
@@ -6429,8 +6394,7 @@ lighthalzen,179,170,4	script	Ordinary Man	98,{
 	}
 	else if(lhz_boss == 1)
 	{
-		set @weather,rand(1,5);
-		if(@weather == 4)
+		if(rand(1,5) == 4)
 		{
 			mes "[Ghalstein]";
 			mes "Hm? It's a little";
@@ -6888,6 +6852,7 @@ lighthalzen,179,170,4	script	Ordinary Man	98,{
 		mes "contact who can sneak";
 		mes "you inside the Laboratory.";
 		set lhz_boss,6;
+		changequest 12015,12016;
 		close;
 	}
 	else if(lhz_boss == 6)
@@ -6933,11 +6898,12 @@ lighthalzen,179,170,4	script	Ordinary Man	98,{
 			mes "next mission. Show this to";
 			mes "him to prove that you are";
 			mes "working with us. Don't forget.";
-			delitem 7346,1;
-			delitem 7347,10;
-			delitem 7345,10;
+			delitem 7346,1; //Pile_Of_Ymir_Heart
+			delitem 7347,10; //Lab_Staff_Record
+			delitem 7345,10; //Armlet_Of_Prisoner
 			set lhz_boss,8;
-			getitem 7348,1;
+			getitem 7348,1; //Indication_Of_Member01
+			changequest 12016,12017;
 			close;
 		}
 		else if((!countitem(7346)) && (!countitem(7347)) && (!countitem(7345)))
@@ -7036,8 +7002,9 @@ lighthalzen,179,170,4	script	Ordinary Man	98,{
 		mes "we weren't able to accomplish";
 		mes "what we set out to do. Still...";
 		set lhz_boss,44;
-		getitem 617,1;
-		getexp 180000,0;
+		getitem 617,1; //Old_Violet_Box
+		getexp (checkre(3))?180000:1800000,0;
+		completequest 12028;
 		next;
 		mes "[Ghalstein]";
 		mes "I'd like to thank you";
@@ -7140,6 +7107,7 @@ OnTouch:
 				mes "to is gone! What's";
 				mes "going on here?^000000";
 				set lhz_boss,2;
+				setquest 12015;
 				close;
 		}
 	}
@@ -7311,6 +7279,7 @@ yuno_fild04,165,245,4	script	Dismal Guy	89,{
 		mes "him from ^FF00008:00 PM to 11:00 PM^000000,";
 		mes "and from ^FF000011:00 AM to 2:00PM PST^000000.Good luck on this mission, friend.";
 		set lhz_boss,11;
+		changequest 12017,12018;
 		close;
 	}
 	else
@@ -7913,7 +7882,8 @@ L_Mission:
 		mes "for me before you leave.";
 		mes "Thank you very much.";
 		set lhz_boss,16;
-		getitem 7342,1;
+		getitem 7342,1; //File01
+		changequest 12018,12019;
 		close2;
 		cutin "",255;
 		end;
@@ -7975,8 +7945,7 @@ L_Mission:
 	}
 	else if(lhz_boss == 22)
 	{
-		set @read_pre,rand(1,5);
-		if(@read_pre == 3)
+		if(rand(1,5) == 3)
 		{
 			mes "[Karl]";
 			mes "Hm. After completely";
@@ -8015,6 +7984,7 @@ L_Mission:
 			mes "I don't want our enemies";
 			mes "to discover Shinokas before";
 			mes "we can get him to talk.";
+			changequest 12022,12023;
 			if(Shinokas_Quest == 11) set lhz_boss,24;
 			else set lhz_boss,23;
 			close2;
@@ -8078,6 +8048,8 @@ L_Mission:
 			mes "who you are and";
 			mes "how to help you.";
 			set lhz_boss,26;
+			completequest 12023;
+			setquest 12024;
 			close2;
 			cutin "",255;
 			end;
@@ -8196,8 +8168,7 @@ L_Mission:
 	}
 	else if(lhz_boss == 25)
 	{
-		set @talk_pre,rand(1,10);
-		if(@talk_pre == 8)
+		if(rand(1,10) == 8)
 		{
 			mes "[Karl]";
 			mes "Alright, I just";
@@ -8235,6 +8206,8 @@ L_Mission:
 			mes "who you are and";
 			mes "how to help you.";
 			set lhz_boss,26;
+			completequest 12023;
+			setquest 12024;
 			close2;
 			cutin "",255;
 			end;
@@ -8508,10 +8481,22 @@ L_Mission:
 		mes "^3355FFGhalstein^000000 again. It's time";
 		mes "we let you loose, adventurer.";
 		set lhz_boss,43;
+		completequest 12028;
 		close2;
 		cutin "",255;
 		end;
 	}
+	else if(lght_boss == 43)
+	{
+		mes "[Karl]";
+		mes ".........";
+		mes "............";
+		for(set .@i,12015; .@i<=12028; set .@i,.@i+1) {
+			if (checkquest(.@i) > 0 && checkquest(.@i) < 2)
+				completequest .@i;
+		}
+		close;
+	}
 	else if(hg_tre == 56)
 	{
 		if(!countitem(7342))
@@ -8587,8 +8572,8 @@ L_Mission:
 		mes "Thank you so much. ";
 		mes "You can count on me to right what was wrong.";
 		set hg_tre,57;
-		delitem 7342,1;
-		getexp 200000,0;
+		delitem 7342,1; //File01
+		getexp (checkre(3))?200000:2000000,0;
 		getitem 617,1;
 		close2;
 		cutin "",255;
@@ -8910,6 +8895,7 @@ aldeba_in,155,240,5	script	Kafra Employee#l2	859,{
 								mes "so please hurry before";
 								mes "the enemy can get to him...";
 								set lhz_boss,18;
+								changequest 12019,12020;
 								close;
 						}
 				}
@@ -8997,7 +8983,8 @@ aldeba_in,155,240,5	script	Kafra Employee#l2	859,{
 		mes "The Secret Wing is counting";
 		mes "on you, brave adventurer.";
 		set lhz_boss,21;
-		getitem 7343,1;
+		getitem 7343,1; //File02
+		changequest 12021,12022;
 		next;
 		mes "[Benith]";
 		mes "I swear by my father's";
@@ -9085,7 +9072,8 @@ lhz_fild02,228,214,0	script	Wounded Man	849,{
 					mes "I'd be a goner. H-here,";
 					mes "t-take this with you...";
 					set lhz_boss,19;
-					getitem 7343,1;
+					getitem 7343,1; //File02
+					changequest 12020,12021;
 					next;
 					mes "[Jargeah]";
 					mes "Oh... Oh no.";
@@ -9201,6 +9189,7 @@ lhz_fild01,66,219,4	script	Mysterious Woman	859,{
 		mes "so be careful and don't let";
 		mes "them get suspicious of you!";
 		set lhz_boss,27;
+		changequest 12024,12025;
 		close2;
 		disablenpc "Mysterious Woman";
 		end;
@@ -9345,6 +9334,7 @@ lhz_fild01,66,219,4	script	Mysterious Woman	859,{
 		mes "For now, this is";
 		mes "goodbye. Take care...";
 		set lhz_boss,41;
+		changequest 12027,12028;
 		close2;
 		disablenpc "Mysterious Woman";
 		end;
@@ -9508,7 +9498,8 @@ lhz_in01,285,169,3	script	Researcher#2	865,{
 		mes "stick around for 3 minutes";
 		mes "at a time. The Secret Archive is to the right of this laboratory.";
 		set lhz_boss,28;
-		getitem 7349,1;
+		getitem 7349,1; //Indication_Of_Member02
+		changequest 12025,12026;
 		next;
 		mes "[Lestin]";
 		mes "When you're finished,";
@@ -9599,8 +9590,9 @@ lhz_in01,285,169,3	script	Researcher#2	865,{
 		mes "Lighthalzen where you";
 		mes "found her last time. She'll";
 		mes "know that you're coming.";
-		delitem 7349,1;
+		delitem 7349,1; //Indication_Of_Member02
 		set lhz_boss,36;
+		changequest 12026,12027;
 		close;
 	}
 	else
@@ -10319,6 +10311,27 @@ lhz_dun02,282,278,0	script	Broken Machine	111,{
 	}
 }
 
+sec_in02,17,170,4	script	boss::lght_boss_admin	809,{
+	callfunc "F_GM_NPC";
+	mes "[Patch]";
+	mes "Tell me what you want.";
+	next;
+	switch(select("Current Variables:How Many:Shinokas - Quest Complete")) {
+	case 1:
+		break;
+	case 2:
+		input .@input,0,1000;
+		set lght_boss,.@input;
+		break;
+	case 3:
+		set Shinokas_Quest,11;
+		close;
+	}
+	mes " ";
+	mes ""+lght_boss;
+	close;
+}
+
 lhz_in02,19,274,2	script	Maintenance Guy	851,{
 
 	mes "[Kudiuu]";
@@ -10337,6 +10350,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 
 	if(lhz_rekenber > 21)
 	{
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Just...";
 		mes "Leave me alone.";
@@ -10350,10 +10364,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "the one who's... Geez. I wish";
 		mes "I could live the way you do.";
 		mes "Someday I'll be strong enough...";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 21)
 	{
+		cutin "lhz_kaz03",2;
 		mes "[Kazien]";
 		mes "Hey, you're back. As usual,";
 		mes "you've done a good job. You";
@@ -10369,10 +10386,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "opened, and I saw what was";
 		mes "inside of those packages.";
 		next;
+		cutin "lhz_kaz06",2;
+		next;
 		mes "[Kazien]";
 		mes "......";
 		mes ".........";
 		mes "............";
+		cutin "lhz_kaz08",2;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Wh-why are you supplying";
@@ -10381,6 +10401,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "other countries, it can";
 		mes "cause a lot of trouble...!";
 		next;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Stop. Please.";
 		mes "J-just stop it.";
@@ -10403,6 +10424,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "to the world to make sure these";
 		mes "weapons aren't distributed?";
 		next;
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "Shut up! You don't";
 		mes "know anything! Just";
@@ -10414,6 +10436,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "[" + strcharinfo(0) + "]";
 		mes ".................";
 		next;
+		cutin "lhz_kaz04",2;
 		mes "[Kazien]";
 		mes "There'd be days when my";
 		mes "brother and I'd have nothing";
@@ -10422,6 +10445,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "is world peace if I'm not even";
 		mes "alive to enjoy it, huh?";
 		next;
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "Now, my brother Lyozien is";
 		mes "a gentle soul, has nothing";
@@ -10430,6 +10454,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "I'm really doing--he'd never";
 		mes "agree to it, believe me.";
 		next;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "I hate this job and what";
 		mes "I'm doing and I want to quit.";
@@ -10437,6 +10462,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "slums? Forget it. As long as";
 		mes "Lyozien is happy, I don't mind if I have to do the devil's work.";
 		next;
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "At least this way, keeping";
 		mes "it all secret, I can protect";
@@ -10450,6 +10476,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "that people can kill each other! Even if it's for the sake of";
 		mes "providing for your family...";
 		next;
+		cutin "lhz_kaz05",2;
 		mes "[Kazien]";
 		mes "Look man, this is what";
 		mes "I decided. I don't care";
@@ -10463,6 +10490,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "with your swords and magic spells... Isn't that just as bad?";
 		mes "It's not the weapons or the power that's bad: it's how they're used.";
 		next;
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "Granted, most of my clients";
 		mes "are pretty questionable, and";
@@ -10471,6 +10499,10 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "Damn it! Just... Don't come";
 		mes "back. I can't work like this...";
 		next;
+		set lhz_rekenber,22;
+		getexp (checkre(3))?55000:550000,0;
+		completequest 12013;
+		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "Look, I can't have";
 		mes "you working with me";
@@ -10478,21 +10510,25 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "Sorry, but it's for Lyozien's";
 		mes "own good. That, and you";
 		mes "make me feel guilty...";
-		set lhz_rekenber,22;
-		getexp 55000,0;
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber > 16)
 	{
+		cutin "lhz_kaz02",2;
 		mes "[Kazien]";
 		mes "Hey now, you better";
 		mes "get a move on. You gotta";
 		mes "assist another delivery to";
 		mes "the Rune-Midgarts Kingdom.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 16)
 	{
+		cutin "lhz_kaz03",2;
 		mes "[Kazien]";
 		mes "Ah, I heard from Lyozien";
 		mes "that you guys finished your";
@@ -10500,6 +10536,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "the best part-timer that I've";
 		mes "had in a long, long while.";
 		next;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Anyway, we've got yet";
 		mes "another delivery for the";
@@ -10507,6 +10544,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "weird that we're getting more";
 		mes "orders from there, but orders from other countries are decreasing.";
 		next;
+		cutin "lhz_kaz07",2;
 		mes "[Kazien]";
 		mes "Eh, I don't have the time";
 		mes "to wonder about stuff like";
@@ -10521,6 +10559,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "packages? Why would";
 		mes "they want to do that?";
 		next;
+		cutin "lhz_kaz02",2;
 		mes "[Kazien]";
 		mes "Look... You're better";
 		mes "off not knowing. Or are";
@@ -10536,6 +10575,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "in those packages, and why me";
 		mes "and Lyozien are being attacked.";
 		next;
+		cutin "lhz_kaz08",2;
 		mes "[Kazien]";
 		mes "Listen, I'm not obligated--";
 		mes "I can't tell you. Heck, I can't";
@@ -10544,27 +10584,34 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "that, can't you? Anyway, you";
 		mes "can handle those thugs, right?";
 		next;
+		set lhz_rekenber,17;
+		getexp (checkre(3))?45000:450000,0;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Right. Now get back to";
 		mes "the Airship and talk to";
 		mes "Lyozien again. Don't give";
 		mes "him any trouble and make";
 		mes "sure you protect him.";
-		set lhz_rekenber,17;
-		getexp 45000,0;
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber > 11)
 	{
+		cutin "lhz_kaz08",2;
 		mes "[Kazien]";
 		mes "What are you doing";
 		mes "waiting around here";
 		mes "for? You've got a job to";
 		mes "do, so hurry up and do it~";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 11)
 	{
+		cutin "lhz_kaz05",2;
 		mes "[Kazien]";
 		mes "Hey, you're back. I got a";
 		mes "message from Rune-Midgarts,";
@@ -10578,6 +10625,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "Lyozien supposed";
 		mes "to be brothers?";
 		next;
+		cutin "lhz_kaz03",2;
 		mes "[Kazien]";
 		mes "Whoa, he told you that?";
 		mes "I guess he feels that he";
@@ -10602,6 +10650,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "doesn't know exactly what";
 		mes "is in those packages.";
 		next;
+		cutin "lhz_kaz06",2;
 		mes "[Kazien]";
 		mes "Huh... Does that mean";
 		mes "you can't work with us if";
@@ -10628,7 +10677,9 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "for the Rune-Midgarts Kingdom.";
 		next;
 		set lhz_rekenber,12;
-		getexp 40000,0;
+		changequest 5005,5006;
+		getexp (checkre(3))?40000:400000,0;
+		cutin "lhz_kaz03",2;
 		mes "[Kazien]";
 		mes "Alright, I'll see you";
 		mes "later. The important";
@@ -10636,10 +10687,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "best job that you can.";
 		mes "And don't give Lyozien";
 		mes "any trouble: that's my job!";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber > 7)
 	{
+		cutin "lhz_kaz08",2;
 		mes "[Kazien]";
 		mes "Lyozien is waiting for";
 		mes "you on the international";
@@ -10647,10 +10701,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "meet him there as soon";
 		mes "as you can. Alright then,";
 		mes "I'll see you later.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 7)
 	{
+		cutin "lhz_kaz05",2;
 		mes "[Kazien]";
 		mes "Hey, you're back~";
 		mes "Great, I guess that means";
@@ -10665,6 +10722,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "a man named ^FF0000Lyozien^000000 inside.";
 		mes "He's our courier that'll provide you with further instructions.";
 		next;
+		cutin "lhz_kaz06",2;
 		mes "[Kazien]";
 		mes "Oh. You can talk to Lyozien";
 		mes "about the job, but definitely";
@@ -10674,18 +10732,22 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "to me for another job, okay?";
 		next;
 		set lhz_rekenber,8;
+		changequest 12008,12010;
+		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "Don't forget...";
 		mes "Talk to ^FF0000Lyozien^000000, our";
 		mes "courier, on the Airship";
 		mes "for the international flights.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 6)
 	{
-		set @rekenrand,rand(1,15);
-		if(@rekenrand == 7)
+		if(rand(1,15) == 7)
 		{
+			cutin "lhz_kaz04",2;
 			mes "[Kazien]";
 			mes "Oh, hey, it's you again.";
 			mes "Wait. No. You only remind";
@@ -10695,18 +10757,21 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 			mes "being this busy, I can't focus!";
 			next;
 			set lhz_rekenber,0;
+			erasequest 12009;
 			mes "[Kazien]";
 			mes "Arrgh, this is not good.";
 			mes "We are this busy but we don't have enough people,";
 			mes "yet it is not that extrememly bad";
 			mes "to a point that we need to hire more people.";
 			next;
+			cutin "lhz_kaz01",2;
 			mes "[Kazien]";
 			mes "Will you step back? You are hindering my vision.";
-			close;
+			close2;
 		}
 		else
 		{
+			cutin "lhz_kaz10",2;
 			mes "[Kazien]";
 			mes "Oh, hey, it's you again.";
 			mes "Listen, you didn't come here";
@@ -10722,11 +10787,14 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 			mes "Don't feel bad... Um, what";
 			mes "was your name again? Wait,";
 			mes "did you even give it to me...?";
-			close;
+			close2;
 		}
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 5)
 	{
+		cutin "lhz_kaz04",2;
 		mes "[Kazien]";
 		mes "So, were you able to";
 		mes "contact Garins? Or did";
@@ -10740,6 +10808,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "was the guard, but I couldn't";
 		mes "really tell him anything.";
 		next;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Whaaaat~?";
 		mes "I'm sure he would";
@@ -10754,6 +10823,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "tell anyone the details";
 		mes "of my assignment?";
 		next;
+		cutin "lhz_kaz06",2;
 		mes "[Kazien]";
 		mes "Heh... Yeah.";
 		mes "Yeah, that's right.";
@@ -10767,6 +10837,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "I didn't finish the task";
 		mes "that you assigned to me.";
 		next;
+		cutin "lhz_kaz09",2;
 		mes "[Kazien]";
 		mes "Garins is just some";
 		mes "cool name I made up.";
@@ -10781,16 +10852,20 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "me! How am I supposed";
 		mes "to trust you now?";
 		next;
+		set lhz_rekenber,7;
+		cutin "lhz_kaz06",2;
 		mes "[Kazien]";
 		mes "Oh... You...";
 		mes "You got a point, there.";
 		mes "Huh, now isn't that ironic? I'm sorry, pal, let me apologize.";
 		mes "Take some time, consider working for me, and then come back, okay?";
-		set lhz_rekenber,7;
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 4)
 	{
+		cutin "lhz_kaz04",2;
 		mes "[Kazien]";
 		mes "So, were you able to";
 		mes "contact Garins? Or did";
@@ -10802,6 +10877,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "think that Garins even works";
 		mes "at the Einbroch Laboratory.";
 		next;
+		cutin "lhz_kaz08",2;
 		mes "[Kazien]";
 		mes "Whaaaat~?";
 		mes "That can't be true.";
@@ -10814,6 +10890,8 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "he wouldn't even let me in.";
 		next;
 		set lhz_rekenber,6;
+		changequest 12008,12009;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Uh oh...";
 		mes "I thought so.";
@@ -10839,10 +10917,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "goal you have, but you can't";
 		mes "forget the details. Anyway,";
 		mes "sorry, but we can't use you...";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 3)
 	{
+		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "Remember, visit ^FF0000Garins^000000";
 		mes "in the ^FF0000Einbroch Laboratory^000000";
@@ -10855,10 +10936,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "around over here, so";
 		mes "once you're done with";
 		mes "that, come back to me.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 2)
 	{
+		cutin "lhz_kaz04",2;
 		mes "[Kazien]";
 		mes "Okay, I got it! Your first";
 		mes "assignment for us is pretty";
@@ -10883,6 +10967,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "for more important stuff. And";
 		mes "I really wanna trust you.";
 		next;
+		cutin "lhz_kaz05",2;
 		mes "[Kazien]";
 		mes "Remember, visit ^FF0000Garins^000000";
 		mes "in the ^FF0000Einbroch Laboratory^000000";
@@ -10891,15 +10976,19 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "in our clients' confidentiality, so keep it secret, got it?";
 		next;
 		set lhz_rekenber,3;
+		changequest 12007,12008;
 		mes "[Kazien]";
 		mes "I'll just be waiting";
 		mes "around over here, so";
 		mes "once you're done with";
 		mes "that, come back to me.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 1)
 	{
+		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "We're so busy, we barely";
 		mes "have enough people to cover";
@@ -10921,6 +11010,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "a nominal fee or some";
 		mes "kind of reward. You know...";
 		next;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Hey, alright~";
 		mes "I could use an extra";
@@ -10938,7 +11028,9 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 			mes "not strong enough for this";
 			mes "kinda work. Hey, but if you put on";
 			mes "some muscle, ask me again, okay?";
-			close;
+			close2;
+			cutin "",255;
+			end;
 		}
 		mes "[Kazien]";
 		mes "Yeah, okay. You look like";
@@ -10959,9 +11051,12 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 				mes "then. Let me think. First,";
 				mes "I should give you something";
 				mes "easy to do to test you out...";
-				close;
+				close2;
+				cutin "",255;
+				end;
 
 			case 2:
+				cutin "lhz_kaz04",2;
 				mes "[Kazien]";
 				mes "Awww, man.";
 				mes "I can't hire you";
@@ -10969,9 +11064,12 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 				mes "your mouth. Sorry buddy,";
 				mes "but I can't afford to take";
 				mes "any risks. You understand...";
-				close;
+				close2;
+				cutin "",255;
+				end;
 		}
 	}
+	cutin "lhz_kaz01",2;
 	mes "[Kazien]";
 	mes "We're so busy, we barely";
 	mes "have enough people to cover";
@@ -10979,12 +11077,15 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 	mes "it's not so bad that we gotta";
 	mes "invest in some new hires.";
 	next;
+	cutin "lhz_kaz04",2;
 	mes "[Kazien]";
 	mes "Oh hey, sorry buddy,";
 	mes "but you mind stepping";
 	mes "back? It's just that you're";
 	mes "blocking my view is all.";
-	close;
+	close2;
+	cutin "",255;
+	end;
 }
 
 lighthalzen,141,162,3	script	Old Man#reken	85,{
@@ -11004,13 +11105,16 @@ lighthalzen,141,162,3	script	Old Man#reken	85,{
 	mes "particularly special skills are";
 	mes "required for some positions.";
 	next;
+	if(!lhz_rekenber) {
+		set lhz_rekenber,1;
+		setquest 12007;
+	}
 	mes "[Old Man]";
 	mes "Well, if you're interested,";
 	mes "you can find Kazien inside";
 	mes "the corporation building.";
 	mes "Young people like him should";
 	mes "never be too proud to ask for help. He still needs to learn...";
-	if(!lhz_rekenber) set lhz_rekenber,1;
 	close;
 }
 
@@ -11059,10 +11163,20 @@ einbroch,55,52,3	script	Laboratory Guard#reken	 852,{
 						mes "I still can't allow you to";
 						mes "enter the laboratory.";
 						set lhz_rekenber,4;
+						changequest 12008,12010;
 						close;
 
 					case 2:
-						break;
+						mes "[" + strcharinfo(0) + "]";
+						mes "I'll... come back later.";
+						mes "(^333333I better speak to Kazien";
+						mes "and let him know I'm having";
+						mes "trouble getting past this";
+						mes "guard. Otherwise, I might";
+						mes "never finish this job!^000000)";
+						set lhz_rekenber,5;
+						changequest 12008,12010;
+						close;
 				}
 				
 			case 2:
@@ -11074,6 +11188,7 @@ einbroch,55,52,3	script	Laboratory Guard#reken	 852,{
 				mes "guard. Otherwise, I might";
 				mes "never finish this job!^000000)";
 				set lhz_rekenber,5;
+				changequest 12008,12010;
 				close;
 		}
 	}
@@ -11090,6 +11205,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 
 	if(lhz_rekenber > 21)
 	{
+		cutin "lhz_ryo11",2;
 		mes "[Lyozien]";
 		mes "Hey, I hear from my";
 		mes "brother that you can't work";
@@ -11097,10 +11213,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "of some scheduling conflict.";
 		mes "I'm sorry to hear that: it was";
 		mes "really good working with you...";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 21)
 	{
+		cutin "lhz_ryo03",2;
 		mes "[Lyozien]";
 		mes "Oh good, you're back.";
 		mes "Mr. Ahman just left and";
@@ -11114,26 +11233,33 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "You seem kind of upset.";
 		mes "Do you need to take a";
 		mes "break or something?";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 20)
 	{
+		cutin "lhz_ryo09",2;
 		mes "[Lyozien]";
 		mes "Heya, keep up the";
 		mes "good work. Once you";
 		mes "talk to Mr. Ahman inside";
 		mes "Izlude Airport, we'll be";
 		mes "done with this delivery.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 19)
 	{
+		cutin "lhz_ryo06",2;
 		mes "[Lyozien]";
 		mes "Whoa, you were great!";
 		mes "There were more of them";
 		mes "this time, but you easily";
 		mes "dispatched them. Great job!";
 		next;
+		cutin "lhz_ryo01",2;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Thanks, but...";
 		mes "Now I'm really worried";
@@ -11141,6 +11267,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "those packages. Are you";
 		mes "sure you don't know, Lyozien?";
 		next;
+		cutin "lhz_ryo02",2;
 		mes "[Lyozien]";
 		mes "You don't know when to";
 		mes "stop, do you? Nah, I don't";
@@ -11150,7 +11277,8 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "out for myself. Oh, hey...";
 		next;
 		set lhz_rekenber,20;
-		getitem 504,1;
+		getitem 504,1; //White_Potion
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "Here's a little";
 		mes "something to refresh";
@@ -11158,10 +11286,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "Keep up the good work, okay?";
 		mes "Then, we'll be done once you";
 		mes "contact Mr. Ahman in Izlude.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 18)
 	{
+		cutin "lhz_ryo06",2;
 		mes "[Lyozien]";
 		mes "Okay, just like before, we";
 		mes "gotta get these packages to";
@@ -11170,6 +11301,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "the Airport and tell him that";
 		mes "his packages have arrived.";
 		next;
+		cutin "lhz_ryo08",2;
 		mes "[Lyozien]";
 		mes "W-wait...";
 		mes "Did you hear that?";
@@ -11177,6 +11309,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "Those thugs are back! Don't";
 		mes "let them damage the packages!";
 		close2;
+		cutin "",255;
 		set lhz_rekenber,19;
 		donpcevent "#bully2::OnEnter";
 		donpcevent "Man#Lyozien::OnStop";
@@ -11184,6 +11317,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 	}
 	else if(lhz_rekenber == 17)
 	{
+		cutin "lhz_ryo14",2;
 		mes "[Lyozien]";
 		mes "I heard that you upset";
 		mes "Kyozien a little bit with";
@@ -11192,12 +11326,14 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "you gotta remember that";
 		mes "we've got obligations.";
 		next;
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "I know that these packages";
 		mes "might be putting us in danger,";
 		mes "but I trust my brother. If he says those thugs are bad guys, then";
 		mes "they're definitely bad guys.";
 		next;
+		cutin "lhz_ryo13",2;
 		mes "[Lyozien]";
 		mes "Yeah, ever since we were";
 		mes "kids, Kyozien has always";
@@ -11207,15 +11343,19 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "disappoint him, you know?";
 		next;
 		set lhz_rekenber,18;
+		cutin "lhz_ryo10",2;
 		mes "[Lyozien]";
 		mes "Anyway, that's";
 		mes "enough chit-chat";
 		mes "for now. Let's get";
 		mes "back to work, shall we?";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 16)
 	{
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "I'm lucky that you're";
 		mes "around to keep those";
@@ -11223,10 +11363,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "Hey, when you're ready for";
 		mes "another job, just talk to";
 		mes "my brother Kazien, okay?";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 15)
 	{
+		cutin "lhz_ryo05",2;
 		mes "[Lyozien]";
 		mes "So you spoke to";
 		mes "Mr. Ahman already?";
@@ -11242,10 +11385,16 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "that you're working for us.";
 		mes "Those thugs frighten me...";
 		set lhz_rekenber,16;
-		close;
+		cutin "lhz_ryo01",2;
+		mes "[Lyozien]";
+		mes "Now I feeel much more secure.";
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 14)
 	{
+		cutin "lhz_ryo13",2;
 		mes "[Lyozien]";
 		mes "Now that those thugs are";
 		mes "gone, let's concentrate on";
@@ -11253,10 +11402,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "get off at Izlude and then tell";
 		mes "Mr. Ahman that his packages";
 		mes "have arrived. See you later~";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 13)
 	{
+		cutin "lhz_ryo13",2;
 		mes "[Lyozien]";
 		mes "Oh, thank you!";
 		mes "You saved my life!";
@@ -11265,6 +11417,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "I just ran and hid when";
 		mes "those thugs appeared.";
 		next;
+		cutin "lhz_ryo04",2;
 		mes "[Lyozien]";
 		mes "That's one reason why" ;
 		mes "my brother has been hiring";
@@ -11272,6 +11425,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "packages from those hoodlums.";
 		mes "They're always after us...";
 		next;
+		cutin "lhz_ryo07",2;
 		mes "[Lyozien]";
 		mes "Every time I see them,";
 		mes "they're yelling things like";
@@ -11280,10 +11434,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "be destroyed. Boy, I sure";
 		mes "am glad that you're here!";
 		set lhz_rekenber,14;
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 12)
 	{
+		cutin "lhz_ryo11",2;
 		mes "[Lyozien]";
 		mes "Hey, we already have another";
 		mes "package to deliver all the way";
@@ -11292,6 +11449,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "seem to be doing a lot of";
 		mes "business around there lately.";
 		next;
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "It's so far away from";
 		mes "home, but a job's a job.";
@@ -11300,6 +11458,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "until we qui--whoa. You";
 		mes "hear that? Wh-what was...?";
 		next;
+		cutin "lhz_ryo03",2;
 		mes "[Lyozien]";
 		mes "Awwww, nuts!";
 		mes "It's those thugs!";
@@ -11308,6 +11467,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "the packages and make";
 		mes "sure they don't get them!";
 		close2;
+		cutin "",255;
 		set lhz_rekenber,13;
 		donpcevent "Man#Lyozien::OnStop";
 		donpcevent "#bully1::OnEnter";
@@ -11315,6 +11475,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 	}
 	if(lhz_rekenber == 11)
 	{
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "Hey, would you go see";
 		mes "my brother Kazien to see";
@@ -11322,10 +11483,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "us to do? I'll just be over";
 		mes "here waiting when you need";
 		mes "to find me. See you later~";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 10)
 	{
+		cutin "lhz_ryo14",2;
 		mes "[Lyozien]";
 		mes "Good work, Mr. Ahman just";
 		mes "arrived and picked up his";
@@ -11339,6 +11503,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "what kinds of things";
 		mes "we're delivering?";
 		next;
+		cutin "lhz_ryo10",2;
 		mes "[Lyozien]";
 		mes "No clue. I've been";
 		mes "a little curious myself,";
@@ -11347,6 +11512,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "think it makes a difference";
 		mes "to what we gotta do, right?";
 		next;
+		cutin "lhz_ryo13",2;
 		mes "[Lyozien]";
 		mes "Anyway, it oughta be";
 		mes "fine. I mean, our clients";
@@ -11355,17 +11521,22 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "sort of situation, right? You";
 		mes "know, embarassing orders...";
 		next;
+		set lhz_rekenber,11;
+		changequest 12011,12012;
+		cutin "lhz_ryo01",2;
 		mes "[Lyozien]";
 		mes "No? Eh, just meet up with";
 		mes "my brother to see if he's";
 		mes "got another job for us, okay?";
 		mes "If you wanna find me again,";
 		mes "I'll be waiting right here.";
-		set lhz_rekenber,11;
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 9)
 	{
+		cutin "lhz_ryo05",2;
 		mes "[Lyozien]";
 		mes "Alright, when this Airship";
 		mes "arrives in Izlude, get off and";
@@ -11373,10 +11544,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "a man named Mr. Ahman.";
 		mes "Let him know his order has";
 		mes "already arrived, okay?";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 8)
 	{
+		cutin "lhz_ryo02",2;
 		mes "[Lyozien]";
 		mes "Um, would you mind";
 		mes "treading lightly around";
@@ -11389,6 +11563,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "Excuse me, but";
 		mes "are you Lyozien?";
 		next;
+		cutin "lhz_ryo07",2;
 		mes "[Lyozien]";
 		mes "Hey, are you the one that";
 		mes "my brother Kazien sent?";
@@ -11397,6 +11572,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "I'm having trouble handling";
 		mes "all of these packages here.";
 		next;
+		cutin "lhz_ryo14",2;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Wait, Kazien is";
 		mes "your brother? That's";
@@ -11411,6 +11587,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "corporation and helped";
 		mes "us improve our lots in life...";
 		next;
+		cutin "lhz_ryo13",2;
 		mes "[Lyozien]";
 		mes "That's why I appreciate the";
 		mes "fact that he lets me work for";
@@ -11419,6 +11596,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "gotta deliver these goods to";
 		mes "the Rune-Midgarts Kingdom.";
 		next;
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "I have to ensure that these";
 		mes "packages aren't damaged or";
@@ -11427,6 +11605,8 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "at the Airport, and tell him that his orders have safely arrived.";
 		next;
 		set lhz_rekenber,9;
+		changequest 12010,12011;
+		cutin "lhz_ryo11",2;
 		mes "[Lyozien]";
 		mes "Once you tell Mr. Ahman";
 		mes "that message, he'll take";
@@ -11434,8 +11614,11 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "packages. But yeah, I need";
 		mes "to stay behind to guard these";
 		mes "products in the meantime.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
+	cutin "lhz_ryo12",2;
 	mes "[Lyozien]";
 	mes "Um, would you mind";
 	mes "treading lightly around";
@@ -11443,7 +11626,9 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 	mes "around the piles? Yeah,";
 	mes "these are all pretty fragile.";
 	mes "Thanks, I appreciate it.";
-	close;
+	close2;
+	cutin "",255;
+	end;
 
 OnEnter:
 	enablenpc "Man#Lyozien";
@@ -11625,6 +11810,7 @@ OnStop:
 		mes "notifying me about the delivery.^FFFFFF  ^000000 Now, you should go back and ";
 		mes "tell Lyozien. Take care now~";
 		set lhz_rekenber,10;
+		changequest 12012,12013;
 		close;
 	}
 	mes "[Man]";
@@ -11767,6 +11953,7 @@ lhz_in01,187,247,3	script	#flashback1	139,2,2,{
 OnTouch:
 	if(lhz_rekenber == 22)
 	{
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "-Don't you have anything to protect, huh?- ";
 		mes "-Are you sure that you're always doing the right thing?-";
@@ -11775,6 +11962,7 @@ OnTouch:
 		mes "Answer me! Answer me! Answer meee!";
 		next;
 		set lhz_rekenber,23;
+		cutin "",255;
 		mes "[" + strcharinfo(0) + "]";
 		mes ".............Damn it.";
 		close;
@@ -11787,6 +11975,7 @@ lhz_in01,75,248,3	script	#flashback2	139,2,2,{
 OnTouch:
 	if(lhz_rekenber == 22)
 	{
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "Look man, this is what";
 		mes "I decided. I don't care";
@@ -11809,6 +11998,7 @@ OnTouch:
 		mes "alive to enjoy it, huh?";
 		next;
 		set lhz_rekenber,23;
+		cutin "",255;
 		mes "[" + strcharinfo(0) + "]";
 		mes "......";
 		mes ".........";
@@ -11817,3 +12007,102 @@ OnTouch:
 	}
 	end;
 }
+
+airplane_01,10,10,3	script	#LyozienSwitch	111,{
+	callfunc "F_GM_NPC";
+	mes "[Lyozien Switch]";
+	mes "Input password.";
+	mes "Enter 0 to cancel.";
+	next;
+	set .@i, callfunc("F_GM_NPC",1028,0,0,4000);
+	if (.@i == -2) {
+		mes "[Lyozien Switch]";
+		mes "Incorrect.";
+		close;
+	} else if (.@i == -1) {
+		mes "[Lyozien Switch]";
+		mes "Canceled.";
+		close;
+	} else if (.@i == 0) {
+		close;
+	} else {
+		mes "[Lyozien Switch]";
+		mes "Do you want to";
+		mes "turn the Lyozien";
+		mes "NPC ON or OFF?";
+		next;
+		switch(select("On:OFF")) {
+		case 1:
+			set .@str$,"activated";
+			donpcevent "Man#Lyozien::OnEnable";
+			break;
+		case 2:
+			set .@str$,"deactivated";
+			donpcevent "Man#Lyozien::OnDisable";
+			break;
+		}
+		mes "[Lyozien Switch]";
+		mes "Lyozien NPC is";
+		mes "now "+.@str$+".";
+		mes " ";
+		mes "/mm airplane_01.gat 96 48";
+		close;
+	}
+}
+
+//============================================================
+// Old changelog
+//============================================================
+//= Grammar/script check please. This was a quick job.
+//= Things to add: Look at the thread "Lighthalzen Guard" in SVN script
+//= 0.3 Initial Release
+//= 0.5 Added mobsters spawn and Einbroch pollution. Alert lasts either 10 minutes or all mob killed.
+//= 0.6-0.9 fix small bug. Added Bio-lab entrance Quest. Added Getting security-card Quest.
+//= 1.0 Patched "mobsters spawn & Alert" like Real-RO.
+//= 1.0a fixed rand(1,10) + comparision. There just can't be 'X < 1' [Lupus]
+//= 1.1 Changed the mobster spawn to g_mobster to prevent exploits [MasterOfMuppets]
+//= 1.2 Added the cube room quest by DeNy, translated by vicious_pucca. [MasterOfMuppets]
+//=     Thanks to Linuxwolf for a grammar check as well =).
+//= 1.2a Moved Biolab entrance to lhz_dun warps. [Vicious]
+//= 1.3 Fixed password bug, fixed endless item exploit, some typos [Lupus]
+//= 1.4 Fixed password abuse. When people don't read the password under the picture
+//=     and enter Zero shit 8) (TODO: I saw some "Sticks" abuses, too.. where you could skip a part of quest...)
+//= 1.5 Fixed Mobster's OnDead event(it has to start with "On"!) [Playtester]
+//= 1.5a Fixed "free stick" bug, thx 2 Neouni [Lupus]
+//= 1.6 Added Gywall's Pickpocket Quest
+//= 1.7 Implemented the Friendship quest [MasterOfMuppets]
+//= 1.8 Changed the name of the mobsters to Gangster, as it should be. [MasterOfMuppets]
+//= 1.9 Added extra input check on Biolab so that the first letter of the word could be capitalized or undercase. [Evera]
+//= 2.0 Removed Duplicates [Silent]
+//= 2.1 Added first part of Bio Ethics Quest [Evera]
+//= 2.2 Added bit to say Bio Ethics is unfinished, and if a player attempts, it warps them
+//=     out after finished part... Don't want players getting stuck ;_; [Evera]
+//= 2.3 Finished Bio Ethics Quest. Need bug testers before moving to trunk, my
+//=     mind was somewhere else when writing @_@ [Evera]
+//= 2.4 Fixed the bug where a str&int debug was shown in the console for
+//=     test tube in bio labs quest. [Evera]
+//= 2.5 Fixed Kellasus giving you extra skills in Bio Ethics quest [Evera]
+//= 2.6 Fixed exploit letting any class get homunculus from Bio Ethics Quest [Evera]
+//= 2.6a Moved Bio Ethics Quest to Alchemist SKILL QUESTS [Lupus]
+//= 2.7 fixed bugs that let people bypass some quest parts V_V [Lupus]
+//=     reused cubekey var for 4 Cube Room key vars
+//= 2.8 More optimization. Also fixed bug with "2x short sticks -> long" [Lupus]
+//=     Now uses MISC_QUEST&512 instead of 'hzdun'. WIP
+//= 2.9 Fixed Friendship Quest levelup exploit (u could get EXP twice) [Lupus]
+//= 3.0 Added Cursed Spirit Quest. [SinSloth]
+//=     Moved a book non-related to Lighthalzen quests.
+//= 3.1 Added Schwartzvalt Trilogy Quest. [SinSloth]
+//= 3.2 Updated some NPCs regarding Hugel Rebellion Quest. [SinSloth]
+//= 3.2 Removed the NPC "#kiz03-4" as I couldn't find any [L0ne_W0lf]
+//=     reference to it in the Aegis script.
+//= 3.3 Fixed a wrong negative value checking in Schwartzvalt Trilogy quest. [SinSloth]
+//= 3.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 3.5 Touch-ups to the Friendship quest. Added EXP reward. [L0ne_W0lf]
+//=     Added cutins for "Maku" npc, and changed "set HP" to percentheal.
+//= 3.5a Adjusted EXP given by "Benkasttein" to be the same as that given by Maku. [L0ne_W0lf]
+//= 3.6 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 3.7 Counter-fixed negative value checking to now look for both positive and negative values
+//=     since its symbol depends on the time. [SinSloth]
+//= 3.8 Removed bio ethic quest definition from header. [L0ne_W0lf]
+//= 3.9 Added Rekenber Job quest. Don't know why it hasn't been there before though. [SinSloth]
+//============================================================
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 5c251d92d..54a7b3e95 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -1,11 +1,11 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Louyang
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Evera and The rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.2
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 2.4
+//===== Description: =========================================
+//= [Official Conversion]
 //= Soup Quest
 //= - Variable in use: che_tre (max 5)
 //= Doctor Quest
@@ -14,7 +14,7 @@
 //= - Variable in use: ch_poison (max 20)
 //= Revolution Quest
 //= - Variable in use: QL_REVO (max 9)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Initial Release [Evera]
 //= 1.1 Fixed double levelup bug [Lupus]
 //= 1.2 Added Revolution Quest. [SinSloth]
@@ -22,18 +22,20 @@
 //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Rescripted Soup, Doctor, and Poison King quests [L0ne_W0lf]
-//=	to Aegis 10.3 standards. Attempted to save current
-//=	quest progress from the old scripts.
+//=     to Aegis 10.3 standards. Attempted to save current
+//=     quest progress from the old scripts.
 //= 1.7 Added missing checkweights. And corrected [L0ne_W0lf]
-//=	a typo in Poison King quest.
+//=     a typo in Poison King quest.
 //= 1.8 Bug fixes. (bugreport:1025 bugreport:1062) [L0ne_W0lf]
 //= 1.9 Bug fixes/Typos. [Paradox924X]
 //= 2.0 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 2.1 Fixed guard tower warper ALWAYS warping. (bugreport:2377) [L0ne_W0lf]
 //= 2.2 Removed unused "name" variable. [L0ne_W0lf]
-//============================================================ 
+//= 2.3 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.4 Added questlog support. [Euphy]
+//============================================================
 
-// Soup Quest
+// Soup Quest :: lou_tre
 //============================================================
 lou_in02,53,174,7	script	Employee#1	822,6,62,{
 	if (gettime(3) >= 10 && gettime(3) < 22) {
@@ -1084,16 +1086,9 @@ louyang,174,150,5	script	Jiu Chi Ling#lou	815,{
 	close;
 }
 
-// Doctor Quest
+// Doctor Quest :: dr_china
 //============================================================
 lou_in02,265,69,5	script	Doctor#lyang	814,{
-	//Remove outdated variables and attempt to preserve prior quest progress.
-	if(QL_DOC1STTIME == 1 || QL_DOCQUEST == 1) set ch_par,2;
-	if (QL_DOCQUEST == 2) set ch_par,10;
-	if (QL_DOCQUEST == 3) set ch_par,17;
-	if (QL_GOTHERB) set ch_par,16;
-	set QL_DOC1STTIME,0; set QL_DOCQUEST,0; set QL_GOTHERB,0; set QL_BEENTOSTORAGE,0; set QL_GOTCOMPROP,0; set QL_TOOLMASTER,0;
-
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a minute! Right now, you're over weight, so you cannot receive more items. Please store some of your things in Kafra Storage and try again.^000000";
 		close;
@@ -1199,6 +1194,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			mes "so much trouble, but if you'll excuse me, I have other patients waiting. Please hurry back with";
 			mes "the medicine!";
 			set ch_par,2;
+			setquest 11044;
 			close;
 		}
 		mes "[Hua Tuo]";
@@ -1288,8 +1284,9 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			mes "great, but it's an old family secret. I hope it will be useful to you if you find yourself in great danger.";
 			delitem 7252,1; //Herb_Medicine
 			set ch_par,10;
+			completequest 11056;
 			getitem 679,2; //Gold_Pill
-			getexp 1000,0;
+			getexp (checkre(3))?1000:10000,0;
 			next;
 			mes "[Hua Tuo]";
 			mes "Well then,";
@@ -1327,6 +1324,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 		mes "^3355FF10 Sprout^000000 and";
 		mes "^3355FF5 Honey Pot^000000.";
 		set ch_par,17;
+		changequest 11056,11057;
 		close;
 	}
 	else if (ch_par == 10) {
@@ -1405,8 +1403,9 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			mes "is an old family secret. I hope that it will be of use to you in dangerous situations.";
 			delitem 7252,1; //Herb_Medicine
 			set ch_par,10;
+			completequest 11056;
 			getitem 679,2; //Gold_Pill
-			getexp 1000,0;
+			getexp (checkre(3))?1000:10000,0;
 			next;
 			mes "[Hua Tuo]";
 			mes "Well then, I will see you around. Once again, I'd like to thank you for your help.";
@@ -1459,8 +1458,9 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			delitem 7121,5; //Honey_Jar
 			delitem 7252,1; //Herb_Medicine
 			set ch_par,18;
+			completequest 11057;
 			getitem 679,5; //Gold_Pill
-			getexp 3000,0;
+			getexp (checkre(3))?10000:30000,0;
 			next;
 			mes "[Hua Tuo]";
 			mes "However, please remember not to take more than the recommended dosage for the pills I have given you. Even medicine, in the wrong doses, can become poison to the body.";
@@ -1556,6 +1556,7 @@ lou_in02,248,166,2	script	Tool Shop Master#lou	824,{
 			mes "You can find the storage on";
 			mes "the opposite side of this building. There, you'll see a guy named Jiang Xiayou. Go ahead and ask him for the stuff you need.";
 			set ch_par,3;
+			changequest 11044,11045;
 			close;
 		}
 		mes "[Wang Chuiyi]";
@@ -1664,18 +1665,22 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 				if (.@paper_j == 10) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Residence Transfer Application^000000.' Just like that.";
 					set ch_par,5;
+					changequest 11045,11046;
 				}
 				else if (.@paper_j == 11) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Summer SAT Class Application^000000.' Got it?";
 					set ch_par,6;
+					changequest 11045,11047;
 				}
 				else if (.@paper_j == 12) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Sandy Dust Phenomenon Report^000000.' Easy, right?";
 					set ch_par,7;
+					changequest 11045,11048;
 				}
 				else if (.@paper_j == 13) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Communication Proposal^000000.' Just like that?";
 					set ch_par,8;
+					changequest 11045,11049;
 				}
 				next;
 				mes "[Jiang Xiayou]";
@@ -1691,6 +1696,7 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 			mes "The medicines you're looking for might be around here, so look around. If it weren't for the doctor, I wouldn't even let you hang around, you know that?";
 			emotion e_pif;
 			set ch_par,4;
+			changequest 11045,11050;
 			close;
 		}
 	}
@@ -1806,6 +1812,7 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 		mes "Ah! Here you go. Even if it was kind of annoying to do, I guess";
 		mes "we gotta help each other, right? Alright then, I'll see ya around.";
 		set ch_par,16;
+		changequest 11055,11056;
 		getitem 7252,1; //Herb_Medicine
 		close;
 	}
@@ -1878,18 +1885,22 @@ lou_in02,210,47,0	script	City Hall Officer#lou	825,{
 					mes "[Jin Chiyuan]";
 					mes "^666666*Whispers*^000000";
 					mes "^333333When you go up stairs, another officer will give you the document you want.^000000 ^666666*Ahem*^000000 Louyang thanks you!";
-					set zeny,zeny-.@input;
+					set Zeny, Zeny-.@input;
 					if (ch_par == 5) {
 						set ch_par,11;
+						changequest 11046,11051;
 					}
 					else if (ch_par == 6) {
 						set ch_par,12;
+						changequest 11047,11052;
 					}
 					else if (ch_par == 7) {
 						set ch_par,13;
+						changequest 11048,11053;
 					}
 					else if (ch_par == 8) {
 						set ch_par,14;
+						changequest 11049,11054;
 					}
 					close;
 				}
@@ -2115,6 +2126,11 @@ lou_in02,156,38,0	script	Studying Officer#lou	822,{
 			mes "Here it is. A few days ago, someone asked me for the same document,";
 			mes "so I was able to find it again pretty easily. I hope it's useful to you.";
 			set ch_par,15;
+			for(set .@i,11051; .@i<=11054; set .@i,.@i+1) {
+				if (checkquest(.@i) > -1 && checkquest(.@i < 2))
+					completequest .@i;
+			}
+			setquest 11055;
 			close;
 		}
 		mes "[Huang Zhishu]";
@@ -2138,8 +2154,7 @@ lou_in02,156,38,0	script	Studying Officer#lou	822,{
 }
 
 lou_in02,204,169,0	script	Supply Stack#1lou	111,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (MaxWeight - Weight < 2000) {
 		mes "^3355FF* Wait a minute! *";
 		mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again. ^000000";
 		close;
@@ -2155,6 +2170,7 @@ lou_in02,204,169,0	script	Supply Stack#1lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2188,8 +2204,7 @@ lou_in02,204,169,0	script	Supply Stack#1lou	111,{
 }
 
 lou_in02,207,168,0	script	Supply Stack#5lou	111,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (MaxWeight - Weight < 2000) {
 		mes "^3355FF* Wait a minute !! *";
 		mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
 		close;
@@ -2205,6 +2220,7 @@ lou_in02,207,168,0	script	Supply Stack#5lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2240,8 +2256,7 @@ lou_in02,207,168,0	script	Supply Stack#5lou	111,{
 }
 
 lou_in02,206,163,0	script	Supply Stack#4lou	111,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (MaxWeight - Weight < 2000) {
 		mes "^3355FF* Wait a minute !! *";
 		mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
 		close;
@@ -2257,6 +2272,7 @@ lou_in02,206,163,0	script	Supply Stack#4lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2292,8 +2308,7 @@ lou_in02,206,163,0	script	Supply Stack#4lou	111,{
 }
 
 lou_in02,198,170,0	script	Supply Stack#3lou	111,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (MaxWeight - Weight < 2000) {
 		mes "^3355FF* Wait a minute !! *";
 		mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
 		close;
@@ -2309,6 +2324,7 @@ lou_in02,198,170,0	script	Supply Stack#3lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2344,8 +2360,7 @@ lou_in02,198,170,0	script	Supply Stack#3lou	111,{
 }
 
 lou_in02,192,170,0	script	Supply Stack#2	111,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (MaxWeight - Weight < 2000) {
 		mes "^3355FF* Wait a minute !! *";
 		mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
 		close;
@@ -2361,6 +2376,7 @@ lou_in02,192,170,0	script	Supply Stack#2	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2396,7 +2412,7 @@ louyang,125,121,0	warp	Storage Warp#2	1,1,lou_in02,198,161;
 lou_in02,198,159,0	warp	Storage Warp#3	1,1,louyang,124,118;
 lou_in02,203,159,0	warp	Storage Warp#4	1,1,louyang,129,118
 
-// Poison King Quest
+// Poison King Quest :: poison_king
 //============================================================
 lou_in02,123,39,4	script	Poison King#lou	824,{
 	// Attempt to preserve prior quest progress.
@@ -2899,6 +2915,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 					mes "Go find my last disciple,";
 					mes "^0000FFSong Zhi Du^000000, as he may tell you something useful. He's working at the doctor's office. If it weren't for him, I'd be starving now.";
 					set ch_poison,5;
+					setquest 11070;
 					close;
 				}
 				else {
@@ -3182,6 +3199,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 					mes "Will you excuse";
 					mes "me for a second...?";
 					set ch_poison,15;
+					changequest 11077,11078;
 					close;
 				}
 				mes "["+strcharinfo(0)+"]";
@@ -3267,6 +3285,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 		mes "as that of my disciple,";
 		mes "Louyang's leader must live...";
 		set ch_poison,16;
+		changequest 11078,11079;
 		close;
 	}
 	else if (ch_poison == 17) {
@@ -3297,6 +3316,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 		mes "^0000FFPoison King,";
 		mes "Nagash Arses' Jounal^000000.";
 		set ch_poison,18;
+		changequest 11080,11081;
 		close;
 	}
 	else if (ch_poison == 18) {
@@ -3338,32 +3358,27 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 		mes "^3355FFYou grow dizzy, but you also feel like you're becoming more powerful and gaining experience.^000000";
 		next;
 		set ch_poison,20;
-		if (BaseLevel < 56) {
-			getexp 900,0;
-		}
-		else if (BaseLevel > 55 && BaseLevel < 61) {
-			getexp 1050,0;
-		}
-		else if (BaseLevel > 60 && BaseLevel < 66) {
-			getexp 1868,0;
-		}
-		else if (BaseLevel > 65 && BaseLevel < 71) {
-			getexp 2741,0;
-		}
-		else if (BaseLevel > 70 && BaseLevel < 76) {
-			getexp 7076,0;
-		}
-		else if (BaseLevel > 75 && BaseLevel < 81) {
-			getexp 13025,0;
-		}
-		else if (BaseLevel > 80 && BaseLevel < 86) {
-			getexp 15034,0;
-		}
-		else if (BaseLevel > 85 && BaseLevel < 91) {
-			getexp 18205,0;
-		}
-		else if (BaseLevel > 90) {
-			getexp 40679,0;
+		changequest 11082,11083;
+		if (checkre(3)) {
+			if (BaseLevel < 56) getexp 1050,0;
+			else if (BaseLevel > 55 && BaseLevel < 61) getexp 1230,0;
+			else if (BaseLevel > 60 && BaseLevel < 66) getexp 1570,0;
+			else if (BaseLevel > 65 && BaseLevel < 71) getexp 2300,0;
+			else if (BaseLevel > 70 && BaseLevel < 76) getexp 3400,0;
+			else if (BaseLevel > 75 && BaseLevel < 81) getexp 4500,0;
+			else if (BaseLevel > 80 && BaseLevel < 86) getexp 9000,0;
+			else if (BaseLevel > 85 && BaseLevel < 91) getexp 18000,0;
+			else getexp 20000,0;
+		} else {
+			if (BaseLevel < 56) getexp 9000,0;
+			else if (BaseLevel > 55 && BaseLevel < 61) getexp 10500,0;
+			else if (BaseLevel > 60 && BaseLevel < 66) getexp 18684,0;
+			else if (BaseLevel > 65 && BaseLevel < 71) getexp 27411,0;
+			else if (BaseLevel > 70 && BaseLevel < 76) getexp 70757,0;
+			else if (BaseLevel > 75 && BaseLevel < 81) getexp 130246,0;
+			else if (BaseLevel > 80 && BaseLevel < 86) getexp 150340,0;
+			else if (BaseLevel > 85 && BaseLevel < 91) getexp 182052,0;
+			else getexp 406786,0;
 		}
 		mes "^3355FFThen...";
 		mes "Everything blacks out...^000000";
@@ -3579,6 +3594,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 			mes "you were going to do.";
 			mes "I'm just disappointed...";
 			set ch_poison,6;
+			changequest 11070,11071;
 			close;
 		}
 		mes "[Song Zhi Du]";
@@ -3595,6 +3611,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		mes "[Song Zhi Du]";
 		mes "Since my body is so frail, I can't bear the tension and rage of seeing my lifelong enemy face to face.";
 		set ch_poison,8;
+		changequest 11070,11073;
 		close;
 	}
 	else if (ch_par > 9 && ch_poison == 6) {
@@ -3623,6 +3640,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 			mes "10 Empty Potion,";
 			mes "30 Green Potion^000000.";
 			set ch_poison,7;
+			changequest 11071,11072;
 			next;
 			mes "[Song Zhi Du]";
 			mes "An apology is fine, but you must also show me that you are sorry and help me carry out my plan. Do you have any problem with this?";
@@ -3635,6 +3653,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		specialeffect EF_ENDURE;
 		close2;
 		set ch_poison,6;
+		changequest 11070,11071;
 		end;
 	}
 	else if (ch_par > 9 && ch_poison == 7) {
@@ -3650,6 +3669,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 				delitem 1093,10; //Empty_Potion
 				delitem 506,30; //Green_Potion
 				set ch_poison,8;
+				changequest 11072,11073;
 				mes "[Song Zhi Du]";
 				mes "Ah...";
 				mes "With these, I accept your apology. Thank you for all the trouble you went through to get this stuff.";
@@ -3736,6 +3756,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 			mes "[Song Zhi Du]";
 			mes "No!! I failed again! ^666666*Sigh...*^000000 And I spent a long time preparing all of those materials...";
 			set ch_poison,10;
+			changequest 11074,11075;
 			close;
 		}
 		emotion e_gasp;
@@ -3921,6 +3942,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		mes "Master, I did it!";
 		mes "Your disciple Song Zhi Du made the world's deadliest poison for you!";
 		set ch_poison,12;
+		changequest 11075,11076;
 		close;
 	}
 	else if (ch_par > 9 && ch_poison == 12) {
@@ -3989,32 +4011,26 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		next;
 		mes "^3355FFThe nasty taste lingers in your mouth, but then you feel a great warmth flowing throughout your body. Eventually, you pass out.^000000";
 		next;
-		if (BaseLevel < 56) {
-			getexp 891,0;
-		}
-		else if (BaseLevel > 55 && BaseLevel < 61) {
-			getexp 1021,0;
-		}
-		else if (BaseLevel > 60 && BaseLevel < 66) {
-			getexp 1768,0;
-		}
-		else if (BaseLevel > 65 && BaseLevel < 71) {
-			getexp 2541,0;
-		}
-		else if (BaseLevel > 70 && BaseLevel < 76) {
-			getexp 6876,0;
-		}
-		else if (BaseLevel > 75 && BaseLevel < 81) {
-			getexp 12825,0;
-		}
-		else if (BaseLevel > 80 && BaseLevel < 86) {
-			getexp 14234,0;
-		}
-		else if (BaseLevel > 85 && BaseLevel < 91) {
-			getexp 15205,0;
-		}
-		else if (BaseLevel > 90) {
-			getexp 36679,0;
+		if (checkre(3)) {
+			if (BaseLevel < 56) getexp 500,0;
+			else if (BaseLevel > 55 && BaseLevel < 61) getexp 700,0;
+			else if (BaseLevel > 60 && BaseLevel < 66) getexp 850,0;
+			else if (BaseLevel > 65 && BaseLevel < 71) getexp 1270,0;
+			else if (BaseLevel > 70 && BaseLevel < 76) getexp 1600,0;
+			else if (BaseLevel > 75 && BaseLevel < 81) getexp 2100,0;
+			else if (BaseLevel > 80 && BaseLevel < 86) getexp 4000,0;
+			else if (BaseLevel > 85 && BaseLevel < 91) getexp 7000,0;
+			else getexp 11000,0;
+		} else {
+			if (BaseLevel < 56) getexp 8909,0;
+			else if (BaseLevel > 55 && BaseLevel < 61) getexp 10213,0;
+			else if (BaseLevel > 60 && BaseLevel < 66) getexp 17684,0;
+			else if (BaseLevel > 65 && BaseLevel < 71) getexp 25411,0;
+			else if (BaseLevel > 70 && BaseLevel < 76) getexp 68757,0;
+			else if (BaseLevel > 75 && BaseLevel < 81) getexp 128246,0;
+			else if (BaseLevel > 80 && BaseLevel < 86) getexp 142340,0;
+			else if (BaseLevel > 85 && BaseLevel < 91) getexp 152052,0;
+			else getexp 366786,0;
 		}
 		warp "louyang",270,136;
 		end;
@@ -4059,6 +4075,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		mes "take these, since I don't";
 		mes "need them any longer.";
 		set ch_poison,21;
+		completequest 11083;
 		getitem 678,5; //Poison_Bottle
 		next;
 		mes "[Song Zhi Du]";
@@ -4107,7 +4124,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 			mes "[Lady]";
 			mes "Alright, there you go!";
 			if (Zeny > 99) {
-				set zeny,zeny-100;
+				set Zeny, Zeny-100;
 			}
 			close2;
 			specialeffect EF_BLASTMINEBOMB,AREA," #fire";
@@ -4129,7 +4146,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 			mes "Alright,";
 			mes "there you go!";
 			if (Zeny > 99) {
-				set zeny,zeny-100;
+				set Zeny, Zeny-100;
 			}
 			close2;
 			donpcevent " #fire::OnClaymore";
@@ -4159,7 +4176,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 				mes "delivery fee of 1,000 zeny.";
 				next;
 				if (Zeny > 999) {
-					set zeny,zeny-1000;
+					set Zeny, Zeny-1000;
 					getitem 7126,1; //Large_Jellopy
 					mes "[Lady]";
 					mes "Thank you~";
@@ -4168,6 +4185,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 					mes "Song Zhi Du.";
 					mes "Take care!";
 					set ch_poison,9;
+					changequest 11073,11074;
 					close;
 				}
 				mes "[Lady]";
@@ -4216,7 +4234,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 			mes "Alright~";
 			mes "There you go!";
 			if (Zeny > 99) {
-				set zeny,zeny-100;
+				set Zeny, Zeny-100;
 			}
 			close2;
 			donpcevent " #fire::OnClaymore";
@@ -4330,6 +4348,7 @@ lou_in01,107,163,0	script	 #lou_drink1	111,{
 		mes "^3355FFYou put the deadly poison into the bottle.^000000";
 		delitem 678,1; //Poison_Bottle
 		set ch_poison,13;
+		changequest 11076,11077;
 		close;
 	}
 	else if (ch_poison == 13) {
@@ -4342,6 +4361,7 @@ lou_in01,107,163,0	script	 #lou_drink1	111,{
 			delitem 938,1; //Sticky_Mucus
 			delitem 713,1; //Empty_Bottle
 			set ch_poison,17;
+			changequest 11079,11080;
 			close;
 		}
 		mes "^3355FFIt seems that you need switch Bai Long's drinking bottle with something else. Just taking the drink bottle would arouse suspicion.^000000";
@@ -4444,6 +4464,7 @@ lou_in01,99,158,4	script	Lord#bailong	821,{
 			mes "[Lord Bai Long]";
 			mes "Please, take this as a token of gratitute. And please deliver this letter to Nagash and Song Zhi Du for me.";
 			set ch_poison,19;
+			changequest 11081,11802;
 			getitem 603,1; //Old_Blue_Box
 			next;
 			mes "^3355FFYou obtained ^0000FFBai Long's letter^000000.";
@@ -4565,12 +4586,10 @@ lou_in01,99,144,4	script	Soldier#bailong4	825,{
 	close;
 }
 
-// Revolution Quest
-//===================================================================
+// Revolution Quest :: lou_zero
+//============================================================
 lou_in02,77,37,7	script	Hermit	824,{
-
-	if(!QL_REVOL)
-	{
+	if (!QL_REVOL) {
 		mes "[Sun Mao]";
 		mes "Where there's a will,";
 		mes "there's a way. When we";
@@ -4588,75 +4607,66 @@ lou_in02,77,37,7	script	Hermit	824,{
 		mes "is Sun Mao.";
 		mes "This invitation may be sudden, but I am a man of action. I see in your face that you too despise injustice.";
 		next;
-		switch( select( "What am I supposed to do?","I will join you!","Well, I'm just another tourist..." ) )
-		{
+		switch(select("What am I supposed to do?:I will join you!:Well, I'm just another tourist...")) {
+		case 1:
+			mes "[Sun Mao]";
+			mes "For now, we must recruit as many members as we can. When we're ready, we'll start a movement that will change Louyang, and even the world!";
+			next;
+			mes "[Sun Mao]";
+			mes "However, we currently do not have the manpower to carry out the plans we have laid out. We've been lucky the lord hasn't found us out yet.";
+			next;
+			mes "[Sun Mao]";
+			mes "I wish everyone would understand our intentions, but the people of this city are disunited. This is not the first time I have approached a foreigner for help...";
+			next;
+			mes "[Sun Mao]";
+			mes "I suppose you understand the urgency of our cause, and our need to gather others who see the merit of our goals!";
+			close;
+		case 2:
+			mes "[Sun Mao]";
+			mes "Oh, God must be on my side today and has sent you to me. Thank you for making the big decision...";
+			next;
+			mes "[Sun Mao]";
+			mes "I shall then engrave your name";
+			mes "on this bloody pledge board. But before I do so, I shall ask once more. Do you truly wish to join us, through pain and bloodshed?";
+			next;
+			switch(select("No, wait!:I am 100% sure.")) {
 			case 1:
 				mes "[Sun Mao]";
-				mes "For now, we must recruit as many members as we can. When we're ready, we'll start a movement that will change Louyang, and even the world!";
-				next;
-				mes "[Sun Mao]";
-				mes "However, we currently do not have the manpower to carry out the plans we have laid out. We've been lucky the lord hasn't found us out yet.";
-				next;
-				mes "[Sun Mao]";
-				mes "I wish everyone would understand our intentions, but the people of this city are disunited. This is not the first time I have approached a foreigner for help...";
-				next;
-				mes "[Sun Mao]";
-				mes "I suppose you understand the urgency of our cause, and our need to gather others who see the merit of our goals!";
+				mes "I understand if you need time to decide. If you do decide to join us, please return. Time is on our side, after all.";
 				close;
-
 			case 2:
+				set QL_REVOL,1;
 				mes "[Sun Mao]";
-				mes "Oh, God must be on my side today and has sent you to me. Thank you for making the big decision...";
-				next;
-				mes "[Sun Mao]";
-				mes "I shall then engrave your name";
-				mes "on this bloody pledge board. But before I do so, I shall ask once more. Do you truly wish to join us, through pain and bloodshed?";
+				mes strcharinfo(0)+ "...!";
+				mes "Your name is now engraved on this bloody pledge board. We will fight together to the death for Louyang's future!";
 				next;
-				switch( select( "No, wait!","I am 100% sure." ) )
-				{
-					case 1:
-						mes "[Sun Mao]";
-						mes "I understand if you need time to decide. If you do decide to join us, please return. Time is on our side, after all.";
-						close;
-
-					case 2:
-						set QL_REVOL,1;
-						mes "[Sun Mao]";
-						mes strcharinfo(0)+ "...!";
-						mes "Your name is now engraved on this bloody pledge board. We will fight together to the death for Louyang's future!";
-						next;
-						getpartymember(getcharid(1));
-						set @partymember,$@partymembercount;
-						if (getpartyleader(getcharid(1),1) == getcharid(0) || !@partymember)
-						{
-							mes "[Sun Mao]";
-							mes "Now, the most important thing for our cause is to gather more recruits and increase our numbers. Please find others who will join us in our fight.";
-							next;
-							mes "[Sun Mao]";
-							mes "However, as to not arouse suspicion, bring only one new recruit at a time. Also, we suggest not to bring a friend in a party with you.";
-							next;
-							mes "[Sun Mao]";
-							mes "Now, I will wait for you here. Go forth and find others who wish for a better future for Louyang!";
-							close;
-						}
-						mes "[Sun Mao]";
-						mes "Please assist the people who fight behind you. As more are gathered, one of our comrades will inform you of further instructions.";
-						close;
+				getpartymember(getcharid(1));
+				set @partymember,$@partymembercount;
+				if (getpartyleader(getcharid(1),1) == getcharid(0) || !@partymember) {
+					mes "[Sun Mao]";
+					mes "Now, the most important thing for our cause is to gather more recruits and increase our numbers. Please find others who will join us in our fight.";
+					next;
+					mes "[Sun Mao]";
+					mes "However, as to not arouse suspicion, bring only one new recruit at a time. Also, we suggest not to bring a friend in a party with you.";
+					next;
+					mes "[Sun Mao]";
+					mes "Now, I will wait for you here. Go forth and find others who wish for a better future for Louyang!";
+					close;
 				}
-
-			case 3:
 				mes "[Sun Mao]";
-				mes "Are you...? I see, you may leave now. Do not reveal what you have seen or heard in this place.";
-				next;
-				mes "[Sun Mao]";
-				mes "If you're a real tourist, you do not want to get involved in our business, one way or another.";
+				mes "Please assist the people who fight behind you. As more are gathered, one of our comrades will inform you of further instructions.";
 				close;
+			}
+		case 3:
+			mes "[Sun Mao]";
+			mes "Are you...? I see, you may leave now. Do not reveal what you have seen or heard in this place.";
+			next;
+			mes "[Sun Mao]";
+			mes "If you're a real tourist, you do not want to get involved in our business, one way or another.";
+			close;
 		}
-	}
-	else if(getpartyleader(getcharid(1),2) == getcharid(0))
-	{
-		if(QL_REVOL == 9)
-		{
+	} else if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+		if (QL_REVOL == 9) {
 			mes "[Sun Mao]";
 			mes "Once again,";
 			mes "thank you for";
@@ -4666,52 +4676,42 @@ lou_in02,77,37,7	script	Hermit	824,{
 		}
 		getpartymember(getcharid(1));
 		set @partymember,$@partymembercount;
-		if(QL_REVOL < 8)
-		{
-			if(@partymember == QL_REVOL +1)
-			{
-				if(@partymember != 8)
-				{
+		if (QL_REVOL < 8) {
+			if (@partymember == QL_REVOL +1) {
+				if (@partymember != 8) {
 					set QL_REVOL,QL_REVOL +1;
 					mes "[Sun Mao]";
 					mes "Oh, you brought a new comrade! Welcome. Please help your friend understand our intentions before joining us.";
 					next;
 					mes "[Sun Mao]";
-					switch(QL_REVOL)
-					{
-						case 2:
-							mes "Please bring another friend that both of you can trust. Remember, add one person at a time into your party.";
-							next;
-							mes "[Sun Mao]";
-							mes "Otherwise, other people may learn of what we are doing, and that will lead to trouble.";
-							close;
-
-						case 3:
-							mes "The three of you may all move together for our cause. Please try to find another recruit to be your fourth member, invite him to your party and bring him to this place.";
-							close;
-
-						case 4:
-							mes "Ah, now there are four of you. However, we must continue to strengthen our ranks at a cautious pace. Please go and find one new recruit, and only one, to add to your party.";
-							close;
-
-						case 5:
-							mes "Now, there are five of you. Needless to say, we still require more manpower. Please go out and seek another new member for our cause. Remember, only add one more person to your party and return to me.";
-							close;
-
-						case 6:
-							mes "There are now six of you. So far, so good. Please go forth and find just one more person to add to your party and bring him to me so that we may recruit him.";
-							close;
-
-						case 7:
-							mes "Now, there are seven of you, but we still lack the manpower we need. Please go forth and seek out one, and only one, more person to add to your party and then return to me.";
-							close;
+					switch(QL_REVOL) {
+					case 2:
+						mes "Please bring another friend that both of you can trust. Remember, add one person at a time into your party.";
+						next;
+						mes "[Sun Mao]";
+						mes "Otherwise, other people may learn of what we are doing, and that will lead to trouble.";
+						close;
+					case 3:
+						mes "The three of you may all move together for our cause. Please try to find another recruit to be your fourth member, invite him to your party and bring him to this place.";
+						close;
+					case 4:
+						mes "Ah, now there are four of you. However, we must continue to strengthen our ranks at a cautious pace. Please go and find one new recruit, and only one, to add to your party.";
+						close;
+					case 5:
+						mes "Now, there are five of you. Needless to say, we still require more manpower. Please go out and seek another new member for our cause. Remember, only add one more person to your party and return to me.";
+						close;
+					case 6:
+						mes "There are now six of you. So far, so good. Please go forth and find just one more person to add to your party and bring him to me so that we may recruit him.";
+						close;
+					case 7:
+						mes "Now, there are seven of you, but we still lack the manpower we need. Please go forth and seek out one, and only one, more person to add to your party and then return to me.";
+						close;
 					}
 				}
 				mes "[Sun Mao]";
 				mes "Great work, you've brought another new comrade! Welcome! Please explain our goals and the righteousness of our cause to our new friend so that he may fully join us.";
 				next;
-				if(BaseLevel < 50)
-				{
+				if (BaseLevel < 50) {
 					mes "[Sun Mao]";
 					mes "It is almost time to take the action...";
 					next;
@@ -4750,88 +4750,70 @@ lou_in02,77,37,7	script	Hermit	824,{
 				mes "Since flammable chemicals are not allowed inside government offices, you must keep them well hidden. If the chemicals are equally divided among the eight of you, we might succeed!";
 				next;
 				set QL_REVOL,8;
-				getitem 7068,8;
-				getitem 7096,8;
-				getitem 7004,8;
+				getitem 7068,8; //Burn_Tree
+				getitem 7096,8; //Cold_Magma
+				getitem 7004,8; //Mud_Lump
 				mes "[Sun Mao]";
 				mes "There you go. Now, divide these materials equally among the eight of you. The eight of you must fully cooperate with each other, or our plan will fail. Understood?";
 				close;
-
-			}
-			else if(@partymember < QL_REVOL +1)
-			{
+			} else if (@partymember < QL_REVOL +1) {
 				mes "[Sun Mao]";
-				switch(QL_REVOL)
-				{
-					case 1:
-						mes "You made a party. Now, why don't you go recruit more followers? For now, just add one more person, lest we arouse the suspicion of our enemies.";
-						close;
-
-					case 2:
-						mes "Hmmm...";
-						mes "Having trouble finding a third person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
-						close;
-
-					case 3:
-						mes "Hmmm...";
-						mes "Having trouble finding a forth person to add to your party? I understand that it's important that you find someone you can trust. Be careful and don't get caught!";
-						close;
-
-					case 4:
-						mes "Having trouble finding a fifth person to add to your party? I understand that it's important that you find someone you can trust. Be careful and don't get caught!";
-						close;
-
-					case 5:
-						mes "Having trouble finding a six person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
-						close;
-
-					case 6:
-						mes "Having trouble finding a seventh person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
-						close;
-
-					case 7:
-						mes "Hmmm...";
-						mes "Having trouble finding an eighth person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
-						close;
+				switch(QL_REVOL) {
+				case 1:
+					mes "You made a party. Now, why don't you go recruit more followers? For now, just add one more person, lest we arouse the suspicion of our enemies.";
+					close;
+				case 2:
+					mes "Hmmm...";
+					mes "Having trouble finding a third person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
+					close;
+				case 3:
+					mes "Hmmm...";
+					mes "Having trouble finding a forth person to add to your party? I understand that it's important that you find someone you can trust. Be careful and don't get caught!";
+					close;
+				case 4:
+					mes "Having trouble finding a fifth person to add to your party? I understand that it's important that you find someone you can trust. Be careful and don't get caught!";
+					close;
+				case 5:
+					mes "Having trouble finding a six person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
+					close;
+				case 6:
+					mes "Having trouble finding a seventh person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
+					close;
+				case 7:
+					mes "Hmmm...";
+					mes "Having trouble finding an eighth person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
+					close;
 				}
-			}
-			else
-			{
+			} else {
 				mes "[Sun Mao]";
 				mes "Oh no! You've brought more than one more person to join us! We can't do any recruiting now, it will bring unnecessary attention to our activities!";
 				next;
 				mes "[Sun Mao]";
-				switch(QL_REVOL)
-				{
-					case 1:
-						mes "Please make sure that there is a total of two members in your party so that we can recruit your friend. I believe that will look natural.";
-						close;
-
-					case 2:
-						mes "At this stage in our plan, we cannot afford any unnecessary attention to our activities! Please make sure that there is a total of three members in your party so that we can recruit your friend.";
-						close;
-					case 3:
-						mes "Please make sure that there is a total of four members in your party so that we can recruit your friend. I believe that will look natural.";
-						close;
-					case 4:
-						mes "Please make sure that there is a total of five members in your party so that we can recruit your friend. I believe that will look natural.";
-						close;
-					case 5:
-					case 6:
-						mes "By this time, you should know that you should only bring one more person at a time. You know that it is crucial that we do not attract any undue attention before we can take action!";
-						close;
-					case 7:
-						mes "At this stage in our plan, we cannot afford any unnecessary attention to our activities! Please make sure that there is a total of eight members in your party so that we can recruit your friend.";
-						close;
+				switch(QL_REVOL) {
+				case 1:
+					mes "Please make sure that there is a total of two members in your party so that we can recruit your friend. I believe that will look natural.";
+					close;
+				case 2:
+					mes "At this stage in our plan, we cannot afford any unnecessary attention to our activities! Please make sure that there is a total of three members in your party so that we can recruit your friend.";
+					close;
+				case 3:
+					mes "Please make sure that there is a total of four members in your party so that we can recruit your friend. I believe that will look natural.";
+					close;
+				case 4:
+					mes "Please make sure that there is a total of five members in your party so that we can recruit your friend. I believe that will look natural.";
+					close;
+				case 5:
+				case 6:
+					mes "By this time, you should know that you should only bring one more person at a time. You know that it is crucial that we do not attract any undue attention before we can take action!";
+					close;
+				case 7:
+					mes "At this stage in our plan, we cannot afford any unnecessary attention to our activities! Please make sure that there is a total of eight members in your party so that we can recruit your friend.";
+					close;
 				}
 			}
-		}
-		else if(QL_REVOL == 8)
-		{
-			if(@partymember == 8)
-			{
-				if(countitem(7204) > 7)
-				{
+		} else if (QL_REVOL == 8) {
+			if (@partymember == 8) {
+				if (countitem(7204) > 7) {
 					mes "[Sun Mao]";
 					mes "Welcome back! I see that the mission has been successfully accomplished! Great work, men!";
 					next;
@@ -4863,11 +4845,8 @@ lou_in02,77,37,7	script	Hermit	824,{
 			mes "Remember that you move together with your comrades. There isn't a traitor amongst you, is there?";
 			close;
 		}
-	}
-	else
-	{
-		if(ch_make == 1)
-		{
+	} else {
+		if (ch_make == 1) {
 			set ch_make,0;
 			mes "[Sun Mao]";
 			mes "Ah...";
@@ -4886,13 +4865,10 @@ lou_in02,77,37,7	script	Hermit	824,{
 }
 
 lou_in01,43,147,3	script	Gunpowder Expert	750,{
-
-	if(ch_make == 0)
-	{
+	if (ch_make == 0) {
 		getpartymember(getcharid(1));
 		set @partymember,$@partymembercount;
-		if(!QL_REVOL)
-		{
+		if (!QL_REVOL) {
 			mes "[Hao Chenryu]";
 			mes "Who...";
 			mes "Are you?";
@@ -4900,9 +4876,7 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 			mes "[Hao Chenryu]";
 			mes "I only trust my comrades in the cause for Louyang, so leave me alone. Death before oppression! Freedom for Louyang!";
 			close;
-		}
-		else if(@partymember != 8)
-		{
+		} else if (@partymember != 8) {
 			mes "[Hao Chenryu]";
 			mes "Mao told me that eight Rune-Midgardians";
 			mes "would be coming.";
@@ -4913,9 +4887,7 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 			mes "Mao's plans are flawless,";
 			mes "so I'm sticking to the scenario he's drawn up. You're either improvising needlessly, or you're not really my comrade...";
 			close;
-		}
-		else if(countitem(7068) && countitem(7096) && countitem(7004))
-		{
+		 } else if (countitem(7068) && countitem(7096) && countitem(7004)) {
 			mes "[Hao Chenryu]";
 			mes "Ah, I see that Mao";
 			mes "has sent you. I'm sorry";
@@ -4929,34 +4901,30 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 			mes "I may quickly make";
 			mes "the gunpowder.";
 			next;
-			switch( select( "Make Gunpowder.","Cancel." ) )
-			{
-				case 1:
-					delitem 7068,1;
-					delitem 7096,1;
-					delitem 7004,1;
-					mes "[Hao Chenryu]";
-					mes "I don't want you to be caught if the soldiers inspect your goods. It will be better if one of you carry a Cart and hide the gunpowder in there.";
-					set ch_make,1;
-					getitem 7204,1;
-					close;
-
-				case 2:
-					mes "[Hao Chenryu]";
-					mes "Is...";
-					mes "Something wrong?!";
-					next;
-					mes "[Hao Chenryu]";
-					mes "I guess we must";
-					mes "be extra careful,";
-					mes "as there is much";
-					mes "surveillance in";
-					mes "this place.";
-					close;
+			switch(select("Make Gunpowder.:Cancel.")) {
+			case 1:
+				delitem 7068,1; //Burn_Tree
+				delitem 7096,1; //Cold_Magma
+				delitem 7004,1; //Mud_Lump
+				mes "[Hao Chenryu]";
+				mes "I don't want you to be caught if the soldiers inspect your goods. It will be better if one of you carry a Cart and hide the gunpowder in there.";
+				set ch_make,1;
+				getitem 7204,1; //Gunpowder
+				close;
+			case 2:
+				mes "[Hao Chenryu]";
+				mes "Is...";
+				mes "Something wrong?!";
+				next;
+				mes "[Hao Chenryu]";
+				mes "I guess we must";
+				mes "be extra careful,";
+				mes "as there is much";
+				mes "surveillance in";
+				mes "this place.";
+				close;
 			}
-		}
-		else
-		{
+		} else {
 			mes "[Hao Chenryu]";
 			mes "Hmmm...";
 			mes "It seems like";
@@ -4969,9 +4937,7 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 			mes "from your party leader.";
 			close;
 		}
-	}
-	else if(countitem(7204))
-	{
+	} else if (countitem(7204)) {
 		mes "[Hao Chenryu]";
 		mes "Be careful!";
 		mes "It's easy for";
@@ -4980,9 +4946,7 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 		mes "inspection process!";
 		mes "Hide it well...!";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Hao Chenryu]";
 		mes "I hope you bring the gunpowder to Mao safely. The next time you see him, please give him my thanks.";
 		close;
@@ -4990,9 +4954,7 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 }
 
 lou_in01,45,138,3	script	Soldier#1	825,{
-
-	if(countitem(7204))
-	{
+	if (countitem(7204)) {
 		mes "[Soldier]";
 		mes "Hold on there!";
 		next;
@@ -5010,9 +4972,7 @@ lou_in01,45,138,3	script	Soldier#1	825,{
 }
 
 lou_in01,82,139,7	script	Soldier#2	825,{
-
-	if(countitem(7068) || countitem(7096) || countitem(7004))
-	{
+	if (countitem(7068) || countitem(7096) || countitem(7004)) {
 		mes "[Soldier]";
 		mes "I am sorry, but it is prohibited to enter with some of the products";
 		mes "you are carrying. I cannot let you in.";
diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt
index 97d566778..5d0c7b099 100644
--- a/npc/quests/quests_lutie.txt
+++ b/npc/quests/quests_lutie.txt
@@ -1,22 +1,20 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Lutie
-//===== By: ================================================== 
+//===== By: ==================================================
 //= TonyMan & Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3b
-//===== Compatible With: ===================================== 
-//= rAthena 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Blush, Cake Hat, Candle, Chef Hat, Raccoon Hat, Rainbow Eggshell,
 //= Spore Hat, Wonder Nutshell Quests
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Optimized [Lupus]
 //= 1.2 Fixed Chef Hat items [Lupus]
 //= 1.3 Update NPC to the Official One. [Samuray22]
 //= 1.3a Changed item names to item IDs. [Samuray22]
 //= 1.3b Removed a scrap " left in a delitem. [L0ne_W0lf]
 //= 1.4 Updated NPCs once again. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 xmas,117,295,4	script	Vending Machine Man	704,{
 	mes "[Titicupe]";
@@ -39,18 +37,18 @@ xmas,117,295,4	script	Vending Machine Man	704,{
 		next;
 		mes "[Titicupe]";
 		mes "Oh, this creation of mine is so magnificent!";
-		Emotion e_kis2;
+		emotion e_kis2;
 		next;
 		mes "[Titicupe]";
 		mes "And the headgears--! I... I can't contain myself!";
 		next;
 		mes "^3355FFToy factory manager Titicupe jumps and convulses with joy. Clearly he's insane, but it may be possible that he may be brilliant.^000000";
-		Emotion e_gasp;
+		emotion e_gasp;
 		close;
 	case 2:
 		mes "[Titicupe]";
 		mes "Oh right! You need to know what kind of items to put into the Vending Machine to get what you want, yes? Go ahead... Ask me~";
-		Emotion e_ic;
+		emotion e_ic;
 		next;
 		switch(select("Raccoon Hat:Spore Hat:Wonder Nutshell:Ranbow Eggshell:Blush:Chef Hat:Candle:Cake Hat:End Conversation")) {
 		case 1:
@@ -133,7 +131,7 @@ xmas,117,295,4	script	Vending Machine Man	704,{
 		mes "I love you";
 		mes "Mister Snowman";
 		mes "Vending Machine.";
-		Emotion e_kis2;
+		emotion e_kis2;
 		next;
 		mes "^3355FFToy factory manager Titicupe begins to jump around and emit screams of unbridled ecstacy. At this point, it's not difficult to doubt his sanity, as well as his genius.";
 		close;
@@ -171,7 +169,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 1036,20;  //Dragon_Scale
 			delitem 7012,200;  //Tough_Scalelike_Stem
 			delitem 7065,300;  //Sea_Otter_Leather
-			Emotion e_Oh;
+			emotion e_Oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -192,7 +190,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 7033,850;  //Poison_Spore
 			delitem 7068,300;  //Burn_Tree
 			delitem 1015,1;  //Thin_N'_Long_Tongue
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -218,7 +216,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			mes "*Kapang!*";
 			mes "*BeepBoopBeepBoop*";
 			mes "*Beeeeeeoop*^000000";
-			Emotion e_oh;
+			emotion e_oh;
 			getitem 5050,1; // Mystery_Fruit_Shell
 			next;
 			mes "[Audi]";
@@ -235,7 +233,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 5015,1;  //Egg_Shell
 			delitem 978,1;  //Cobaltblue_Dyestuffs
 			delitem 7030,50;  //Claw_Of_Desert_Wolf
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -254,7 +252,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			mes "^3355FFYou gingerly place all 100 Aprons into the snowman's mouth.^000000";
 			next;
 			delitem 7047,100;  //Alice's_Apron
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -280,7 +278,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 982,1;  //White_Dyestuffs
 			delitem 949,330;  //Feather
 			delitem 1036,450;  //Dragon_Scale
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -302,7 +300,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 2279,1;  //Bomb_Wick
 			delitem 7035,50;  //Matchstick
 			delitem 526,100;  //Royal_Jelly
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -325,7 +323,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 538,15;  //Well_Baked_Cookie
 			delitem 539,20;  //Piece_Of_Cake
 			delitem 999,10;  //Steel
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -346,7 +344,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 		mes "Items.^000000";
 		close;
 	}
-	Emotion e_x;
+	emotion e_x;
 	mes "[Audi]";
 	mes "^555555Error Error!";
 	mes "Incorrect items!^000000";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 38320b344..ea37258d5 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -1,10 +1,10 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Morroc
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
-//= 2.9
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 3.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= - Stop Post
 //= - Binoculars Quest
@@ -12,7 +12,7 @@
 //= - Resurrection of Satan Morroc
 //= - The Crow of the Fate
 //= - Succession of the Prince
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed exploits [Lupus]
 //= 1.2 Added Dandelion's Request / Morroc Invasion quest. [SinSloth]
 //= 1.3 Updated dialogs from Binoculars Quest. [Samuray22]
@@ -41,7 +41,10 @@
 //= 2.8 Disabled Assassin bar pub NPCs, as they are included in the 13.1 quests file. [L0ne_W0lf]
 //= 2.9 Fixed player dying/logging out during conversation could prevent
 //=     summoning of Satan Morroc until server reboot. [Gepard]
-//============================================================ 
+//= 3.0 Updated RE/Pre-RE EXP. [Euphy]
+//= 3.1 Updated to match the latest official scripts. [Euphy]
+//= 3.2 Added GM management NPC and variable $@re_moc_time$. [Euphy]
+//============================================================
 
 // Stop Post Quest
 // ============================================================
@@ -64,7 +67,7 @@ moc_ruins,113,181,4	script	William	89,{
 		if ((countitem(1019) > 49) && (countitem(983) > 0) && (Zeny > 91099)) {
 			delitem 1019,50;  //Wooden_Block
 			delitem 983,1;  //Black_Dyestuffs
-			set Zeny,Zeny-91100;
+			set Zeny, Zeny-91100;
 			mes "[William]";
 			mes "Here you are~!";
 			mes "This ^3355FFStop Post^000000 has";
@@ -131,7 +134,7 @@ moc_ruins,118,176,4	script	Alchemist	64,{
 			next;
 			delitem 2243,1;  //Spinning_Eyes
 			delitem 999,100;  //Steel
-			set Zeny,Zeny-50000;
+			set Zeny, Zeny-50000;
 			mes "[Marius]";
 			mes "Here you are!";
 			mes "Binoculars !";
@@ -258,7 +261,7 @@ OnTouch:
 					mes "Hey, bartender! Gimme";
 					mes "the usual! I like your";
 					mes "style, adventurer...";
-					set zeny,zeny-1000;
+					set Zeny, Zeny-1000;
 					next;
 					mes "[Litheron]";
 					mes "Alright, you can come";
@@ -403,7 +406,7 @@ que_job01,82,95,3	script	Bar Master#moc_main01	46,{
 						mes "ask you for 800. Enjoy it,";
 						mes "my friend, and drink it as";
 						mes "deeply as you would life.";
-						set zeny,zeny-800;
+						set Zeny, Zeny-800;
 						getitem 12112,1; //Tropical_Sograt
 					}
 					close;
@@ -426,7 +429,7 @@ que_job01,82,95,3	script	Bar Master#moc_main01	46,{
 						mes "hard feelings, but you're";
 						mes "already lucky to be here.";
 						mes "Hey, enjoy your drink~";
-						set zeny,zeny-1000;
+						set Zeny, Zeny-1000;
 						getitem 12112,1; //Tropical_Sograt
 						close;
 					}
@@ -462,7 +465,7 @@ que_job01,82,95,3	script	Bar Master#moc_main01	46,{
 						mes "ask you for 800. Enjoy it,";
 						mes "my friend, and drink it as";
 						mes "deeply as you would life.";
-						set zeny,zeny-800;
+						set Zeny, Zeny-800;
 						getitem 12113,1; //Vermilion_The_Beach
 					}
 					close;
@@ -485,7 +488,7 @@ que_job01,82,95,3	script	Bar Master#moc_main01	46,{
 						mes "hard feelings, but you're";
 						mes "already lucky to be here.";
 						mes "Hey, enjoy your drink~";
-						set zeny,zeny-1000;
+						set Zeny, Zeny-1000;
 						getitem 12113,1; //Vermilion_The_Beach
 						close;
 					}
@@ -661,18 +664,15 @@ que_job01,49,49,5	script	Tao#dan_09	877,{
 }
 
 que_job01,51,55,0	script	que_job01#room_1	45,1,1,{
-OnInit:
-	set $maobar_room,0;
-	end;
 
-Onreset:
-	set $maobar_room,0;
+OnReset:
+	set $@maobar_room,0;
 	end;
 
 OnTouch:
 	if (prt_curse == 24) {
-		if ($maobar_room == 0) {
-			set $maobar_room,1;
+		if ($@maobar_room == 0) {
+			set $@maobar_room,1;
 			donpcevent " #room1timer::OnEnable";
 			donpcevent "Marjana#poison::OnEnable";
 			mes "[Tao]";
@@ -696,8 +696,8 @@ OnTouch:
 		}
 	}
 	else if (mao_request > 0) {
-		if ($maobar_room == 0) {
-			set $maobar_room,1;
+		if ($@maobar_room == 0) {
+			set $@maobar_room,1;
 			donpcevent " #room1timer::OnEnable";
 			donpcevent "Valdes#moc_master_1::OnEnable";
 			mes "[Tao]";
@@ -739,12 +739,12 @@ OnEnable:
 	mapannounce "que_job01","You will now enter the Master Zone, Area 1.",bc_map,"0x70DBDB";
 	end;
 
-Onstop:
+OnStop:
 	mapannounce "que_job01","The security magic in the Master Zone, Area 1 is deactivated.",bc_map,"0x70DBDB";
 	donpcevent "#room1_warp::OnDisable";
 	donpcevent "Valdes#moc_master_1::OnDisable";
 	donpcevent "Marjana#poison::OnDisable";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 	end;
 
@@ -760,7 +760,7 @@ OnTimer245000:
 
 OnTimer250000:
 	mapannounce "que_job01","The security magic Master Zone, Area 1 is now activated.",bc_map,"0x70DBDB";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 	end;
 }
@@ -1616,7 +1616,7 @@ morocc,159,113,3	script	Chief Balrog	752,{
 			mes "Once again, I thank you for your distinguished service on behalf of the Continental Guard and the Rune-Midgarts Kingdom. I'll report your great achievement to His Majesty right away.";
 			next;
 			delitem 7820,1; //Morroc_Skin
-			getexp 200000,0;
+			getexp (checkre(3))?200000:2000000,0;
 			set rebirth_moc_edq,7;
 			changequest 3055,3056;
 			mes "[Chief Balrog]";
@@ -1858,9 +1858,10 @@ morocc,159,113,3	script	Chief Balrog	752,{
 }
 
 moc_fild21,38,193,0	script	Morocc Timer#edq	-1,6,6,{
-OnInit:
-	set $@re_moc,0;
-	end;
+//OnInit:
+//	set $@re_moc,0;
+//	set $@re_moc_time$,"";
+//	end;
 
 OnTouch:
 	if ($@re_moc == 0) {
@@ -1926,6 +1927,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "Group of Evil#edq";
+	set $@re_moc_time$,"";
 	end;
 
 OnDisable:
@@ -2000,6 +2002,7 @@ OnDisable:
 
 OnMyMobDead:
 	set $@re_moc,3;
+	set $@re_moc_time$, gettimestr("%H%M%S",7);
 	mapannounce "moc_fild21","I'll let live just a little longer. You'll never find me through this time-space gap!",bc_map,"0xFFFF00";
 	donpcevent "Time-Space Gap#edq::OnEnable";
 	donpcevent "Satan Broadcast#edq::OnDisable";
@@ -2020,6 +2023,84 @@ OnTimer5415000:
 	end;
 }
 
+sec_in02,14,43,5	script	Morroc GlobalVar Admin::MorrocAdmin_sec	971,{
+	callfunc "F_GM_NPC";
+	mes "[Helper]";
+	mes "Please enter the password and # button.";
+	next;
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "[Helper]";
+		mes "Please press the numbers we always sing about.";
+		close;
+	} else {
+		mes "[Helper]";
+		mes "Hello. I am a post office.";
+		mes "I am currently checking Morroc status.";
+		next;
+		mes "=============";
+		mes "Current State";
+		mes "=============";
+		mes "^3131FF<Morroc>^000000";
+		if ($@re_moc == 0) {
+			mes "Reset. Enable to summon Morroc.";
+			mes "^3131FF<Continental Guards>^000000";
+			mes "Enable to enter to moc_fild21 field.";
+		} else if ($@re_moc == 1) {
+			mes "^3131FF<Morroc>^000000";
+			mes "Some warrior entered after the reset. However, the warrior hasn't started the quest yet.";
+			mes "The warrior who has rebirth_moc_edq 4 and 7 is now enabled to summon Morroc.";
+			mes "^3131FF<Continental Guards>^000000";
+			mes "The warrior who has rebirth_moc_edq 4 ~ 7 is now enabled to enter to moc_fild21.";
+		} else if ($@re_moc == 2) {
+			mes "^3131FF<Morroc>^000000";
+			mes "Morroc has been summoned. After 90 minutes has passed, it will revert back to reset status.";
+			mes "^3131FF<Continental Guards>^000000";
+			mes "The warrior who has rebirth_moc_edq 4 ~ 7 is now enabled to enter to moc_fild21.";
+		} else if ($@re_moc == 3) {
+			mes "^3131FF<Morroc>^000000";
+			mes "Morroc has been killed. Death time is "+$@re_moc_time$+"(00 hr/00 min/00 sec).";
+			mes "After 6 hours later since the death time, it will be reset.";
+			mes "The warriors whom has remained in the field can continue the quest via Time Space Gap.";
+			mes "^3131FF<Continental Guards>^000000";
+			mes "Disabled to enter to moc_fild21 from outside of the field.";
+		} else {
+			mes "^3131FF<Morroc>^000000";
+			mes "Morroc has been killed. Death time is "+$@re_moc_time$+"(00 hr/00 min/00 sec).";
+			mes "After 6 hours later since the death time, it will be reset.";
+			mes "It has been already passed 30 minutes after Morroc's death, so warriors can not continue the quest even if they click the Time Space Gap.";
+			mes "^3131FF<Continental Guards>^000000";
+			mes "Disabled to enter to moc_fild21 from outside of the field.";
+		}
+		next;
+		mes "[Helper]";
+		mes "What do you want?";
+		next;
+		switch(select("Cancel.:Reset")) {
+		case 1:
+			mes "[Helper]";
+			mes "Alright.";
+			close;
+		case 2:
+			if (strnpcinfo(4) == "sec_in02")
+				mes "You can reset at moc_fild21 5 5.";
+			else {
+				mes "Reset starts.";
+				next;
+				donpcevent "Group of Evil#edq::OnEnable";
+				mes "Group of Evil NPC is appeared.";
+				mes "Time-Space Gap NPC is disappeared.";
+				mes "6 hours term timer is stopped.";
+				donpcevent "Satan Summon#edq::OnDisable";
+				mes "Morroc 90 minutes survival timer is stopped.";
+				mes "Morroc is being killed.";
+				mes "Now, Continental Guards will let players enter.";
+			}
+			close;
+		}
+	}
+}
+moc_fild21,5,5,5	duplicate(MorrocAdmin_sec)	Morroc GlobalVar Admin::MorrocAdmin_moc	971
+
 // The Crow of the Fate
 // ============================================================
 moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
@@ -2037,7 +2118,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 			next;
 			mes "^660000Watching him makes you giggle, he looks no better than the dried corpses in the pyramid, but he is obviously alive and doesn't appear to be a monster. Somehow, you find yourself compelled to approach this interesting looking man.^000000";
 			next;
-			emotion 3;
+			emotion e_lv;
 			mes "[Book-Touching Man]";
 			mes "Ah... Mammi...";
 			next;
@@ -2070,7 +2151,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				mes "[Book-Touching Man]";
 				mes "What? Don't you know Mammi, one of the three greatest Rune-Midgart's idols?";
 				next;
-				emotion 54;
+				emotion e_sigh;
 				mes "[Book-Touching Man]";
 				mes "Man, you don't know anything, do you?! Well, judging by the stupid look on your face, I guess you're an adventurer running around on meaningless errands for others. Heh heh!";
 				next;
@@ -2083,7 +2164,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				mes "[Book-Touching Man]";
 				mes "She even mentioned in an interview in 'Morroc Times' that she wants to meet a man that loves books.";
 				next;
-				emotion 38;
+				emotion e_awsm;
 				mes "[Book-Touching Man]";
 				mes "That means... She's waiting for someone like me. Hehehe!";
 				mes "You see, every book in Rune-Midgart's Library has the name Benjamin written on them... That's me!";
@@ -2119,7 +2200,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				next;
 				mes "["+ strcharinfo(0) +"]";
 				mes "Huh?";
-				emotion 19,1;
+				emotion e_swt2,1;
 				next;
 				mes "[Benjamin]";
 				mes "You look bored. You must be waiting for someone to give you something to do!";
@@ -2213,12 +2294,12 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 			next;
 			mes "[Benjamin]";
 			mes "Grrrr... Mammi! Here I am, following your noble tastes to read such a rare book! Mammi...!";
-			emotion 14;
+			emotion e_lv2;
 			next;
 			mes "[Benjamin]";
 			mes "I feel so excited to think about having a deep conversation with Mammi about literature! Yay!";
 			mes "I should go read this book right away. Hehehe!";
-			emotion 2;
+			emotion e_ho;
 			next;
 			mes "[Benjamin]";
 			mes "Oops, I must not forget to repay you. You know, I'm a polite man.";
@@ -2315,7 +2396,10 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 					delitem 7797,1; //Author_Memo
 					delitem 7796,1; //Author_Autograph
 					set barmunt_crow,16;
-					getexp 90000,90000;
+					if (checkre(3))
+						getexp 90000,90000;
+					else
+						getexp 900000,900000;
 					close;
 				case 2:
 					mes "[Benjamin]";
@@ -3366,7 +3450,7 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 		cutin "oliver_smile",2;
 		mes "[Oliver Hilpert]";
 		mes "Lady Mammi!";
-		emotion 14;
+		emotion e_lv2;
 		next;
 		mes "^660000Yes, it was the picture book of Mammi, an idol whom Benjamin of Morroc insists to be one of the three greatest idols in the Rune-Midgart Kingdom. That must be why Oliver is squealing in delight.^000000";
 		emotion e_dots,1;
@@ -3393,12 +3477,12 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 		mes "[Oliver Hilpert]";
 		mes "...Oh!";
 		cutin "mami01",4;
-		emotion 3;
+		emotion e_lv;
 		next;
 		mes "[Oliver Hilpert]";
 		mes "...Ooooh!";
 		cutin "mami02",4;
-		emotion 3;
+		emotion e_lv;
 		next;
 		cutin "oliver_smile",2;
 		mes "[Oliver Hilpert]";
@@ -3420,7 +3504,7 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 		mes "["+ strcharinfo(0) +"]";
 		mes "...............";
 		mes "I... I see...";
-		emotion 4,1;
+		emotion e_swt,1;
 		next;
 		mes "[Oliver Hilpert]";
 		mes "Umm...";
@@ -3502,7 +3586,7 @@ OnTouch:
 		warp "ama_dun03",119,110;
 	}
 	else {
-		sc_end SC_Blind;
+		sc_end SC_BLIND;
 		mes "[???]";
 		mes "Waaaaah!";
 		next;
@@ -3617,7 +3701,7 @@ OnTouch:
 		if (barmunt_crow == 4) {
 			set barmunt_crow,5;
 		}
-		sc_start SC_Blind,600000,0,10000;
+		sc_start SC_BLIND,600000,0,10000;
 		close2;
 		warp "que_ba",53,232;
 		end;
@@ -3852,7 +3936,7 @@ cave,82,97,3	script	Cave Settler#g1	996,3,3,{
 				mes "Hmm...";
 				mes "Wait here.";
 				next;
-				emotion 44;
+				emotion e_com;
 				mes "[Cave Settler]";
 				mes "Hey, Jaeda!";
 				enablenpc "Jaeda#garas1";
@@ -3941,7 +4025,7 @@ OnTouch:
 				mes "Hmm...";
 				mes "Wait here.";
 				next;
-				emotion 44;
+				emotion e_com;
 				mes "[Cave Settler]";
 				mes "Hey, Jaeda!";
 				enablenpc "Jaeda#garas1";
@@ -4369,7 +4453,7 @@ prontera,153,353,4	script	Messenger#prince1	105,{
 }
 
 prt_castle,117,163,5	script	Inspector#prince	755,{
-	if (checkquest(10004) == 1) {
+	if (checkquest(10004) == 0 || checkquest(10004) == 1) {
 		mes "[Inspector]";
 		mes "Judge!";
 		mes "How goes it? I don't think it is easy to meet seven candidates and appraise them.";
@@ -4408,7 +4492,7 @@ prt_castle,117,163,5	script	Inspector#prince	755,{
 		setquest 10022;
 		close;
 	}
-	if (nk_prince == 1) {
+	if (nk_prince < 2) {
 		mes "[Inspector]";
 		mes "What's wrong with you?";
 		mes "This is not an open area!";
@@ -4421,6 +4505,12 @@ prt_castle,117,163,5	script	Inspector#prince	755,{
 			warp "prontera",155,353;
 			end;
 		case 2:
+			if (nk_prince == 0) {
+				mes "[Inspector]";
+				mes "I don't think";
+				mes "that he is an experienced appraiser...";
+				close;
+			}
 			mes "[Inspector]";
 			mes "......";
 			next;
@@ -5153,7 +5243,7 @@ prt_castle,117,163,5	script	Inspector#prince	755,{
 		mes "How is it going?";
 		mes "Grading someone is not a piece of cake. It's real hard work indeed. You do the hard work for our country.";
 		next;
-		if ((nkprince_eisen == 15) && (checkquest(10025) == 1)) {
+		if ((nkprince_eisen == 15) && (checkquest(10025) == 0 || checkquest(10025) == 1)) {
 			mes "-I tell him about the Ahrum and Ernst accident.-";
 			next;
 			mes "[Inspector]";
@@ -5178,23 +5268,20 @@ prt_castle,117,163,5	script	Inspector#prince	755,{
 			mes "[Inspector]";
 			mes "So, keep up the good work.";
 			mes "For the Kingdom of Rune Midgarts!";
-			if ((BaseLevel > 80) && (BaseLevel < 86)) {
-				getexp 40000,0;
-			}
-			else if ((BaseLevel > 85) && (BaseLevel < 91)) {
-				getexp 45000,0;
-			}
-			else if ((BaseLevel > 90) && (BaseLevel < 96)) {
-				getexp 50000,0;
-			}
-			else if ((BaseLevel > 95) && (BaseLevel < 150)) {
-				getexp 55000,0;
-			}
-			else if (BaseLevel == 150) {
-				getexp 110000,0;
-			}
-			else {
-				getexp 30000,0;
+			if (checkre(3)) {
+				if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 40000,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 45000,0;
+				else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 50000,0;
+				else if ((BaseLevel > 95) && (BaseLevel < 99)) getexp 55000,0;
+				else if (BaseLevel > 99) getexp 110000,0;
+				else getexp 30000,0;
+			} else {
+				if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 400000,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 450000,0;
+				else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 500000,0;
+				else if ((BaseLevel > 95) && (BaseLevel < 99)) getexp 550000,0;
+				else if (BaseLevel >= 99) getexp 1100000,0;
+				else getexp 300000,0;
 			}
 			set nk_prince,8;
 			completequest 10025;
@@ -5216,19 +5303,49 @@ prt_castle,117,163,5	script	Inspector#prince	755,{
 		mes "[Inspector]";
 		mes "Hello, appraiser.";
 		mes "I hope you are able to finish your mission perfectly. Have you met with all the princes, like I told you to?";
+		if (nkprince_eisen != 10)
+			close;
 		next;
 		switch(select("Yes.:No.")) {
 		case 1:
-			mes "[Inspector]";
-			mes "Very well.";
-			mes "I like hearing about the princes.";
+			set .@prin1,checkquest(10005);
+			set .@prin2,checkquest(10006);
+			set .@prin3,checkquest(10007);
+			set .@prin4,checkquest(10008);
+			set .@prin5,checkquest(10009);
+			set .@prin6,checkquest(10010);
+			set .@prin7,checkquest(10011);
+			if (.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7 == 14) {
+				mes "[Inspector]";
+				mes "Very well.";
+				mes "I like hearing about the princes.";
+				completequest 10004;
+				setquest 10004;
+			} else {
+				mes "[Inspector]";
+				mes "Are you sure?";
+				mes "Please check on all the princes.";
+			}
 			close;
 		case 2:
-			mes "[Inspector]";
-			mes "Don't be coy. I'm sure you have done it already.";
+			set .@prin1,checkquest(10005);
+			set .@prin2,checkquest(10006);
+			set .@prin3,checkquest(10007);
+			set .@prin4,checkquest(10008);
+			set .@prin5,checkquest(10009);
+			set .@prin6,checkquest(10010);
+			set .@prin7,checkquest(10011);
+			if (.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7 == 14) {
+				mes "[Inspector]";
+				mes "Don't be coy. I'm sure you have done it already.";
+				completequest 10004;
+				setquest 10004;
+			} else {
+				mes "[Inspector]";
+				mes "My investigations on all the princes are done.";
+			}
 			close;
 		}
-		close;
 	}
 }
 
@@ -5244,7 +5361,7 @@ prt_castle,272,375,4	script	Prince	881,{
 		mes "But he insists me to be corrupted, knowing how it would be...";
 		close;
 	}
-	else if (checkquest(10020) == 1) {
+	else if (checkquest(10020) == 0 || checkquest(10020) == 1) {
 		mes "[Erich]";
 		mes "These days, I have bad luck... Only harrassments happen to me...";
 		close;
@@ -5310,7 +5427,7 @@ prt_castle,274,372,4	script	Servant#hans	48,{
 		mes "My prince didn't do anything wrong but, anyways, I apologize for anything to you!";
 		close;
 	}
-	else if (checkquest(10020) == 1) {
+	else if (checkquest(10020) == 0 || checkquest(10020) == 1) {
 		mes "Incessantly...-";
 		mes "-He has jitters whenever I react to him. His actions give me a feeling of pity.-";
 		close;
@@ -5398,7 +5515,7 @@ prt_castle,339,202,3	script	Prince#urgen	989,{
 		mes "My beautiful body isn't in perfect condition right now. I don't want to show it to anyone today.";
 		close;
 	}
-	else if (checkquest(10021) == 1) {
+	else if (checkquest(10021) == 0 || checkquest(10021) == 1) {
 		mes "[Urugen]";
 		mes "...What? What did you...";
 		mes "just say to me?... Huh?";
@@ -5499,7 +5616,7 @@ prt_castle,289,201,3	script	Prince#helmut	991,{
 		mes "How can I deal with this stress? Damn! Hell!";
 		close;
 	}
-	else if (checkquest(10022) == 1) {
+	else if (checkquest(10022) == 0 || checkquest(10022) == 1) {
 		mes "-He is so blushed,";
 		mes "evidently shown on his face.-";
 		close;
@@ -5694,7 +5811,7 @@ prt_castle,391,205,3	script	Prince#poe	993,{
 		mes "He gave up without any challenge. That's not what the man has to do. He is not as good as me. But okay. I am disappointed in him. Eigen Ahrum.";
 		close;
 	}
-	else if (checkquest(10018) == 1) {
+	else if (checkquest(10018) == 0 || checkquest(10018) == 1) {
 		mes "[Poe]";
 		mes "......";
 		close;
@@ -5915,10 +6032,32 @@ prt_castle,364,375,4	script	Prince#peter	987,{
 		next;
 		switch(select("Yes, I saw her for you.:No, I don't want to.")) {
 		case 1:
+			if (checkquest(10014) == 0 || checkquest(10014) == 1) {
+				mes "[Peter]";
+				mes "I am glad that the girl liked it. Once I got cured, I wanted to go meet with her.";
+				next;
+				mes "[Peter]";
+				mes "Anyhow, thanks for your good work. I really feel sorry about bothering you with trifle things. This is my sense of gratitude. Don't feel so much burden and take this.";
+				completequest 10014;
+				getitem 644,1; //Gift_Box
+				close;
+			}
 			mes "[Peter]";
 			mes "Thinking about the little girl calms me. I still can't believe my eyes. My prince Ahrum who just passed away...~";
 			close;
 		case 2:
+			if (checkquest(10014) == 0 || checkquest(10014) == 1) {
+				mes "[Peter]";
+				mes "As you said.";
+				mes "I've heard that her life is like a flower when I lost it.";
+				mes "I will go see her on my own.";
+				next;
+				mes "[Peter]";
+				mes "I really feel sorry about bothering you with trifle things. Please take this.";
+				completequest 10014;
+				getitem 644,1; //Gift_Box
+				close;
+			}
 			mes "[Peter]";
 			mes "Never mind.";
 			mes "I still can't believe my eyes. My prince Ahrum who just passed away...~~";
@@ -5930,19 +6069,20 @@ prt_castle,364,375,4	script	Prince#peter	987,{
 		mes "Child... What the heck happened to you?...";
 		close;
 	}
-	else if (checkquest(10019)== 1) {
+	else if (checkquest(10019) == 0 || checkquest(10019) == 1) {
 		mes "[Peter]";
 		mes "......";
 		close;
 	}
 	if (checkquest(10008) == 2) {
-		if (checkquest(10014) == 2) {
+		set .@quest, checkquest(10014);
+		if (.@quest == 2) {
 			mes "[Peter]";
 			mes "I really appreciate it.";
 			mes "You are so kind.";
 			close;
 		}
-		else if (checkquest(10014) == 1) {
+		else if (.@quest == 0 || .@quest == 1) {
 			mes "[Peter]";
 			mes "I am glad that the girl liked it. Once I got cured, I wanted to go meet with her.";
 			next;
@@ -6068,9 +6208,8 @@ prt_castle,364,375,4	script	Prince#peter	987,{
 }
 
 aldebaran,132,184,3	script	Girl#prince	96,{
-	if (checkquest(10013) == 1) {
+	if (checkquest(10013) == 0 || checkquest(10013) == 1) {
 		if (countitem(744) > 0) {
-			// Missed
 			mes "[Girl]";
 			mes "Wooah, Uncle Peter sent these flowers";
 			mes "for me?";
@@ -6314,12 +6453,13 @@ prt_castle,314,373,4	script	Prince#eisen	983,{
 			close;
 		}
 		else if (nkprince_eisen == 14) {
+			mes "[Ernst]";
 			mes "Bbb... Brother?... You... told me ";
 			mes "you would kill me... You just wanted to be killed";
 			mes "by me?... Bbb...brother?...";
 			next;
 			mes "[Ahrum]";
-			mes "Huhu... Not at all. I just wanted to kill you... That's it... Good job, Ern... This is legal, self-defense; killing a villain... right?";
+			mes "Huhu... Not at all. I just wanted to kill you... That's it... Good job, Ern... This is legal self-defense, killing a villain... right?";
 			next;
 			mes "[Ernst]";
 			mes "B..Brother... even now it is not too late! If you go to a medic, you can be restored!";
@@ -6565,7 +6705,7 @@ prt_castle,368,312,4	script	Prince#ern	985,{
 		mes "I don't want to see anyone.";
 		close;
 	}
-	else if (checkquest(01024) == 1) {
+	else if (checkquest(10024) == 0 || checkquest(10024) == 1) {
 		mes "[Ernst]";
 		mes "...Brother Ahrum...";
 		close;
@@ -6754,8 +6894,8 @@ prt_castle,163,319,0	script	#twonoble	-1,3,3,{
 //OnTouch2:
 OnTouch:
 	if (nkprince_eisen == 7) {
-		donpcevent "Aged Noble 1#valter::OnEnable";
-		donpcevent "Aged Noble 2#rihart::OnEnable";
+		donpcevent "Young Noble#valter::OnEnable";
+		donpcevent "Aged Noble#rihart::OnEnable";
 		mes "[Aged Noble]";
 		mes "You don't have to worry.";
 		mes "Once my Eigen Ahrum is chosen to be king, the Richard family will be a second magnate.";
@@ -6810,8 +6950,8 @@ OnTouch:
 		next;
 		mes "[A man of Riehart Family]";
 		mes "Never mind...";
-		donpcevent "Aged Noble 1#valter::OnDisable";
-		donpcevent "Aged Noble 2#rihart::OnDisable";
+		donpcevent "YoungNoble#valter::OnDisable";
+		donpcevent "Aged Noble#rihart::OnDisable";
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "(Walter is the name of Ahrum.";
@@ -6825,41 +6965,41 @@ OnTouch:
 	}
 }
 
-prt_castle,156,325,4	script	Aged Noble 1#valter	86,{
-	mes "[Aged Noble]";
+prt_castle,156,325,4	script	Young Noble#valter	86,{
+	mes "[Young Noble Walter]";
 	mes "Step aside.";
 	mes "How dare you talk to him.";
 	close;
 
 OnInit:
-	disablenpc "Aged Noble 1#valter";
+	disablenpc "Young Noble#valter";
 	end;
 
 OnEnable:
-	enablenpc "Aged Noble 1#valter";
+	enablenpc "Young Noble#valter";
 	end;
 
 OnDisable:
-	disablenpc "Aged Noble 1#valter";
+	disablenpc "Young Noble#valter";
 	end;
 }
 
-prt_castle,157,323,3	script	Aged Noble 2#rihart	880,{
-	mes "[Aged Noble]";
+prt_castle,157,323,3	script	Aged Noble#rihart	880,{
+	mes "[Aged Noble Richard]";
 	mes "Hmm-hmm.";
 	mes "What an indecorous person!";
 	close;
 
 OnInit:
-	disablenpc "Aged Noble 2#rihart";
+	disablenpc "Aged Noble#rihart";
 	end;
 
 OnEnable:
-	enablenpc "Aged Noble 2#rihart";
+	enablenpc "Aged Noble#rihart";
 	end;
 
 OnDisable:
-	disablenpc "Aged Noble 2#rihart";
+	disablenpc "Aged Noble#rihart";
 	end;
 }
 
@@ -7597,7 +7737,7 @@ OnTouch:
 
 prt_castle,336,276,0	script	#ern	45,1,1,{
 OnTouch:
-	if (checkquest(10023) == 1) {
+	if (checkquest(10023) == 0 || checkquest(10023) == 1) {
 		donpcevent "Prince#eisen6::OnEnable";
 	}
 	warp "prt_castle",368,308;
@@ -7606,7 +7746,7 @@ OnTouch:
 
 prt_castle,300,276,0	script	#erich	45,1,1,{
 OnTouch:
-	if (checkquest(10020) == 1) {
+	if (checkquest(10020) == 0 || checkquest(10020) == 1) {
 		donpcevent "Prince#eisen1::OnEnable";
 	}
 	warp "prt_castle",274,368;
@@ -7615,7 +7755,7 @@ OnTouch:
 
 prt_castle,330,271,0	script	#helmut	45,1,1,{
 OnTouch:
-	if (checkquest(10022) == 1) {
+	if (checkquest(10022) == 0 || checkquest(10022) == 1) {
 		donpcevent "Prince#eisen3::OnEnable";
 	}
 	warp "prt_castle",290,208;
@@ -7624,7 +7764,7 @@ OnTouch:
 
 prt_castle,348,271,0	script	#poe	45,1,1,{
 OnTouch:
-	if (checkquest(10018) == 1) {
+	if (checkquest(10018) == 0 || checkquest(10018) == 1) {
 		donpcevent "Prince#eisen4::OnEnable";
 	}
 	warp "prt_castle",390,208;
@@ -7633,7 +7773,7 @@ OnTouch:
 
 prt_castle,354,276,0	script	#peter	45,1,1,{
 OnTouch:;
-	if (checkquest(10019) == 1) {
+	if (checkquest(10019) == 0 || checkquest(10019) == 1) {
 		donpcevent "Prince#eisen5::OnEnable";
 	}
 	warp "prt_castle",366,368;
@@ -7642,7 +7782,7 @@ OnTouch:;
 
 prt_castle,310,271,0	script	#urgen	45,1,1,{
 OnTouch:
-	if (checkquest(10021) == 1) {
+	if (checkquest(10021) == 0 || checkquest(10021) == 1) {
 		donpcevent "Prince#eisen2::OnEnable";
 	}
 	warp "prt_castle",340,208;
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 9d1fa6f49..4530757b1 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -1,16 +1,14 @@
-//===== Hercules Script ====================================== 
+//===== Hercules Script ======================================
 //= Moscovia Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
-//= 2.2
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.3
+//===== Description: =========================================
 //= Quests for Moscovia.
 //= The Moving Island, Help Mikhail, Acorn Exchange,
 //= Banish Winter, Shafka Hat, Koshei the Immortal.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [Kisuka]
 //= 1.1 Small fixes on The Moving Island. [Kisuka]
 //= 1.2 Fixed a "player not attached" error. [brianluau]
@@ -26,7 +24,8 @@
 //= 2.0b Bug fixes. [Lemongrass]
 //= 2.1 Fixed incorrect use of 'close'. [Joseph]
 //= 2.2 Updated RE/Pre-RE EXP. [Euphy]
-//============================================================ 
+//= 2.3 Added GM management NPC. [Euphy]
+//============================================================
 
 // The Moving Island :: mos_whale_edq
 //============================================================
@@ -11849,4 +11848,57 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 		close;
 	}
 	end;
-}
\ No newline at end of file
+}
+
+mosk_dun01,3,3,3	script	Koshei GlobalVar#admin	958,{
+	callfunc "F_GM_NPC";
+	mes "[Koshei GlobalVar]";
+	mes "Please enter the password";
+	set .@i, callfunc("F_GM_NPC","orchid",1);
+	next;
+	if (.@i == 0) {
+		mes "[Koshei GlobalVar]";
+		mes "Please input the password exactly.";
+		close;
+	} else {
+		mes "[Koshei GlobalVar]";
+		mes "I can tell you what the";
+		mes "Koshei GlobalVar";
+		mes "$@rus_req02";
+		mes "on mosk_dun01";
+		mes "is currently set to.";
+		next;
+		if ($@rus_req02 == 0) {
+			mes "[Koshei GlobalVar]";
+			mes "Currently the GlobalVar $@rus_req02 is set to 0";
+			next;
+		} else if ($@rus_req02 == 1) {
+			mes "[Koshei GlobalVar]";
+			mes "Currently the GlobalVar $@rus_req02 is set to 1";
+			next;
+		} else {
+			mes "[Koshei GlobalVar]";
+			mes "error";
+			close;
+		}
+		mes "[Koshei GlobalVar]";
+		mes "What would you like to set the GlobalVar to?";
+		next;
+		switch(select("0:1:Cancel")) {
+		case 1:
+			mes "[Koshei GlobalVar]";
+			mes "GlobalVar $@rus_req02 will now be set to '0'";
+			set $@rus_req02,0;
+			donpcevent "Koshei#rus47::OnDisable";
+			close;
+		case 2:
+			mes "[Koshei GlobalVar]";
+			mes "GlobalVar $@rus_req02 will now be set to '1'";
+			set $@rus_req02,1;
+			donpcevent "Koshei#rus47::OnEnable";
+			close;
+		case 3:
+			close;
+		}
+	}
+}
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index a8d9c7f93..1fc4858b5 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -1,11 +1,11 @@
 //===== Hercules Script ======================================
 //= Nameless Island Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.4
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Collection of Nameless Island Quests
 //= Nameless Island:
 //= - Quest to gain access to Nameless Island and dungeon.
@@ -32,13 +32,13 @@
 //= Rogue Guild Investigation Assistance:
 //- - Assist the Rogue Guild with their investigations.
 //= - Variable in use: rumour_nd (Max: 22)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Made quest accessable to "Failed" gaebolg quest. [L0ne_W0lf]
 //= 1.1a Touch up to other Gaebolg fail-points. [L0ne_W0lf]
 //= 1.2 Some final tuning to Nameless Island quest. [Koca]
 //= 1.3 Should fix any more issues with "Creature" npc. [L0ne_W0lf]
-//= 1.4 Changed the way aru_warp works slightly. [L0ne_W0lf]
+//= 1.4 Changed the way Out_from_Monastery works slightly. [L0ne_W0lf]
 //= 1.5 added a next to stop double npc message [Yommy]
 //= 1.6 Updated the Nameless Island Access quest
 //=     Added Quest: Peace for Arunafeltz
@@ -58,18 +58,19 @@
 //=     - Broken Diamond
 //=     - Z-Gang Quest
 //= 2.2a Fixed a few job constant typos. [Euphy]
-//= 2.3 Removed Strange Machine [Streusel]
-//= 2.4 Added renewal checks for exp distribution [Streusel]
-//============================================================ 
+//= 2.3 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.4 Moved Dorian to pre-re/re paths. [Euphy]
+//= 2.5 Updated Nameless Island quests and added questlog support. [Euphy]
+//============================================================
 
-// Nameless Island and Cursed Monestary Access Quest
+// Nameless Island and Cursed Monestary Access Quest :: aru_monas
 //============================================================
-airplane_01,95,61,3	script	QuestTrigger#Aru	-1,3,3,{
+airplane_01,90,63,0	script	Event Switch#pc	-1,3,3,{
 	end;
 
 OnTouch:
 	if ((prt_curse == 36 || prt_curse == 45 || prt_curse == 56 || prt_curse == 61) && (aru_monas < 1)) {
-		hideoffnpc "Agent#Aru";
+		hideoffnpc "Agent#pc1";
 		mes "[????]";
 		mes "Are you "+strcharinfo(0)+"?";
 		mes "I've been waiting for you.";
@@ -77,18 +78,19 @@ OnTouch:
 		mes "your arrival at ^6B8E23Prontera";
 		mes "Church^000000. Please visit him";
 		mes "as soon as you can.";
-		close2;
 		set aru_monas,1;
-		hideonnpc "Agent#Aru";
+		setquest 17000;
+		close2;
+		hideonnpc "Agent#pc1";
 	}
 	end;
 }
 
-airplane_01,95,61,3	script	Agent#Aru	899,5,5,{
+airplane_01,95,61,3	script	Agent#pc1	899,{
 	end;
 
 OnInit:
-	hideonnpc "Agent#Aru";
+	hideonnpc "Agent#pc1";
 	end;
 }
 
@@ -192,6 +194,7 @@ cmd_in02,111,52,3	script	Ordinary Man#pc2	97,{
 		mes "Arunafeltz so I wasn't able";
 		mes "to investigate any further.";
 		set aru_monas,4;
+		changequest 17001,17002;
 		close;
 	}
 	else {
@@ -204,7 +207,7 @@ cmd_in02,111,52,3	script	Ordinary Man#pc2	97,{
 	}
 }
 
-ra_in01,308,59,1	script	Waiter#Aru	930,{
+ra_in01,308,59,1	script	Waiter#pc	930,{
 	if (aru_monas < 7) {
 		mes "[Waiter]";
 		mes "Welcome to";
@@ -232,8 +235,12 @@ ra_in01,308,59,1	script	Waiter#Aru	930,{
 				mes "Right this way.";
 				close2;
 				set aru_monas,7;
-				warp "ra_in01",303,43;
-				end;
+				switch(rand(1,4)) {
+					case 1: warp "ra_in01",303,43; end;
+					case 2: warp "ra_in01",304,43; end;
+					case 3: warp "ra_in01",304,39; end;
+					case 4: warp "ra_in01",303,39; end;
+				}
 			}
 			mes "[Waiter]";
 			mes "Hm, okay. Well, whatever";
@@ -281,7 +288,7 @@ ra_in01,297,50,7	script	Suspicious-Looking Man	926,{
 	close;
 }
 
-ra_in01,301,43,0	script	#Aru_conv	-1,3,3,{
+ra_in01,301,43,0	script	MealConversation Trigger	-1,3,3,{
 	end;
 
 OnTouch:
@@ -427,11 +434,12 @@ OnTouch:
 		mes "I've never tasted anything";
 		mes "like it! It's almost like";
 		mes "a dessert. God, it's good!";
-		if (Zeny >= 3000) {
-			set Zeny,Zeny-3000;
+		set aru_monas,8;
+		changequest 17003,17004;
+		if (Zeny > 3000) {
+			set Zeny, Zeny-3000;
 			getitem 12052,4; //Vit_Dish02
 		}
-		set aru_monas,8;
 		close;
 	}
 	end;
@@ -464,6 +472,7 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 		mes "comfortable talking to complete";
 		mes "strangers about my problems.";
 		set aru_monas,9;
+		changequest 17004,17005;
 		close;
 	}
 	else if (aru_monas == 9) {
@@ -507,9 +516,10 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 		mes "Oh, and you're prohibited";
 		mes "asking anyone else, so behave.";
 		set aru_monas,11;
+		changequest 17006,17007;
 		close;
 	}
-	else if (aru_monas == 11) {
+	else if (aru_monas < 13) {
 		mes "[Al Hamad]";
 		mes "I don't blame you for";
 		mes "being curious, but getting";
@@ -601,6 +611,8 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 		mes "we have to capture the";
 		mes "smugglers again? I don't";
 		mes "know what's going on...";
+		set aru_monas,14;
+		changequest 17009,17010;
 		next;
 		mes "[Al Hamad]";
 		mes "Even if I could make headway";
@@ -617,10 +629,9 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 		mes "learn more, your only choice";
 		mes "would be to find out on your";
 		mes "own. Fat chance, right?";
-		set aru_monas,14;
 		close;
 	}
-	else if (aru_monas >= 14) {
+	else {
 		mes "[Al Hamad]";
 		mes "I've suffered enough";
 		mes "already! Why can't this";
@@ -671,6 +682,7 @@ ve_in,81,296,3	script	Soldier#Aru	946,{
 		mes "interrogating the smugglers.";
 		mes "I'm not sure if he did since the smugglers were taken away.";
 		set aru_monas,10;
+		changequest 17005,17006;
 		close;
 	}
 	else if (aru_monas == 10) {
@@ -690,6 +702,824 @@ ve_in,81,296,3	script	Soldier#Aru	946,{
 	}
 }
 
+ve_in,239,115,0	script	Drunkard#Aru	943,{
+	if (aru_monas < 14) {
+		mes "[Drunkard]";
+		mes "Man, I feel great! Hah hah!";
+		mes "Hey, gimme one more drink!";
+		close;
+	}
+	if (aru_monas == 14) {
+		if (rachel_camel == 25) {
+			mes "[Drunkard]";
+			mes "So--*Hic* What I was...";
+			mes "Oog, dizzy... I say sayin',";
+			mes "that guy that ^32CD32snuck out to";
+			mes "sea on a boat^000000? You know";
+			mes "*Hic* why he came back";
+			mes "so early? You won't believe it!";
+			next;
+			mes "[Drunkard]";
+			mes "Hah hah! He--*Hic*";
+			mes "He thought he saw a ^DBDB70ghost^000000!";
+			mes "Bwah hah hah! Oooog... Hey...";
+			set aru_monas,15;
+			changequest 17010,17011;
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "That's right!";
+			mes "Maybe I should check";
+			mes "on ^32CD32Kurdi's father since";
+			mes "he's a fisherman^000000";
+			close;
+		}
+		else {
+			mes "[Drunkard]";
+			mes "Zzzz...";
+			mes "Umm... Zzz...";
+			close;
+		}
+	}
+	else {
+		mes "[Drunkard]";
+		mes "Why?! Why can't I take";
+		mes "my boat out to sea? I hafta";
+		mes "catch fish to make a living!";
+		mes "What, they expect me to starve";
+		mes "to death or something?! Huh?!";
+		close;
+	}
+}
+
+ve_in,238,120,4	script	Drunkard#Aru1	940,{
+	mes "[Drunkard]";
+	mes "Hohohoho~";
+	mes "Oh~ Hohohoho~";
+	next;
+	mes "[" + strcharinfo(0) + "]";
+	mes "She's kind of strange...";
+	close;
+}
+
+ve_fild07,125,128,0	script	Boat#Aru	111,{
+	if (aru_monas < 16) {
+		mes "^3355FFThis boat seems to ";
+		mes "be in decent condition.";
+		mes "Who could its owner be?^000000";
+		close;
+	}
+	else if (aru_monas == 16) {
+		mes "^3355FFThis must be the boat that";
+		mes "Karyn was talking about.";
+		mes "It seems to be in pretty";
+		mes "good shape. Now, the";
+		mes "monastery should be";
+		mes "southwest from here...^000000";
+		next;
+		hideoffnpc "Secret Agent#Aru";
+		next;
+		mes "[Larjes]";
+		mes "Long time no see,";
+		mes ""+strcharinfo(0)+".";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Larjes!";
+		next;
+		mes "[Larjes]";
+		mes "I had a tough time following";
+		mes "you, you know? I actually";
+		mes "almost lost you once. You";
+		mes "must be wondering why";
+		mes "I'm here. If you'll listen,";
+		mes "I'll explain everything.";
+		next;
+		mes "[Larjes]";
+		mes "According to our investigation, Arunafeltz is definitely involved";
+		mes "in this case. We've been watching you since you're somehow related";
+		mes "to that high ranked official from Arunafeltz. I apologize for that.";
+		next;
+		mes "[Larjes]";
+		mes "This is an international";
+		mes "incident, so to prevent any";
+		mes "intel leaks to Arunafeltz,";
+		mes "we've had to be much stricter";
+		mes "with securing and protecting";
+		mes "all information for this case.";
+		next;
+		mes "[Larjes]";
+		mes "Anyway, I've decided to";
+		mes "reveal myself to you since";
+		mes "I'm the only one that can help";
+		mes "you right now. You're thinking";
+		mes "of using that boat, aren't you?";
+		next;
+		mes "[Larjes]";
+		mes "If you don't have the skills,";
+		mes "knowledge, and preparation";
+		mes "to sail those waters ahead,";
+		mes "you'll probably wreck the";
+		mes "boat. You'll make it if you're lucky but... That's a lot of luck.";
+		next;
+		mes "[Larjes]";
+		mes "I'll help you sail this";
+		mes "boat to get where you're";
+		mes "going. But if you fail, there's";
+		mes "a chance you might have to";
+		mes "sail this boat on your own if I'm not here. So, you ready to go?";
+		next;
+		switch(select("Yes, I'm ready.:Give me more time.")) {
+		case 1:
+			mes "[Larjes]";
+			mes "Alright, let's go.";
+			mes "Hold on to something:";
+			mes "this will probably be";
+			mes "a pretty rocky ride...";
+			set aru_monas,17;
+			changequest 17012,17013;
+			close2;
+			hideonnpc "Secret Agent#Aru";
+			warp "nameless_i",257,217;
+			end;
+		case 2:
+			mes "[Larjes]";
+			mes "Alright. Just let me know";
+			mes "whenever you're ready.";
+			close;
+		}
+	}
+	else if (aru_monas < 20) {
+		mes "^3355FFThis is the boat that";
+		mes "can take you to the";
+		mes "monastery.^000000";
+		next;
+		switch(select("Go to Monastery:Cancel")) {
+		case 1:
+			mes "^3355FFYou set sail for";
+			mes "the monastery...^000000";
+			close2;
+			warp "nameless_i",257,217;
+			end;
+		case 2:
+			mes "^3355FFYou decide to";
+			mes "stay ashore.^000000";
+			close;
+		}
+	}
+	else {
+		mes "^3355FFThis is the boat that";
+		mes "can take you to the";
+		mes "monastery.^000000";
+		next;
+		switch(select("Go to Monastery:Cancel")) {
+		case 1:
+			mes "^3355FFYou set sail for";
+			mes "the monastery...^000000";
+			close2;
+			warp "nameless_n",257,217;
+			end;
+		case 2:
+			mes "^3355FFYou decide to";
+			mes "stay ashore.^000000";
+			close;
+		}
+	}
+}
+
+ve_fild07,128,130,1	script	Secret Agent#Aru	97,{
+	if (aru_monas == 16) {
+		mes "[Larjes]";
+		mes "Are you ready to go";
+		mes "aboard? I'll help you";
+		mes "sail to that monastery,";
+		mes "but if you fail while you're";
+		mes "there, I might not be here";
+		mes "when you come back.";
+		next;
+		switch(select("Yes, I'm ready.:Give me more time.")) {
+		case 1:
+			mes "[Larjes]";
+			mes "Alright, let's go.";
+			mes "Hold on to something:";
+			mes "this will probably be";
+			mes "a pretty rocky ride...";
+			set aru_monas,17;
+			changequest 17012,17013;
+			close2;
+			hideonnpc "Secret Agent#Aru";
+			warp "nameless_i",257,217;
+			end;
+		case 2:
+			mes "[Larjes]";
+			mes "Alright. Just let me know";
+			mes "whenever you're ready.";
+			close;
+		}
+	}
+	end;
+
+OnInit:
+	hideonnpc "Secret Agent#Aru";
+	end;
+}
+
+nameless_i,212,184,0	script	Outside Island#Aru	-1,2,3,{
+	end;
+
+OnTouch:
+	if (aru_monas == 17) {
+		mes "^3355FFThe village is totally";
+		mes "silent, as if all life had";
+		mes "abandoned it. You look";
+		mes "around and see that something";
+		mes "was here a few hours ago, but";
+		mes "it's somewhere else now.^000000";
+		next;
+		mes "^3355FFWhatever it was,";
+		mes "it definitely wasn't";
+		mes "human. What kind of";
+		mes "creature could it be?^000000";
+		close;
+	}
+	end;
+}
+
+nameless_in,21,176,0	script	Inside Island#Aru	-1,2,2,{
+	end;
+
+OnTouch:
+	if (aru_monas == 17) {
+		mes "^3355FFThere are traces of";
+		mes "humans around here,";
+		mes "along with some kind";
+		mes "of creature that you";
+		mes "can't clearly identify.^000000";
+		close;
+	}
+	end;
+}
+
+nameless_i,129,218,0	script	Grass Behind#Aru	-1,4,3,{
+	end;
+
+OnTouch:
+	if (aru_monas == 17) {
+		mes "^3355FFA strange scent strikes";
+		mes "you as you enter this field of";
+		mes "grass. A few ^32CD32animal corpses^3355FF";
+		mes "are strewn around the ground.^000000";
+		close;
+	}
+	end;
+}
+
+nameless_i,127,207,0	script	Dead Crow#Aru	111,{
+	if (aru_monas < 17) { 
+		mes "^3355FFThere is a dead crow on the ground.";
+		close;
+	}
+	else if (aru_monas == 17) {
+		mes "^3355FFThe sight of this ^32CD32dead";
+		mes "crow^3355FF makes you feel";
+		mes "uneasy for some reason.^000000";
+		next;
+		if (select("Ignore:Investigate") == 1) {
+			mes "^3355FFYou decide not to touch";
+			mes "the animal's carcass.^000000";
+			close;
+		}
+		mes "^3355FFYou notice some grass sap";
+		mes "on the crow's beak, so it";
+		mes "must have been nibbling on";
+		mes "some grass. Some feathers";
+		mes "are missing, revealing";
+		mes "scaly, snake-like skin.^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Wait...";
+		mes "Did this grass...?";
+		next;
+		mes "^3355FFThis grass must be the";
+		mes "main ingredient of the";
+		mes "poison used to kill the";
+		mes "Gaebolg family princes.^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Looks like I just hit";
+		mes "the jackpot. Huh?";
+		mes "Someone behi--";
+		next;
+		mes "^3355FFA sharp, throbbing pain";
+		mes "assails the back of your";
+		mes "head as you fall into";
+		mes "unconsciousness...^000000";
+		set aru_monas,18;
+		close2;
+		warp "nameless_in",15,60;
+		end;
+	}
+	end;
+}
+
+nameless_in,15,61,0	script	Pass Out#Aru	-1,2,3,{
+	end;
+
+OnTouch:
+	if (aru_monas == 18) {
+		disablenpc "Out_from_Monastery";
+		sc_start SC_BLIND,600000,0,10000;
+		mes "^3355FFThe pressure on your";
+		mes "stomach and the blood";
+		mes "rushing to your head tells";
+		mes "you someone is carrying you";
+		mes "over his shoulder. He stops,";
+		mes "and you hear a faint voice.^000000";
+		next;
+		mes "^3355FFThe faint voice steadily";
+		mes "grows stronger and more";
+		mes "distinct--someone's calling";
+		mes "your name. You feel cold water";
+		mes "trickle through your lips, and";
+		mes "then you regain your senses.^000000";
+		next;
+		sc_end SC_BLIND;
+		hideoffnpc "Larjes#Monastery";
+		next;
+		mes "That was too close...";
+		mes "For a second there,";
+		mes "I thought I lost you.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Larjes...? What...";
+		mes "What happened?";
+		mes "Ugh, my head...";
+		next;
+		mes "[Larjes]";
+		mes "Try not to move for a while.";
+		mes "I had a bad feeling waiting";
+		mes "for you on the boat. Lucky";
+		mes "thing. When I found you,";
+		mes "these strange creatures";
+		mes "were savagely attacking you!";
+		next;
+		mes "[" +strcharinfo(0)+ "]";
+		mes "You saved me?";
+		mes "Thank you. Do you";
+		mes "happen to know what";
+		mes "those creatures were?";
+		next;
+		mes "[Larjes]";
+		mes "No clue. They looked";
+		mes "like humans, but... They";
+		mes "definitely weren't. Once";
+		mes "I killed them, they all";
+		mes "turned into sand.";
+		next;
+		hideoffnpc "Creature#Monas";
+		emotion e_omg,1;
+		emotion e_omg,0,"Larjes#Monastery";
+		mes "[Larjes]";
+		mes "?!?!?!!!!!";
+		next;
+		mes "[" +strcharinfo(0)+ "]";
+		mes "!!!!?!?!!!!!!";
+		mes "Isn't... Isn't that...?";
+		next;
+		mes "[Larjes]";
+		mes "It seems it's just like the";
+		mes "creatures that kidnapped";
+		mes "you, but... I wonder why";
+		mes "he's not attacking us.";
+		next;
+		mes "[" +strcharinfo(0)+ "]";
+		mes "I guess you'll have to go";
+		mes "right up to him and ask.";
+		set aru_monas,19;
+		close;
+	}
+}
+
+nameless_in,13,58,6	script	Larjes#Monastery	97,{
+	mes "[Larjes]";
+	mes "Be careful. That guy";
+	mes "looks pretty dangerous.";
+	close;
+
+OnInit:
+	hideonnpc "Larjes#Monastery";
+	end;
+}
+
+nameless_in,13,53,1	script	Creature#Monas	1864,3,1,{
+	end;
+
+OnInit:
+	hideonnpc "Creature#Monas";
+	end;
+
+OnTouch:
+	if (aru_monas == 19 && mobcount("nameless_in","Creature#Monas::OnMyMobDead") < 1 && !@aru_monas_kill) {
+		mes "[???????]";
+		mes "Grrr~!!!";
+		close2;
+		monster "nameless_in",13,53,"Zombie",1864,1,"Creature#Monas::OnMyMobDead";
+		hideonnpc "Creature#Monas";
+	}
+	end;
+
+OnMyMobDead:
+	set @aru_monas_kill,1;
+	enablenpc "Out_from_Monastery";
+	end;
+}
+
+nameless_in,12,37,0	script	Out_from_Monastery	45,1,1,{
+	end;
+
+OnTouch:
+	if (aru_monas == 19) {
+		set aru_monas,20;
+		warp "nameless_n",168,252;
+		end;
+	}
+
+OnInit:
+	disablenpc "Out_from_Monastery";
+	end;
+}
+
+
+
+nameless_i,168,257,0	script	outtoin_01#mo	45,1,1,{
+	end;
+
+OnTouch:
+	if (aru_monas == 18 || aru_monas == 19) {
+		warp "nameless_in",12,41;
+		end;
+	}
+	mes "^3355FFThe door won't budge:";
+	mes "you can't go through.^000000";
+	close;
+}
+
+nameless_n,169,254,0	script	Night#Aru2	-1,3,3,{
+	end;
+
+OnTouch:
+	if(aru_monas == 20) {
+		hideoffnpc "Larjes#Monastery2";
+		mes "[" +strcharinfo(0)+ "]";
+		mes "What the hell...!?";
+		next;
+		mes "[Larjes]";
+		mes "So... This is the";
+		mes "island's true nature.";
+		next;
+		mes "[Larjes]";
+		mes "Someone like me won't";
+		mes "survive long in a place";
+		mes "like this. I'm going to wait";
+		mes "for you in the boat. Learn";
+		mes "what you need to learn, and then come back safe, "+strcharinfo(0)+".";
+		set aru_monas,21;
+		changequest 17013,17014;
+		close2;
+		hideonnpc "Larjes#Monastery2";
+	}
+	end;
+}
+
+nameless_n,166,254,0	script	Larjes#Monastery2	97,{
+	end;
+
+OnInit:
+	hideonnpc "Larjes#Monastery2";
+	end;
+}
+
+nameless_i,259,218,3	script	Larjes#Aru	97,{
+	if (aru_monas < 18) {
+		mes "[Larjes]";
+		mes "I don't like this place.";
+		mes "You'd be better be careful";
+		mes "around here with those weird";
+		mes "creatures running around.";
+		close;
+	}
+	else if (aru_monas < 24) {
+		mes "[Larjes]";
+		mes "Good, you're back";
+		mes "I know that there's still";
+		mes "things on this island that";
+		mes "you want to investigate,";
+		mes "but did you want to leave";
+		mes "this place for a while?";
+		next;
+		if(select("Yes:No")==1) {
+			mes "[Larjes]";
+			mes "Alight, let's go.";
+			close2;
+			warp "ve_fild07",130,130;
+			end;
+		}
+		mes "[Larjes]";
+		mes "Alright, but becareful.";
+		mes "Those creatures almost";
+		mes "got you once, you know.";
+		close;
+	}
+	else {
+		mes "[Larjes]";
+		mes "Did you still want to";
+		mes "investigate the island?";
+		next;
+		if (select("No:Yes") == 1) {
+			mes "[Larjes]";
+			mes "Alright, let's go.";
+			close2;
+			warp "ve_fild07",130,130;
+			end;
+		}
+		mes "[Larjes]";
+		mes "Alright, but be careful.";
+		mes "Those creatures almost";
+		mes "got you once, you know.";
+		close;
+	}
+}
+
+nameless_n,259,218,3	script	Larjes#Boat1	97,{
+	if (aru_monas == 24) {
+		if (countitem(7726) < 1) {
+			mes "[Larjes]";
+			mes "Good, you're back.";
+			mes "I know that there's still";
+			mes "things on this island that";
+			mes "you want to investigate,";
+			mes "but did you want to leave";
+			mes "this place for a while?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Larjes]";
+				mes "Alright, let's go.";
+				close2;
+				warp "ve_fild07",130,130;
+				end;
+			case 2:
+				mes "[Larjes]";
+				mes "Alright, but becareful.";
+				mes "Those creatures almost";
+				mes "got you once, you know.";
+				close;
+			}
+		} else {
+			mes "[Larjes]";
+			mes "I don't believe it...";
+			mes "That guy was Tristam III?!";
+			mes "This explains a lot, I suppose.";
+			mes "I'll report this along with the";
+			mes "voucher. So Arunafeltz was";
+			mes "behind that poison grass too...";
+			next;
+			mes "[Larjes]";
+			mes "I'm shocked over this";
+			mes "whole debacle. I'm sure";
+			mes "the Rune-Midgarts royal family";
+			mes "will be in an uproar over this.";
+			mes "To think that we're involved";
+			mes "in something this huge...";
+			next;
+			mes "[Larjes]";
+			mes "Anyway, we better get";
+			mes "going... This is huge!";
+			delitem 7726,1; //Token_Of_King
+			set aru_monas,25;
+			changequest 17016,17017;
+			getexp (checkre(3))?100000:1000000,0;
+			close;
+		}
+	}
+	mes "[Larjes]";
+	mes "Did you still want to";
+	mes "investigate the island?";
+	next;
+	switch(select("No:Yes")) {
+	case 1:
+		mes "[Larjes]";
+		mes "Alright, let's go.";
+		close2;
+		warp "ve_fild07",130,130;
+		end;
+	case 2:
+		mes "[Larjes]";
+		mes "Alright, but becareful.";
+		mes "Those creatures almost";
+		mes "got you once, you know.";
+		close;
+	}
+}
+
+abbey02,224,70,0	script	Books#Mona1	111,{
+	if (checkweight(7766,1) == 0) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
+		close;
+	}
+	if (aru_monas < 21) {
+		mes "^3355FFIt's just a bunch";
+		mes "of old, moldy books.^000000";
+		close;
+	}
+	else if (aru_monas == 21) {
+		mes "^3355FFThere's a book stained";
+		mes "with blood amongst all";
+		mes "these old, moldy books.^000000";
+		next;
+		if(select("Examine Book:Ignore")==1) {
+			set aru_monas,22;
+			changequest 17014,17015;
+			getitem 7755,1; // Reasearch_Note
+			readbook 7755,1;
+			close;
+		}
+		mes "^3355FFThat book was probably";
+		mes "worthless to you anyway.^000000";
+		close;
+	}
+	else {
+		mes "^3355FFThere are old books";
+		mes "scattered all over here.^000000";
+		close;
+	}
+}
+
+abbey03,232,233,4	script	Man#King	956,{
+	if (aru_monas < 22) {
+		mes "^3355FFYou find a man lying on";
+		mes "the floor, wearing torn";
+		mes "yet luxurious clothing.";
+		mes "He doesn't seem to be";
+		mes "breathing at all...^000000.";
+		next;
+		mes "^3355FFHe's dead.^000000";
+		close;
+	}
+	if (aru_monas == 22 || aru_monas == 23) {
+		mes "^3355FFYou find a man lying on";
+		mes "the floor, wearing torn";
+		mes "yet luxurious clothing.";
+		mes "He doesn't seem to be";
+		mes "breathing at all...^000000.";
+		next;
+		mes "^3355FFYou bring your ears more";
+		mes "closely to his mouth: it";
+		mes "seems that he really is";
+		mes "still barely alive.^000000";
+		next;
+		if (select("Touch Him:Ignore Him") == 1) {
+			mes "["+strcharinfo(0)+"]";
+			mes "This man...";
+			mes "He's so familiar";
+			mes "for some reason.";
+			next;
+			mes "^3355FFAs you touch him, the";
+			mes "man suddenly jumps";
+			mes "up with a crazed yowl.^000000";
+			set aru_monas,23;
+			monster "abbey03",232,232,"Dead King",1875,1,"Man#King::OnMyMobDead";
+			initnpctimer;
+			hideonnpc "Man#King";
+			close;
+		}
+		mes "^3355FFYou don't feel";
+		mes "comfortable enough";
+		mes "to touch this man.^000000";
+		close;
+	}
+	else {
+		mes "^3355FFHe's dead... Now...^000000";
+		close;
+	}
+
+OnMyMobDead:
+	stopnpctimer;
+	donpcevent "Dead Man#King::OnEnable";
+	end;
+
+OnTimer300000:
+	stopnpctimer;
+	hideonnpc "Dead Man#King";
+	hideoffnpc "Man#King";
+	end;
+}
+
+abbey03,232,232,4	script	Dead Man#King	956,{
+	if (checkweight(7766,1) == 0) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
+		close;
+	}
+	if (aru_monas == 23) {
+		mes "^3355FFYou have no idea why";
+		mes "this dead man is moving";
+		mes "around, so you decided to";
+		mes "examine him. In his jacket,";
+		mes "you find a shining medal...^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "This medal...";
+		mes "This means that";
+		mes "this man is...!";
+		set aru_monas,24;
+		getitem 7726,1; //Token_of_King
+		changequest 17015,17016;
+		hideonnpc "Dead Man#King";
+		hideoffnpc "Man#King";
+		stopnpctimer;
+		close;
+	}
+	end;
+
+OnEnable:
+	initnpctimer;
+	hideoffnpc "Dead Man#King";
+	end;
+
+OnInit:
+	hideonnpc "Dead Man#King";
+	end;
+
+OnTimer150000:
+	hideonnpc "Dead Man#King";
+	hideoffnpc "Man#King";
+	stopnpctimer;
+	end;
+}
+
+nameless_n,145,162,0	script	AideAmi#Aru	139,2,2,{
+	end;
+OnTouch:
+	if (aru_monas == 26) {
+		mes "[" + strcharinfo(0) + "]";
+		mes "There is a low wall here against the other wall, if I climb it I could reach the resting place of Tristan III...";
+		next;
+		switch(select("Stay here:Climb the wall")) {
+		case 1:
+			warp "nameless_n",158,169;
+			end;
+		case 2:
+			warp "abbey01",51,15;
+			end;
+		}
+	}
+	else {
+		warp "nameless_n",158,169;
+		end;
+	}
+}
+
+sec_in02,15,15,4	script	boss::boss_aru_monas	809,{
+	callfunc "F_GM_NPC";
+	mes "[Patch]";
+	mes "Input.";
+	next;
+	switch(select("Now:How much?:P- How much?:Others")) {
+	case 1:
+		mes " ";
+		mes ""+aru_monas;
+		close;
+	case 2:
+		input .@input,0,1000;
+		set aru_monas, .@input;
+		mes " ";
+		mes ""+aru_monas;
+		close;
+	case 3:
+		input .@input,0,1000;
+		set prt_curse, .@input;
+		mes " ";
+		mes ""+prt_curse;
+		close;
+	case 4:
+		set prt_curse,61;
+		set ra_tem_q,12; //TODO: Doesn't match Athena's current script.
+		set rachel_camel,25;
+		set lost_boy,0;
+		close;
+	}
+}
+
+// Rachel Addition :: aruna_nir
+//============================================================
 ra_temple,165,57,5	script	Niren#ss	915,{
 	if (checkweight(907,200) == 0) {
 		mes "^3355FFWait a second!";
@@ -707,7 +1537,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 	mes "I can spare a moment or two.";
 	mes "What would you like to ask?";
 	next;
-	switch(select("Ask About Veins Smugglers:As About Zhed")) {
+	switch(select("Ask About Veins Smugglers:Ask About Zhed")) {
 	case 1:
 		if (aru_monas == 12) {
 			mes "[Niren]";
@@ -812,6 +1642,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "come back and tell me if";
 			mes "you learn anything there.";
 			set aru_monas,13;
+			changequest 17008,17009;
 			next;
 			mes "[Niren]";
 			mes "I'll send a message to the";
@@ -879,10 +1710,8 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 				mes "comes from that place.";
 				delitem 7755,1; //Research_Note
 				set aru_monas,26;
-				if(checkre(0))
-					getexp 50000,0;
-				else
-					getexp 500000,0;
+				completequest 17017;
+				getexp (checkre(3))?50000:500000,0;
 				close2;
 			}
 		}
@@ -970,6 +1799,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "For now, you'd better talk";
 			mes "to High Priest Zhed.^000000";
 			set aru_em,11;
+			changequest 2132,2133;
 			close2;
 		}
 		else if ((aru_em == 11) || (aru_em == 12)) {
@@ -1048,7 +1878,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 				mes "High Priestess Niren,";
 				mes "you must be really tired.";
 				mes "You look pale for some reason.";
-				emotion 19;
+				emotion e_swt2;
 				next;
 				mes "[High Priestess Niren]";
 				mes "I do feel rather drained.";
@@ -1120,6 +1950,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 				mes "can count on me!";
 				emotion e_no1,1;
 				set aru_em,15;
+				changequest 2134,2135;
 				close2;
 			}
 			else {
@@ -1166,13 +1997,13 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "just to see my family. Even";
 			mes "just once a year would be nice.";
 			next;
-			emotion 5;
+			emotion e_ic;
 			mes "[High Priestess Niren]";
 			mes "...............................";
 			mes "You're absolutely right.";
 			mes "That gives me an idea.";
 			next;
-			emotion 2;
+			emotion e_ho;
 			mes "[Sippie]";
 			mes "Huh? What is it?";
 			next;
@@ -1233,6 +2064,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "I hope she'll help us...";
 			set aru_em,17;
 			getitem 7343,1; //File02
+			changequest 2136,2137;
 			close2;
 		}
 		else if (aru_em == 17) {
@@ -1301,6 +2133,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 				mes "what we are doing.";
 				delitem 7343,1; //File02
 				set aru_em,20;
+				changequest 2139,2140;
 				close2;
 			}
 			else {
@@ -1351,10 +2184,8 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "that you've seen that";
 			mes "expression on her face.^000000";
 			set aru_em,23;
-			if(checkre(0))
-				getexp 100000,0;
-			else
-				getexp 1000000,0;
+			getexp (checkre(3))?100000:1000000,0;
+			changequest 2141,2142;
 			close2;
 		}
 		else if (aru_em > 21) {
@@ -1377,720 +2208,6 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 	end;
 }
 
-ve_in,239,115,1	script	Drunkard#Aru	943,{
-	if (aru_monas < 14) {
-		mes "[Drunkard]";
-		mes "Man, I feel great! Hah hah!";
-		mes "Hey, gimme one more drink!";
-		close;
-	}
-	if (aru_monas == 14) {
-		if (rachel_camel == 25) {
-			mes "[Drunkard]";
-			mes "So--*Hic* What I was...";
-			mes "Oog, dizzy... I say sayin',";
-			mes "that guy that ^32CD32snuck out to";
-			mes "sea on a boat^000000? You know";
-			mes "*Hic* why he came back";
-			mes "so early? You won't believe it!";
-			next;
-			mes "[Drunkard]";
-			mes "Hah hah! He--*Hic*";
-			mes "He thought he saw a ^DBDB70ghost^000000!";
-			mes "Bwah hah hah! Oooog... Hey...";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "That's right!";
-			mes "Maybe I should check";
-			mes "on ^32CD32Kurdi's father since";
-			mes "he's a fisherman^000000";
-			set aru_monas,15;
-			close;
-		}
-		else {
-			mes "[Drunkard]";
-			mes "Zzzz...";
-			mes "Umm... Zzz...";
-			close;
-		}
-	}
-	else {
-		mes "[Drunkard]";
-		mes "Why?! Why can't I take";
-		mes "my boat out to sea? I hafta";
-		mes "catch fish to make a living!";
-		mes "What, they expect me to starve";
-		mes "to death or something?! Huh?!";
-		close;
-	}
-}
-
-ve_fild07,125,128,0	script	Boat#Aru	111,{
-	if (aru_monas < 16) {
-		mes "^3355FFThis boat seems to ";
-		mes "be in decent condition.";
-		mes "Who could its owner be?^000000";
-		close;
-	}
-	if (aru_monas == 16) {
-		mes "^3355FFThis must be the boat that";
-		mes "Karyn was talking about.";
-		mes "It seems to be in pretty";
-		mes "good shape. Now, the";
-		mes "monastery should be";
-		mes "southwest from here...^000000";
-		next;
-		hideoffnpc "Secret Agent#Aru";
-		next;
-		mes "[Larjes]";
-		mes "Long time no see,";
-		mes ""+strcharinfo(0)+".";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Larjes!";
-		next;
-		mes "[Larjes]";
-		mes "I had a tough time following";
-		mes "you, you know? I actually";
-		mes "almost lost you once. You";
-		mes "must be wondering why";
-		mes "I'm here. If you'll listen,";
-		mes "I'll explain everything.";
-		next;
-		mes "[Larjes]";
-		mes "According to our investigation, Arunafeltz is definitely involved";
-		mes "in this case. We've been watching you since you're somehow related";
-		mes "to that high ranked official from Arunafeltz. I apologize for that.";
-		next;
-		mes "[Larjes]";
-		mes "This is an international";
-		mes "incident, so to prevent any";
-		mes "intel leaks to Arunafeltz,";
-		mes "we've had to be much stricter";
-		mes "with securing and protecting";
-		mes "all information for this case.";
-		next;
-		mes "[Larjes]";
-		mes "Anyway, I've decided to";
-		mes "reveal myself to you since";
-		mes "I'm the only one that can help";
-		mes "you right now. You're thinking";
-		mes "of using that boat, aren't you?";
-		next;
-		mes "[Larjes]";
-		mes "If you don't have the skills,";
-		mes "knowledge, and preparation";
-		mes "to sail those waters ahead,";
-		mes "you'll probably wreck the";
-		mes "boat. You'll make it if you're lucky but... That's a lot of luck.";
-		next;
-		mes "[Larjes]";
-		mes "I'll help you sail this";
-		mes "boat to get where you're";
-		mes "going. But if you fail, there's";
-		mes "a chance you might have to";
-		mes "sail this boat on your own if I'm not here. So, you ready to go?";
-		next;
-		switch(select("Yes, I'm ready.:Give me more time.")) {
-		case 1:
-			mes "[Larjes]";
-			mes "Alright, let's go.";
-			mes "Hold on to something:";
-			mes "this will probably be";
-			mes "a pretty rocky ride...";
-			set aru_monas,17;
-			close2;
-			hideonnpc "Secret Agent#Aru";
-			warp "nameless_i",257,217;
-			end;
-		case 2:
-			mes "[Larjes]";
-			mes "Alright. Just let me know";
-			mes "whenever you're ready.";
-			close;
-		}
-	}
-	if (aru_monas < 20) {
-		mes "^3355FFThis is the boat that";
-		mes "can take you to the";
-		mes "monastery.^000000";
-		next;
-		switch(select("Go to Monastery:Cancel")) {
-		case 1:
-			mes "^3355FFYou set sail for";
-			mes "the monastery...^000000";
-			close2;
-			warp "nameless_i",257,217;
-			end;
-		case 2:
-			mes "^3355FFYou decide to";
-			mes "stay ashore.^000000";
-			close;
-		}
-	}
-	else {
-		mes "^3355FFThis is the boat that";
-		mes "can take you to the";
-		mes "monastery.^000000";
-		next;
-		switch(select("Go to Monastery:Cancel")) {
-		case 1:
-			mes "^3355FFYou set sail for";
-			mes "the monastery...^000000";
-			close2;
-			warp "nameless_n",257,217;
-			end;
-		case 2:
-			mes "^3355FFYou decide to";
-			mes "stay ashore.^000000";
-			close;
-		}
-	}
-}
-
-ve_fild07,128,130,1	script	Secret Agent#Aru	97,{
-	if (aru_monas == 16) {
-		mes "[Larjes]";
-		mes "Are you ready to go";
-		mes "aboard? I'll help you";
-		mes "sail to that monastery,";
-		mes "but if you fail while you're";
-		mes "there, I might not be here";
-		mes "when you come back.";
-		next;
-		switch(select("Yes, I'm ready.:Give me more time.")) {
-		case 1:
-			mes "[Larjes]";
-			mes "Alright, let's go.";
-			mes "Hold on to something:";
-			mes "this will probably be";
-			mes "a pretty rocky ride...";
-			set aru_monas,17;
-			close2;
-			hideonnpc "Secret Agent#Aru";
-			warp "nameless_i",257,217;
-			end;
-		case 2:
-			mes "[Larjes]";
-			mes "Alright. Just let me know";
-			mes "whenever you're ready.";
-			close;
-		}
-	}
-	end;
-
-OnInit:
-	hideonnpc "Secret Agent#Aru";
-	end;
-}
-
-nameless_i,259,218,3	script	Larjes#Aru	97,{
-	if(aru_monas < 18) {
-		mes "[Larjes]";
-		mes "I don't like this place.";
-		mes "You'd be better be careful";
-		mes "around here with those weird";
-		mes "creatures running around.";
-		close;
-	}
-	else if (aru_monas > 24) {
-		mes "[Larjes]";
-		mes "Good, you're back";
-		mes "I know that there's still";
-		mes "things on this island that";
-		mes "you want to investigate,";
-		mes "but did you want to leave";
-		mes "this place for a while?";
-		next;
-		if(select("Yes:No")==1) {
-			mes "[Larjes]";
-			mes "Alight, let's go.";
-			close2;
-			warp "ve_fild07",130,130;
-			end;
-		}
-		mes "[Larjes]";
-		mes "Alright, but becareful.";
-		mes "Those creatures almost";
-		mes "got you once, you know.";
-		close;
-	}
-	else {
-		mes "[Larjes]";
-		mes "Did you still want to";
-		mes "investigate the island?";
-		next;
-		if (select("No:Yes") == 1) {
-			mes "[Larjes]";
-			mes "Alright, let's go.";
-			close2;
-			warp "ve_fild07",130,130;
-			end;
-		}
-		mes "[Larjes]";
-		mes "Alright, but be careful.";
-		mes "Those creatures almost";
-		mes "got you once, you know.";
-		close;
-	}
-}
-
-nameless_i,212,184,0	script	#aru_clue1	-1,2,3,{
-	end;
-
-OnTouch:
-	if (aru_monas == 17) {
-		mes "^3355FFThe village is totally";
-		mes "silent, as if all life had";
-		mes "abandoned it. You look";
-		mes "around and see that something";
-		mes "was here a few hours ago, but";
-		mes "it's somewhere else now.^000000";
-		next;
-		mes "^3355FFWhatever it was,";
-		mes "it definitely wasn't";
-		mes "human. What kind of";
-		mes "creature could it be?^000000";
-		close;
-	}
-	end;
-}
-
-nameless_in,21,176,0	script	#aru_clue2	-1,2,2,{
-	end;
-
-OnTouch:
-	if (aru_monas == 17) {
-		mes "^3355FFThere are traces of";
-		mes "humans around here,";
-		mes "along with some kind";
-		mes "of creature that you";
-		mes "can't clearly identify.^000000";
-		close;
-	}
-	end;
-}
-
-nameless_i,129,218,0	script	#aru_clue3	-1,4,3,{
-	end;
-
-OnTouch:
-	if (aru_monas == 17) {
-		mes "^3355FFA strange scent strikes";
-		mes "you as you enter this field of";
-		mes "grass. A few ^32CD32animal corpses^3355FF";
-		mes "are strewn around the ground.^000000";
-		close;
-	}
-	end;
-}
-
-nameless_i,127,207,0	script	Dead Crow#Aru	111,{
-	if (aru_monas < 17) { 
-		mes "^3355FFThere is a dead crow on the ground.";
-		close;
-	}
-	else if (aru_monas == 17) {
-		mes "^3355FFThe sight of this ^32CD32dead";
-		mes "crow^3355FF makes you feel";
-		mes "uneasy for some reason.^000000";
-		next;
-		if (select("Ignore:Investigate") == 1) {
-			mes "^3355FFYou decide not to touch";
-			mes "the animal's carcass.^000000";
-			close;
-		}
-		mes "^3355FFYou notice some grass sap";
-		mes "on the crow's beak, so it";
-		mes "must have been nibbling on";
-		mes "some grass. Some feathers";
-		mes "are missing, revealing";
-		mes "scaly, snake-like skin.^000000";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Wait...";
-		mes "Did this grass...?";
-		next;
-		mes "^3355FFThis grass must be the";
-		mes "main ingredient of the";
-		mes "poison used to kill the";
-		mes "Gaebolg family princes.^000000";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Looks like I just hit";
-		mes "the jackpot. Huh?";
-		mes "Someone behi--";
-		next;
-		mes "^3355FFA sharp, throbbing pain";
-		mes "assails the back of your";
-		mes "head as you fall into";
-		mes "unconsciousness...^000000";
-		close2;
-		set aru_monas,18;
-		warp "nameless_in",15,60;
-		end;
-	}
-	end;
-}
-
-nameless_i,168,257,0	script	Aru_LockedDoor	45,1,1,{
-	end;
-
-OnTouch:
-	if (aru_monas == 18 || aru_monas == 19) {
-		warp "nameless_in",12,41;
-		end;
-	}
-	mes "^3355FFThe door won't budge:";
-	mes "you can't go through.^000000";
-	close;
-}
-
-nameless_in,15,60,0	script	#Aru_Trigger	-1,1,1,{
-	end;
-
-OnTouch:
-	if (aru_monas == 18) {
-		disablenpc "aru_warp";
-		sc_start2 SC_Blind,600000,0,10000;
-		mes "^3355FFThe pressure on your";
-		mes "stomach and the blood";
-		mes "rushing to your head tells";
-		mes "you someone is carrying you";
-		mes "over his shoulder. He stops,";
-		mes "and you hear a faint voice.^000000";
-		next;
-		mes "^3355FFThe faint voice steadily";
-		mes "grows stronger and more";
-		mes "distinct--someone's calling";
-		mes "your name. You feel cold water";
-		mes "trickle through your lips, and";
-		mes "then you regain your senses.^000000";
-		sc_end SC_BLIND;
-		next;
-		hideoffnpc "Larjes#Aru2";
-		mes "That was too close.";
-		mes "For a second there,";
-		mes "I thought I lost you.";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Larjes...? What...";
-		mes "What happened?";
-		mes "Ugh, my head...";
-		next;
-		mes "[Larjes]";
-		mes "Try not to move for a while.";
-		mes "I had a bad feeling waiting";
-		mes "for you on the boat. Lucky";
-		mes "thing. When I found you,";
-		mes "these strange creatures";
-		mes "were savagely attacking you!";
-		next;
-		mes "[" +strcharinfo(0)+ "]";
-		mes "You saved me?";
-		mes "Thank you. Do you";
-		mes "happen to know what";
-		mes "those creatures were?";
-		next;
-		mes "[Larjes]";
-		mes "No clue. They looked";
-		mes "like humans, but... They";
-		mes "definitely weren't. Once";
-		mes "I killed them, they all";
-		mes "turned into sand.";
-		next;
-		hideoffnpc "Creature#Aru";
-		emotion e_omg,1;
-		emotion e_omg;
-		mes "[Larjes]";
-		mes "?!?!?!!!!!";
-		next;
-		mes "[" +strcharinfo(0)+ "]";
-		mes "!!!!?!?!!!!!!";
-		mes "Isn't... Isn't that...?";
-		next;
-		mes "[Larjes]";
-		mes "It seems it's just like the";
-		mes "creatures that kidnapped";
-		mes "you, but... I wonder why";
-		mes "he's not attacking us.";
-		next;
-		mes "[" +strcharinfo(0)+ "]";
-		mes "I guess you'll have to go";
-		mes "right up to him and ask.";
-		set aru_monas,19;
-		close;
-	}
-}
-
-nameless_in,13,58,6	script	Larjes#Aru2	97,{
-	mes "[Larjes]";
-	mes "Be careful. That guy";
-	mes "looks pretty dangerous.";
-	close;
-}
-
-nameless_in,13,53,0	script	Creature#Aru	1864,{
-	end;
-
-OnInit:
-	hideonnpc "Creature#Aru";
-	end;
-
-OnMyMobDead:
-	enablenpc "aru_warp";
-	end;
-}
-
-nameless_in,13,53,0	script	#Aru_Trigger2	-1,3,1,{
-	end;
-
-OnTouch:
-	if (aru_monas == 19 && !@mymobcount) {
-		mes "[???????]";
-		mes "Grrr~!!!";
-		close2;
-		hideonnpc "Creature#Aru";
-		set @mymobcount,1;
-		monster "nameless_in",13,53,"Zombie",1864,1,"Creature#Aru::OnMyMobDead";
-		end;
-	}
-	end;
-}
-
-nameless_in,12,37,0	script	aru_warp	45,1,1,{
-	end;
-
-OnTouch:
-	if (aru_monas == 19) {
-		set aru_monas,20;
-		warp "nameless_n",168,252;
-		end;
-	}
-
-OnInit:
-	disablenpc "aru_warp";
-	end;
-}
-
-nameless_n,169,254,0	script	#Aru_Trigger3	-1,3,3,{
-	end;
-
-OnTouch:
-	if(aru_monas == 20) {
-		hideoffnpc "Larjes#Aru3";
-		mes "[" +strcharinfo(0)+ "]";
-		mes "What the hell...!?";
-		next;
-		mes "[Larjes]";
-		mes "So... This is the";
-		mes "island's true nature.";
-		next;
-		mes "[Larjes]";
-		mes "Someone like me won't";
-		mes "survive long in a place";
-		mes "like this. I'm going to wait";
-		mes "for you in the boat. Learn";
-		mes "what you need to learn, and";
-		mes "then come back safe, "+strcharinfo(0)+".";
-		set aru_monas,21;
-		hideonnpc "Larjes#Aru3";
-		close;
-	}
-	end;
-}
-
-nameless_n,166,254,7	script	Larjes#Aru3	97,{
-	end;
-
-OnInit:
-	hideonnpc "Larjes#Aru3";
-	end;
-}
-
-nameless_n,259,218,3	script	Larjes#Boat1	97,{
-	if ((aru_monas == 23) && (countitem(7726))) {
-		mes "[Larjes]";
-		mes "I don't believe it...";
-		mes "That guy was Tristam III?!";
-		mes "This explains a lot, I suppose.";
-		mes "I'll report this along with the";
-		mes "voucher. So Arunafeltz was";
-		mes "behind that poison grass too.";
-		next;
-		mes "[Larjes]";
-		mes "I'm shocked over this";
-		mes "whole debacle. I'm sure";
-		mes "the Rune-Midgarts royal family";
-		mes "will be in an uproar over this.";
-		mes "To think that we're involved";
-		mes "in something this huge...";
-		next;
-		mes "[Larjes]";
-		mes "Anyway, we better get...";
-		mes "This is huge!";
-		set aru_monas,24;
-		delitem 7726,1; //Token_Of_King
-		if(checkre(0))
-			getexp 100000,0;
-		else
-			getexp 1000000,0;
-		close;
-	}
-	mes "[Larjes]";
-	mes "Did you still want to";
-	mes "investigate the island?";
-	next;
-	if(select("No:yes")==1) {
-		mes "[Larjes]";
-		mes "Alright, let's go.";
-		close2;
-		warp "ve_fild07",130,130;
-		end;
-	}
-	mes "[Larjes]";
-	mes "Alright, but becareful.";
-	mes "Those creatures almost";
-	mes "got you once, you know.";
-	close;
-}
-
-abbey02,224,70,0	script	Book#Aru	111,{
-	if (checkweight(7766,1) == 0) {
-		mes "^3355FFWait a second!";
-		mes "Right now, you're carrying";
-		mes "too many things with you.";
-		mes "Please come back after";
-		mes "using the Kafra Service";
-		mes "to store some of your items.^000000";
-		close;
-	}
-	if (aru_monas < 21) {
-		mes "^3355FFIt's just a bunch";
-		mes "of old, moldy books.^000000";
-		close;
-	}
-	else if (aru_monas == 21) {
-		mes "^3355FFThere's a book stained";
-		mes "with blood amongst all";
-		mes "these old, moldy books.^000000";
-		next;
-		if(select("Examine Book:Ignore")==1) {
-			Readbook 7755,1;
-			getitem 7755,1; // Reasearch_Note
-			set aru_monas,22;
-			close;
-		}
-		mes "^3355FFThat book was probably";
-		mes "worthless to you anyway.^000000";
-		close;
-	}
-	else {
-		mes "^3355FFThere are old books";
-		mes "scattered all over here.^000000";
-		close;
-	}
-}
-
-abbey03,232,233,4	script	Man#Aru	956,{
-	if (aru_monas < 22) {
-		mes "^3355FFYou find a man lying on";
-		mes "the floor, wearing torn";
-		mes "yet luxurious clothing.";
-		mes "He doesn't seem to be";
-		mes "breathing at all...^000000.";
-		next;
-		mes "^3355FFHe's dead.^000000";
-		close;
-	}
-	if (aru_monas == 22) {
-		mes "^3355FFYou find a man lying on";
-		mes "the floor, wearing torn";
-		mes "yet luxurious clothing.";
-		mes "He doesn't seem to be";
-		mes "breathing at all...^000000.";
-		next;
-		mes "^3355FFYou bring your ears more";
-		mes "closely to his mouth: it";
-		mes "seems that he really is";
-		mes "still barely alive.^000000";
-		next;
-		if (select("Touch Him:Ignore Him") == 1) {
-			mes "["+strcharinfo(0)+"]";
-			mes "This man...";
-			mes "He's so familiar";
-			mes "for some reason.";
-			next;
-			mes "^3355FFAs you touch him, the";
-			mes "man suddenly jumps";
-			mes "up with a crazed yowl.^000000";
-			initnpctimer;
-			hideonnpc "Man#Aru";
-			monster "abbey03",232,232,"Dead King",1875,1,"Man#Aru::OnMyMobDead";
-			close;
-		}
-		mes "^3355FFYou don't feel";
-		mes "comfortable enough";
-		mes "to touch this man.^000000";
-		close;
-	}
-	if (aru_monas > 22) {
-		mes "^3355FFHe's dead... Now...^000000";
-		close;
-	}
-
-OnMyMobDead:
-	stopnpctimer;
-	hideoffnpc "Dead Man#Aru";
-	donpcevent "Dead Man#Aru::OnEnable";
-	end;
-
-OnTimer300000:
-	stopnpctimer;
-	hideonnpc "Dead Man#Aru";
-	hideoffnpc "Man#Aru";
-	end;
-}
-
-abbey03,232,232,4	script	Dead Man#Aru	956,{
-	if (checkweight(7766,1) == 0) {
-		mes "^3355FFWait a second!";
-		mes "Right now, you're carrying";
-		mes "too many things with you.";
-		mes "Please come back after";
-		mes "using the Kafra Service";
-		mes "to store some of your items.^000000";
-		close;
-	}
-	if (aru_monas == 22) {
-		mes "^3355FFYou have no idea why";
-		mes "this dead man is moving";
-		mes "around, so you decided to";
-		mes "examine him. In his jacket,";
-		mes "you find a shining medal...^000000";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "This medal...";
-		mes "This means that";
-		mes "this man is...!";
-		set aru_monas,23;
-		getitem 7726,1; //Token_of_King
-		hideonnpc "Dead Man#Aru";
-		hideoffnpc "Man#Aru";
-		stopnpctimer;
-		close;
-	}
-	end;
-
-OnEnable:
-	initnpctimer;
-	end;
-
-OnInit:
-	hideonnpc "Dead Man#Aru";
-	end;
-}
-
 ra_temple,168,54,3	script	Sippie#ss	917,{
 	mes "[Sippie]";
 	mes "Now I finally have some";
@@ -2138,7 +2255,7 @@ ra_temple,168,54,3	script	Sippie#ss	917,{
 	}
 }
 
-// Peace to the Arunafeltz
+// Peace to the Arunafeltz :: aruna_em
 //============================================================
 moc_ruins,77,167,4	script	Foreign Merchant#aru1	880,5,5,{
 	if (aru_vol == 27) {
@@ -2188,6 +2305,7 @@ moc_ruins,77,167,4	script	Foreign Merchant#aru1	880,5,5,{
 			mes "of Morroc? Before I leave,";
 			mes "I want to taste that drink...";
 			set aru_em,1;
+			setquest 2129;
 			close;
 		}
 		else if ((aru_em > 0) && (aru_em < 7)) {
@@ -2224,7 +2342,7 @@ moc_ruins,77,167,4	script	Foreign Merchant#aru1	880,5,5,{
 				mes "^3355FF*Gulp Gulp Gulp Gulp*^000000";
 				mes "^3355FF*Gulp Gulp Gulp Gulp*^000000";
 				next;
-				emotion 3;
+				emotion e_lv;
 				mes "[Foreign Merchant]";
 				mes "Ahhh! That hit the spot!";
 				mes "It's so refreshing and so";
@@ -2262,7 +2380,7 @@ moc_ruins,77,167,4	script	Foreign Merchant#aru1	880,5,5,{
 				mes "You're not really a";
 				mes "merchant, are you?";
 				next;
-				emotion 39;
+				emotion e_meh;
 				mes "^3355FFThe merchant quietly";
 				mes "looks at you with a";
 				mes "mischievous grin.^000000";
@@ -2285,6 +2403,7 @@ moc_ruins,77,167,4	script	Foreign Merchant#aru1	880,5,5,{
 				mes "speak to him now?";
 				mes "Good luck!";
 				set aru_em,8;
+				changequest 2130,2131;
 				close;
 			case 2:
 				mes "[Foreign Merchant]";
@@ -2398,13 +2517,13 @@ moc_ruins,101,133,7	script	Foreign Merchant#aru2	929,{
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Oh, no...";
-		emotion 57,1;
+		emotion e_otl,1;
 		next;
 		mes "[Foreign Merchant]";
 		mes "...............................";
 		mes "...............................";
 		mes "...............................";
-		emotion 19;
+		emotion e_swt2;
 		next;
 		emotion e_omg,1;
 		mes "[Foreign Merchant]";
@@ -2427,7 +2546,7 @@ moc_ruins,101,133,7	script	Foreign Merchant#aru2	929,{
 		mes "keep an extra bottle in case";
 		mes "you want more next time. Take";
 		mes "care, and I'll see you later!";
-		emotion 13;
+		emotion e_korea;
 		next;
 		mes "^3355FFYou received a bottle";
 		mes "of the famous fruit wine";
@@ -2435,6 +2554,7 @@ moc_ruins,101,133,7	script	Foreign Merchant#aru2	929,{
 		mes "guy's pretty nice!^000000";
 		set aru_em,7;
 		hideonnpc "Foreign Merchant#aru2";
+		changequest 2129,2130;
 		close;
 	}
 	else {
@@ -2563,7 +2683,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 		mes "just step away? I... I don't";
 		mes "like being too close to";
 		mes "other people. Please!";
-		emotion 19;
+		emotion e_swt2;
 		close;
 	}
 	else if (aru_em == 17) {
@@ -2573,7 +2693,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 		mes "just step away? Wait, you";
 		mes "don't have something you";
 		mes "need from me, do you?";
-		emotion 19;
+		emotion e_swt2;
 		next;
 		switch(select("Give Her Niren's File:Leave Her Alone")) {
 		case 1:
@@ -2587,7 +2707,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 				mes "Just toss the file over";
 				mes "to me. I-I don't want";
 				mes "you coming any closer.";
-				emotion 19;
+				emotion e_swt2;
 				next;
 				mes "[Ishmael]";
 				mes "I'll be glad to help out";
@@ -2625,6 +2745,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 				mes "she's been so good to us...";
 				set aru_em,18;
 				delitem 7343,1; //File02
+				changequest 2137,2138;
 				close;
 			}
 			else {
@@ -2660,7 +2781,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 			mes "I still... Uh... I don't mean";
 			mes "to be rude... It's just...";
 			mes "I'm just not good with...";
-			emotion 19;
+			emotion e_swt2;
 			next;
 			mes "[Ishmael]";
 			mes "If you just toss the";
@@ -2712,6 +2833,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 				delitem 725,1; //Red_Jewel
 				set aru_em,19;
 				getitem 7343,1; //File02
+				changequest 2138,2139;
 				close;
 			}
 		}
@@ -3021,6 +3143,7 @@ OnTouch:
 		mes "aura of warmth and kindness";
 		mes "permeate your entire being.^000000";
 		set aru_em,22;
+		changequest 2140,2141;
 		close2;
 		warp "rachel",142,136;
 	}
@@ -3088,8 +3211,8 @@ OnTimer53000:
 
 que_temsky,99,7,0	warp	quetemskyout	1,1,ra_temin,276,231
 
-// Muff's Loan
-//============================================================ 
+// Muff's Loan :: zdan_total_edq
+//============================================================
 comodo,224,187,3	script	Muff	86,{
 	if (checkweight(907,200) == 0) {
 		mes "[Muff]";
@@ -3653,7 +3776,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 	close;
 }
 
--	script	::Dorian	-1,{
+-	script	::Dorian_izlude	-1,{
 	if (checkweight(907,200) == 0) {
 		mes "[Dorian]";
 		mes "Ugh, just like a member";
@@ -4159,8 +4282,384 @@ OnTouch:
 	end;
 }
 
+izlude_in,113,66,0	script	Strange Machine	111,{
+	if (checkweight(907,200) == 0) {
+		mes "[Dorian]";
+		mes "Ugh, just like a member";
+		mes "of the working class:";
+		mes "hoarding all your items";
+		mes "like a packrat? Have the";
+		mes "decency to relocate your";
+		mes "goods to Kafra Storage, please.";
+		close;
+	}
+	if (diamond_edq) == 10 {
+		set .@bolt_rand,rand(2,5);
+		mes "^3355FFThis must be Dorian's";
+		mes "Mystic Dryer de Elegance.";
+		mes "What do you want to do?^000000";
+		next;
+		while(1) {
+			set .@switch_sound,rand(1,4);
+			switch(select("Check the Machine:Replace the Engine:Tighten the Screw:Press a Switch")) {
+			case 1:
+				if (.@hit_status == 0) {
+					mes "^3355FFThere's no power";
+					mes "in this behemoth";
+					mes "of a machine.^000000";
+					next;
+				}
+				break;
+			case 2:
+				if (.@engine == 0) {
+					mes "^3355FFYou replace the rough";
+					mes "ruby in the ruby engine";
+					mes "with a new rough ruby.";
+					mes "It clicks into place";
+					mes "inside the engine core.^000000";
+					next;
+					set .@engine,.@engine+1;
+				}
+				else if (engine > 0) {
+					mes "^3355FFThe ruby in the";
+					mes "engine has already";
+					mes "been replaced.^000000";
+					next;
+				}
+				break;
+			case 3:
+				if (.@engine <  1) {
+					mes "^3355FFYou probably need";
+					mes "to replace the ruby";
+					mes "in the engine first.^000000";
+					next;
+				}
+				else if ((.@engine == 1) && (.@bolt < .@bolt_rand)) {
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					next;
+					set .@bolt,.@bolt+1;
+				}
+				else if ((.@engine == 1) && (.@bolt == .@bolt_rand)) {
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					mes "^0000FF*Click*^000000";
+					next;
+					set .@bolt,.@bolt+1;
+					set .@bolt_suc,.@bolt_suc+1;
+				}
+				else if ((.@engine == 1) && (.@bolt > .@bolt_rand)) {
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					mes "^3355FF*KrrICK-ICK-ICK-KOOM*^000000";
+					next;
+					mes "^3355FFYou tightened the";
+					mes "screw too tightly!";
+					mes "The joint is broken...";
+					mes "You should go back";
+					mes "to Dorian for help.^000000";
+					setquest 3106;
+					set diamond_edq,11;
+					close;
+				}
+				else {
+					mes "^3355FFSomething must have";
+					mes "gone wrong. You'd be";
+					mes "better off starting";
+					mes "from the beginning...^000000";
+					close;
+				}
+				break;
+			case 4:
+				if ((.@engine <  1) && (.@bolt_suc < 1)) {
+					mes "^3355FFYou need to replace";
+					mes "the engine's ruby and";
+					mes "tighten the main screw";
+					mes "before you mess with";
+					mes "these switches.^000000";
+					next;
+				}
+				else if ((.@engine == 1) && (.@bolt_suc < 1)) {
+					mes "^3355FFYou need to tighten";
+					mes "the scren before you can";
+					mes "start the engine safely.";
+					next;
+				}
+				else if ((.@red >= 1) && (.@blue >= 1) && (.@yellow >= 1) && (.@green >= 1)) {
+					mes "^3355FFThe Mystic Dryer de";
+					mes "Elegance started with";
+					mes "a mighty buzz, and the";
+					mes "sound lowers to a calm";
+					mes "hum as it stabilizes.";
+					mes "It looks like you fixed it!^000000";
+					next;
+					mes "^3355FFYou should tell Dorian";
+					mes "first so that you can";
+					mes "use this machine.^000000";
+					setquest 3107;
+					set diamond_edq,12;
+					close;
+				}
+				else if ((.@engine == 1) && (.@bolt_suc == 1)) {
+					if (.@switch_sound == 1) {
+						mes "^3355FF*Buzz Buzz*^000000";
+						mes "^3355FF*Buzz Buzz*^000000";
+						mes "^3355FFThe machine is";
+						mes "vibrating weakly.";
+						mes "Which switch do";
+						mes "you want to press?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 1:
+							if (.@red  >= 0) {
+								mes "^3355FF*Buzzz Buzzz*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@red,.@red+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+					else if (.@switch_sound == 2) {
+						mes "^3355FF*Purr Purr*^000000";
+						mes "^3355FF*Purr Purr*^000000";
+						mes "^3355FFThe machine is vibrating";
+						mes "a little bit more strongly.";
+						mes "Which switch will";
+						mes "you try now?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 2:
+							if (.@blue >= 0) {
+								mes "^3355FF*Purrr Purr*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@blue,.@blue+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+					else if (.@switch_sound == 3) {
+						mes "^3355FF*Bzzz Bzzz*";
+						mes "*Bzzz Bzzz*";
+						mes "The machine's vibrations";
+						mes "are a bit more stable now.";
+						mes "Which switch will you try?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 3:
+							if (.@yellow >= 0) {
+								mes "^3355FF*Bzzzz Bzzzz*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@yellow,.@yellow+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+					else if (.@switch_sound == 4) {
+						next;
+						mes "^3355FF*Pzzzz Pzzz*";
+						mes "*Pzzzz Pzzz*";
+						mes "The machine is vibrating";
+						mes "fairly strongly now. Which";
+						mes "switch will you try?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 4:
+							if (.@green >= 0) {
+								mes "^3355FFPzzzzz Pzzzz*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@green,.@green+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+	if (diamond_edq == 12) {
+		mes "[Dorian]";
+		mes "It sounds like you're";
+		mes "done fixing my Mystic";
+		mes "Dryer de Elegance.";
+		mes "Why don't you come";
+		mes "back so I can explain";
+		mes "how you can use it?";
+		close;
+	}
+	if ((diamond_edq == 13) && (countitem(7722) < 1)) {
+		mes "^3355FFYou lift the main";
+		mes "operational switch,";
+		mes "turning on a light and";
+		mes "opening a convenient";
+		mes "slot. You insert the";
+		mes "wet bond of debt.^000000";
+		next;
+		mes "^3355FFThe engine's pistons";
+		mes "and cylinders churn";
+		mes "with a lively din, and";
+		mes "when the heater stops,";
+		mes "the slot reopens.^000000";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "So this is the original";
+		mes "bond of debt that Muff";
+		mes "lost? It looks... Perfect!";
+		changequest 3108,3109;
+		getitem 7722,1; //Debt_Note
+		close;
+	}
+	else if ((diamond_edq == 13) && (countitem(7722) > 0)) {
+		mes "You already used this";
+		mes "machine to restore the";
+		mes "bond of debt. There's no";
+		mes "need to mess around";
+		mes "with it any longer.";
+		close;
+	}
+	mes "[Dorian]";
+	mes "Who are you?";
+	mes "Don't you dare lay";
+	mes "a hand on my precious";
+	mes "masterpiece inventions! ";
+	close;
+}
+
 // Broken Diamond
-//============================================================ 
+//============================================================
 moc_ruins,152,147,5	script	Ibrahim	732,3,3,{
 	if (checkweight(907,200) == 0) {
 		mes "[Ibrahim]";
@@ -5615,7 +6114,7 @@ in_rogue,366,46,3	script	Rogue Investigator	828,{
 		switch(select("Sounds good!:Never mind, I'll find it myself...")) {
 		case 1:
 			if (Zeny > 9999) {
-				set zeny,zeny-10000;
+				set Zeny, Zeny-10000;
 				mes "[Investigator]";
 				mes "Thanks for the money~";
 				mes "Of course, if you became";
@@ -5693,7 +6192,7 @@ in_rogue,366,46,3	script	Rogue Investigator	828,{
 		switch(select("Sounds good!:Forget it...")) {
 		case 1:
 			if (Zeny > 9999) {
-				set zeny,zeny-10000;
+				set Zeny, Zeny-10000;
 				mes "[Investigator]";
 				mes "Right on, right on.";
 				mes "Alright, I didn't charge";
@@ -5890,7 +6389,7 @@ OnInit:
 }
 
 // Z-Gang Quest
-//============================================================ 
+//============================================================
 prontera,150,326,0	script	Wanted Notice#edq	111,{
 	if (zdan_edq == 0) {
 		mes "====National Wanted Notice====";
@@ -6188,10 +6687,7 @@ prontera,148,326,3	script	Chief Officer#edq	734,{
 		mes "Congratulations! ";
 		completequest 3134;
 		set zdan_edq,19;
-		if(checkre(0))
-			getexp 100000,0;
-		else
-			getexp 1000000,0;
+		getexp (checkre(3))?100000:1000000,0;
 		close;
 	}
 	mes "[Chief Officer]";
@@ -6894,7 +7390,7 @@ payon,244,62,3	script	Moonho Ahn	897,{
 		switch(select("Yes, let's play!:How does this game work again?")) {
 		case 1:
 			if (Zeny > 500) {
-				set zeny,zeny-500;
+				set Zeny, Zeny-500;
 				mes "[Moonho Ahn]";
 				mes "Good, let's get started!";
 				mes "I'll let you go first~";
@@ -7148,7 +7644,7 @@ payon,244,62,3	script	Moonho Ahn	897,{
 						if (((.@input$ == "Odd") && (.@number == 1)) || ((.@input$ == "Even") && (.@number == 2))) {
 							set .@number_right_3,.@number_right_3+1;
 							mes "[Moonho Ahn]";
-							mes "^0000FF"+.@input+"^000000?";
+							mes "^0000FF"+.@input$+"^000000?";
 							mes "Okay, you won.";
 							next;
 							if ((.@number_right_3 < 2) && (.@number_false_3 < 2)) {
@@ -7161,7 +7657,7 @@ payon,244,62,3	script	Moonho Ahn	897,{
 						else if (((.@input$ == "Odd") && (.@number == 2)) || ((.@input$ == "Even") && (.@number == 1))) {
 							set .@number_false_3,.@number_false_3+1;
 							mes "[Moonho Ahn]";
-							mes "Well, it's ^0000FF"+.@input+"^000000.";
+							mes "Well, it's ^0000FF"+.@input$+"^000000.";
 							mes "Looks like I won.";
 							next;
 							if ((.@number_right_3 < 2) && (.@number_false_3 <2)) {
@@ -8380,7 +8876,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	killmonster "z_agit","#ZGuard::OnMyMobDead";
 	set $@monster_zgang,0;
 	end;
@@ -8799,7 +9295,7 @@ OnInit:
 }
 
 // Unlucky Emerald
-//============================================================ 
+//============================================================
 morocc,143,63,3	script	Ragged Man#nd	929,{
 	if (treasure_nd == 0) {
 		mes "[Ragged Man]";
@@ -8884,7 +9380,7 @@ morocc,143,63,3	script	Ragged Man#nd	929,{
 						close;
 					}
 					else {
-						set zeny,zeny-1200;
+						set Zeny, Zeny-1200;
 						mes "[Ragged Man]";
 						mes "Let's see... I just need";
 						mes "1,200 zeny. That's enough";
@@ -8963,7 +9459,7 @@ morocc,143,63,3	script	Ragged Man#nd	929,{
 				mes "up the funds. I'll be waiting.";
 				close;			}
 			else {
-				set zeny,zeny-1200;
+				set Zeny, Zeny-1200;
 				mes "[Ragged Man]";
 				mes "Remember that hidden";
 				mes "treasure I was looking for?";
@@ -9713,7 +10209,7 @@ moc_fild18,108,116,0	script	#treasure	844,{
 				getitem 7725,1; //Unlucky_Emerald
 				getitem 604,1; //Branch_Of_Dead_Tree
 				getitem 1157,1; //Two_Hand_Sword
-				sc_start2 SC_Curse,10000,0,10000;
+				sc_start SC_CURSE,10000,0,10000;
 				next;
 				mes "[" + strcharinfo(0) + "]";
 				mes "N-no! What's going on?";
@@ -10003,7 +10499,7 @@ alberta_in,70,109,5	script	Shaman	788,{
 			mes "If all goes well, you'll be";
 			mes "free of your curse, and I can";
 			mes "buy some Prontera real estate.";
-			set zeny,zeny-200000;
+			set Zeny, Zeny-200000;
 			set jewel_nd,14;
 			next;
 			mes "[Shaman]";
@@ -10054,7 +10550,7 @@ alberta_in,70,109,5	script	Shaman	788,{
 			mes "Hopefully, the";
 			mes "spirits will be more";
 			mes "cooperative this time.";
-			set zeny,zeny-100000;
+			set Zeny, Zeny-100000;
 			set jewel_nd,16;
 			next;
 			mes "[Shaman]";
@@ -10702,70 +11198,26 @@ prontera,140,304,5	script	Old Soldier	901,{
 					delitem 7725,1; //Unlucky_Emerald
 					set jewel_nd,31;
 					getitem 603,1; //Old_Blue_Box
-					if (BaseLevel < 66) {
-						getitem 607,1; //Yggdrasilberry
-						next;
-					}
-					if(checkre(0)) {
-						if ((BaseLevel > 65) && (BaseLevel < 75)) {
-							getexp 5000,0;
-							next;
-						}
-						else if ((BaseLevel > 74) && (BaseLevel < 81)) {
-							getexp 18000,0;
-							next;
-						}
-						else if ((BaseLevel > 80) && (BaseLevel < 86)) {
-							getexp 36000,0;
-							next;
-						}
-						else if ((BaseLevel > 85) && (BaseLevel < 91)) {
-							getexp 50000,0;
-							next;
-						}
-						else if ((BaseLevel > 90) && (BaseLevel < 96)) {
-							getexp 80000,0;
-							next;
-						}
-						else if ((BaseLevel > 95) && (BaseLevel < 150)) {
-							getexp 100000,0;
-							next;
-						}
+					if (checkre(3)) {
+						if (BaseLevel < 66) getitem 607,1; //Yggdrasilberry
+						else if ((BaseLevel > 65) && (BaseLevel < 75)) getexp 5000,0;
+						else if ((BaseLevel > 74) && (BaseLevel < 81)) getexp 18000,0;
+						else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 36000,0;
+						else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 50000,0;
+						else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 80000,0;
+						else if ((BaseLevel > 95) && (BaseLevel < 160)) getexp 100000,0;
+						else getitem 617,1; //Old_Violet_Box
 					} else {
-						if ((BaseLevel > 65) && (BaseLevel < 75)) {
-							getexp 50000,0;
-							next;
-						}
-						else if ((BaseLevel > 74) && (BaseLevel < 81)) {
-							getexp 180000,0;
-							next;
-						}
-						else if ((BaseLevel > 80) && (BaseLevel < 86)) {
-							getexp 360000,0;
-							next;
-						}
-						else if ((BaseLevel > 85) && (BaseLevel < 91)) {
-							getexp 500000,0;
-							next;
-						}
-						else if ((BaseLevel > 90) && (BaseLevel < 96)) {
-							getexp 800000,0;
-							next;
-						}
-						else if ((BaseLevel > 95) && (BaseLevel < 150)) {
-							getexp 200000,0;
-							next;
-						}
-
-					}
-					if (BaseLevel == 150) {
-						getitem 617,1; //Old_Violet_Box
-						next;
-					}
-					else {
-						getitem 617,1; //Old_Violet_Box
-						next;
+						if (BaseLevel < 66) getitem 607,1; //Yggdrasilberry
+						else if ((BaseLevel > 65) && (BaseLevel < 75)) getexp 50000,0;
+						else if ((BaseLevel > 74) && (BaseLevel < 81)) getexp 180000,0;
+						else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 360000,0;
+						else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 500000,0;
+						else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 800000,0;
+						else if ((BaseLevel > 95) && (BaseLevel < 99)) getexp 1000000,0;
+						else getitem 617,1; //Old_Violet_Box
 					}
+					next;
 					mes "[Retired Soldier]";
 					mes "If there's anything";
 					mes "you learn from all this,";
@@ -10801,42 +11253,26 @@ prontera,140,304,5	script	Old Soldier	901,{
 			delitem 7725,1; //Unlucky_Emerald
 			set jewel_nd,31;
 			getitem 603,1; //Old_Blue_Box
-			if (BaseLevel < 66) {
-				getitem 607,1; //Yggdrasilberry
-				next;
-			}
-			else if ((BaseLevel > 65) && (BaseLevel < 75)) {
-				getexp 5000,0;
-				next;
-			}
-			else if ((BaseLevel > 74) && (BaseLevel < 81)) {
-				getexp 8000,0;
-				next;
-			}
-			else if ((BaseLevel > 80) && (BaseLevel < 86)) {
-				getexp 15000,0;
-				next;
-			}
-			else if ((BaseLevel > 85) && (BaseLevel < 91)) {
-				getexp 20000,0;
-				next;
-			}
-			else if ((BaseLevel > 90) && (BaseLevel < 96)) {
-				getexp 40000,0;
-				next;
-			}
-			else if ((BaseLevel > 95) && (BaseLevel < 150)) {
-				getexp 50000,0;
-				next;
-			}
-			else if (BaseLevel == 150) {
-				getitem 617,1; //Old_Violet_Box
-				next;
-			}
-			else {
-				getitem 617,1; //Old_Violet_Box
-				next;
+			if (checkre(3)) {
+				if (BaseLevel < 66) getitem 607,1; //Yggdrasilberry
+				else if ((BaseLevel > 65) && (BaseLevel < 75)) getexp 5000,0;
+				else if ((BaseLevel > 74) && (BaseLevel < 81)) getexp 8000,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 15000,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 20000,0;
+				else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 40000,0;
+				else if ((BaseLevel > 95) && (BaseLevel < 160)) getexp 50000,0;
+				else getitem 617,1; //Old_Violet_Box
+			} else {
+				if (BaseLevel < 66) getitem 607,1; //Yggdrasilberry
+				else if ((BaseLevel > 65) && (BaseLevel < 75)) getexp 50000,0;
+				else if ((BaseLevel > 74) && (BaseLevel < 81)) getexp 80000,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 150000,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 200000,0;
+				else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 400000,0;
+				else if ((BaseLevel > 95) && (BaseLevel < 99)) getexp 500000,0;
+				else getitem 617,1; //Old_Violet_Box
 			}
+			next;
 			mes "[Retired Soldier]";
 			mes "If there's anything";
 			mes "you learn from all this,";
@@ -11250,7 +11686,7 @@ OnTouch:
 }
 
 // Rogue Guild Investigation
-//============================================================ 
+//============================================================
 prontera,163,204,3	script	Man from Morroc	99,{
 	if (rumour_nd == 0) {
 		mes "[Morroc Traveler]";
diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt
index e5e95c6a1..94bf2d25e 100644
--- a/npc/quests/quests_niflheim.txt
+++ b/npc/quests/quests_niflheim.txt
@@ -1,32 +1,33 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Niflheim
-//===== By: ================================================== 
+//===== By: ==================================================
 //= The rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.6
+//===== Description: =========================================
+//= [Official Conversion]
 //= Piano Key Ouest
 //= - Escape from Niflheim
 //= - Variables in use: nif_esc, MISC_QUEST (Bit 32)
 //= Message Delivery Quest
 //= - Deliver a message to Erious' departed wife.
 //= - Variables in use: nif_revive, MISC_QUEST (Bit 16384)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Initial release, moved Book of Devil and Piano quest
-//=	from npc/cities/niflheim.txt [Evera]
+//=     from npc/cities/niflheim.txt [Evera]
 //= 1.1 Optimized Book of Devil quest. used bit-wise var,
-//=	Optimized Piano Quest - now uses 1 variable [Lupus]
+//=     Optimized Piano Quest - now uses 1 variable [Lupus]
 //= 1.2 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.3 Moved the Book of Devil quest to custom folder. [L0ne_W0lf]
-//=	Updated to Aegis 10.3 Standed, added Message Delivery Quest.
-//=	Rescripted Piano Quest. Prior quest progress will be lost.
+//=     Updated to Aegis 10.3 Standed, added Message Delivery Quest.
+//=     Rescripted Piano Quest. Prior quest progress will be lost.
 //= 1.4 Fixed NPCs using ID 111 when it shoudl have been 139. [L0ne_W0lf]
 //= 1.5 Swapped NPC IDs back from last change (139 back to 111). [L0ne_W0lf]
 //=     Clicking will do nothing, you have to still "touch" the npc. 
-//============================================================ 
+//= 1.6 Added questlog support. [Euphy]
+//============================================================
 
-// Piano Quest
+// Piano Quest :: nif_ryu
 //============================================================
 niflheim,224,243,3	script	Alreg#nif	795,{
 	if (nif_piano) set nif_piano,0;
@@ -292,7 +293,7 @@ nif_in,188,168,3	script	Witch#nif	792,{
 	end;
 }
 
-// Message Delivery Quest
+// Message Delivery Quest :: nif_npc_lackee
 //============================================================
 prt_in,161,20,3	script	Erious#nif	92,{
 	if (MISC_QUEST & 16384) {
@@ -353,6 +354,7 @@ prt_in,161,20,3	script	Erious#nif	92,{
 				mes "Thank you for your help,";
 				mes "and please take care.";
 				set nif_revive,1;
+				setquest 11038;
 				close;
 			}
 			mes "[Erious]";
@@ -432,6 +434,7 @@ prt_in,161,20,3	script	Erious#nif	92,{
 				if (checkweight(610,26)) {
 					set MISC_QUEST,MISC_QUEST | 16384;
 					set nif_revive,0;
+					completequest 11043;
 					getitem 607,2; //Yggdrasilberry
 					getitem 608,2; //Seed_Of_Yggdrasil
 					getitem 610,10; //Leaf_Of_Yggdrasil
@@ -476,6 +479,7 @@ prt_in,161,20,3	script	Erious#nif	92,{
 			if (checkweight(610,10)) {
 				set MISC_QUEST,MISC_QUEST | 16384;
 				set nif_revive,0;
+				completequest 11042;
 				getitem 610,10; //Leaf_Of_Yggdrasil
 				mes "[Erious]";
 				mes "Thank you for everything.";
@@ -539,6 +543,7 @@ umbala,215,181,3	script	Billik	733,{
 			mes "for him. That way, he'll know for";
 			mes "sure that I've sent you.";
 			set nif_revive,2;
+			changequest 11038,11039;
 			next;
 			mes "[Billik]";
 			mes "The town of the dead is located";
@@ -598,6 +603,7 @@ niflheim,153,215,3	script	Feylin	794,{
 		mes "you go back to where you came";
 		mes "from before it's too late.";
 		set nif_revive,3;
+		changequest 11039,11040;
 		close;
 	}
 	else if (nif_revive == 3) {
@@ -621,6 +627,7 @@ niflheim,153,215,3	script	Feylin	794,{
 			mes "you. Besides, speaking about";
 			mes "such things is taboo.";
 			set nif_revive,4;
+			changequest 11040,11041;
 			close;
 		}
 		mes "[Feylin]";
@@ -675,6 +682,7 @@ niflheim,153,215,3	script	Feylin	794,{
 								delitem 748,1; //Witherless_Rose
 								delitem 610,10; //Leaf_Of_Yggdrasil
 								set nif_revive,5;
+								changequest 11041,11042;
 								percentheal -99,0;
 								next;
 								mes "[Feylin]";
@@ -718,6 +726,7 @@ niflheim,153,215,3	script	Feylin	794,{
 								mes "with someone else. Oh, also let";
 								mes "him know that I forgive him.";
 								set nif_revive,6;
+								changequest 11040,11043;
 								getitem 934,1; //Mementos
 								next;
 								mes "[Elly]";
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index 719e3a543..5872420fa 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -1,14 +1,12 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Payon
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: ===================================== 
-//= rAthena 7.15 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Pretend Murder, Ear Muffs, Oxygen, Derivuchi Cap, Helm of Angel Quests.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Helm of Angel bug fixed [Lupus]
 //= 1.2 Fixed skirt of virgin [Lupus]
 //= 1.3 Fixed exploits [Lupus]
@@ -17,7 +15,7 @@
 //= 1.5a replaced item "names" with item id. [Lupus]
 //= 1.6 Updated Dialogs from "Oxygen Mask Quest" [Samuray22]
 //= 1.7 Updated headgear quests. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 // 'Pretend Murdered' Quest
 //============================================================
@@ -35,7 +33,7 @@ payon_in01,99,72,4	script	Granny	103,{
 		next;
 		switch(select("Alright.:No way!")) {
 		case 1:
-			delitem 1049,4;  //Skirt_Of_Virgin
+			delitem 1049,4; //Skirt_Of_Virgin
 			mes "[Granny]";
 			mes "Oh! Thank you so much~ Now I can make some clothes for Kitty Cutty~";
 			next;
@@ -46,7 +44,7 @@ payon_in01,99,72,4	script	Granny	103,{
 			mes "If it's okay...";
 			mes "I'd like to give you this.";
 			next;
-			getitem 2293,1; // Pretend_Murdered
+			getitem 2293,1; //Pretend_Murdered
 			mes "[Granny]";
 			mes "Goodbye, adventurer~!";
 			mes "Thank you for making an old woman so happy...";
@@ -79,33 +77,33 @@ payon_in01,18,10,4	script	Mystic Lady	76,{
 	next;
 	mes "[Mystic Lady]";
 	mes "If you plan to travel to colder regions, I suggest that you bring some ^3355FFEar Muffs^000000...";
-	Emotion e_dots;
+	emotion e_dots;
 	next;
 	mes "[Mystic Lady]";
 	mes "Ear Muffs are my family's specialty, and we provide it to customers who have ^FF33551 Cursed Ruby^000000, ^3311AA1 Headset,^000000 ^3355FF 200 Feathers^000000 and ^DDDD005000 Zeny^000000.";
-	Emotion e_dots;
+	emotion e_dots;
 	next;
 	switch(select("Oh Yeah? That sounds good.:No thank you, Ma'am.")) {
 	case 1:
 		if ((countitem(724) > 0) && (countitem(949) > 199) && (countitem(5001) > 0) && (Zeny > 4999)) {
 			mes "[Mystic Lady]";
-			delitem 724,1;  //Cardinal_Jewel_
-			delitem 949,200;  //Feather
-			delitem 5001,1;  //Headset
+			delitem 724,1; //Cardinal_Jewel_
+			delitem 949,200; //Feather
+			delitem 5001,1; //Headset
 			set Zeny,Zeny-5000;
 			mes "Here, I will give you this pre-made one.";
-			getitem 2283,1; // Ear_Mufs
+			getitem 2283,1; //Ear_Mufs
 			next;
 			mes "[Mystic Lady]";
 			mes "Thank you for buying our product. You won't regret purchasing our Ear Muffs: Satisfaction guaranteed~";
-			Emotion e_dots;
+			emotion e_dots;
 			close;
 		}
 		else {
 			mes "[Mystic Lady]";
 			mes "Oh dear...";
 			mes "You don't have enough money or items. Unfortunately, we can't give any discounts. Please understand that we have to make a living...";
-			Emotion e_dots;
+			emotion e_dots;
 			close;
 		}
 	case 2:
@@ -114,7 +112,7 @@ payon_in01,18,10,4	script	Mystic Lady	76,{
 		mes "I believe we";
 		mes "will meet again.";
 		mes "...One of these days.";
-		Emotion e_dots;
+		emotion e_dots;
 		close;
 	}
 }
@@ -145,7 +143,7 @@ payon_in02,25,71,4	script	Boy	86,{
 			close;
 		case 2:
 			if (countitem(701) > 4) {
-				delitem 701,5;  //Ora_Ora
+				delitem 701,5; //Ora_Ora
 			}
 			mes "[Young Man]";
 			mes "Muhahahahah!!!";
@@ -159,7 +157,7 @@ payon_in02,25,71,4	script	Boy	86,{
 			mes "Huk...Huk...";
 			mes "Sorry, I was out of control with pleasure for a while. Now, I will give my treasure as promised.";
 			next;
-			getitem 5004,1; // Oxygen_Mask
+			getitem 5004,1; //Oxygen_Mask
 			mes "[Young Man]";
 			mes "When you wear this over your mouth and start to breathe, it filters junk out before getting to your lungs.";
 			next;
@@ -248,11 +246,11 @@ payon_in01,56,12,7	script	Young man#12	89,{
 					mes "[Young man]";
 					mes ".....Hm.";
 					mes "Fine, here's your Helm of Angel. Take it.";
-					delitem 2229,1;  //Helm_
-					delitem 2254,1;  //Angelic_Chain
-					delitem 7036,5;  //Fang_Of_Garm
+					delitem 2229,1; //Helm_
+					delitem 2254,1; //Angelic_Chain
+					delitem 7036,5; //Fang_Of_Garm
 					close2;
-					getitem 5025,1; // Helm_Of_Angel
+					getitem 5025,1; //Helm_Of_Angel
 					end;
 				}
 				else {
@@ -285,10 +283,10 @@ payon_in01,56,12,7	script	Young man#12	89,{
 				if ((countitem(1038) > 599) && (countitem(7048) > 39)) {
 					mes "[Young man]";
 					mes ".....Hm. Here's your Deviruchi Hat. Please take it.";
-					delitem 1038,600;  //Petite_DiablOfs_Horn
-					delitem 7048,40;  //Talon_Of_Griffin
+					delitem 1038,600; //Petite_DiablOfs_Horn
+					delitem 7048,40; //Talon_Of_Griffin
 					close2;
-					getitem 5038,1; // Deviruchi_Cap
+					getitem 5038,1; //Deviruchi_Cap
 					end;
 				}
 				else {
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index fba2043f3..9d207c088 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -1,27 +1,25 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Prontera
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 2.8
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.9
+//===== Description: =========================================
 //= Collection of Prontera-based quests.
 //= * Culvert Access
 //= * Ph.D Hat Quest
 //= * Gaebolg Family Curse
 //===== Comments: ============================================
 //= Culvert Access:
-//= - [Aegis Conversion]
+//= - [Official Conversion]
 //= - Variable in use: MISC_QUEST (bit 8)
 //= Ph.D Hat Quest:
-//= - [Aegis Conversion]
+//= - [Official Conversion]
 //= - n/a
 //= Gaebolg Family Curse:
-//= - [Aegis Conversion]
+//= - [Official Conversion]
 //= - Variable in use: prt_curse (max 61)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fixed flower name Dreamy -> Illusion
 //= 1.2 Fixed exploit [Lupus]
 //= 1.3 Removed Duplicates [Silent]
@@ -47,11 +45,12 @@
 //= 2.5a Fixed requirements for PH D. Hat agian lol. [L0ne_W0lf]
 //= 2.6 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 2.7 Corrected 'IProntera' typo. (bugreport:4522) [L0ne_W0lf]
-//= 2.8 Added renewal checks for exp distribution [Streusel]
-//============================================================ 
+//= 2.8 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.9 Updated Nameless Island addition and added questlog support. [Euphy]
+//============================================================
 
-// Prontera Culvert
-//============================================================ 
+// Prontera Culvert :: prt_npc
+//============================================================
 prt_in,88,105,2	script	Recruiter	105,{
 	if (MISC_QUEST & 8) {
 		mes "[Recruiter]";
@@ -145,7 +144,7 @@ S_Volunteer:
 }
 
 prt_fild05,270,212,5	script	Culvert Guardian	105,{
-	if(MISC_QUEST & 8) {
+	if (MISC_QUEST & 8) {
 		mes "[Culvert Guardian]";
 		mes "Ah, you're one of our volunteers. This is the entrance of the Prontera Culvert.";
 		mes "Do you wish to";
@@ -165,8 +164,8 @@ prt_fild05,270,212,5	script	Culvert Guardian	105,{
 	close;
 }
 
-// Ph.D Hat Quest
-//============================================================ 
+// Ph.D Hat Quest :: npc_6cript
+//============================================================
 prt_in,38,108,4	script	Teacher	53,{
 	if ((countitem(710) > 0) && (countitem(703) > 0) && (countitem(704) > 0) && (countitem(708) > 0)) {
 		mes "[Teacher]";
@@ -249,8 +248,8 @@ prt_in,38,108,4	script	Teacher	53,{
 	}
 }
 
-// Gaebolg Family Curse
-//============================================================ 
+// Gaebolg Family Curse :: prt_curse
+//============================================================
 prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 	callsub S_CheckWeight; //Check Player's weight
 	if (BaseLevel > 59) {
@@ -280,7 +279,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 				mes ".........?";
 				next;
 				mes "[Busy-Looking Boy]";
-				if (sex) {
+				if (Sex) {
 					mes "Ack! You're that clumsy";
 					mes "dude who made me drop";
 				}
@@ -291,7 +290,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 				mes "all of those books earlier!";
 				mes "Wait, you ditched me before,";
 				mes "so why act all concerned now?";
-				Emotion e_gasp;
+				emotion e_gasp;
 			}
 			else {
 				mes "[Busy-Looking Boy]";
@@ -306,7 +305,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			next;
 			select("Well, I, um...");
 			mes "[Busy-Looking Boy]";
-			if (sex) {
+			if (Sex) {
 				mes "Yeah... A real";
 				mes "man wouldn't have";
 				mes "ditched back then";
@@ -329,10 +328,10 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "it was a natural reflex!^000000";
 			next;
 			Specialeffect EF_HITDARK;
-			Emotion e_omg;
+			emotion e_omg;
 			mes "^3355FF*BAM!*^000000";
 			next;
-			Emotion e_omg;
+			emotion e_omg;
 			mes "[Busy-Looking Boy]";
 			mes "Ack! Those books...!";
 			mes "It took me so long to";
@@ -344,13 +343,13 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "arrange these nicely";
 			mes "out of the bottom of";
 			mes "my freakin' heart.";
-			Emotion e_lv,1;
+			emotion e_lv,1;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "...";
 			mes "......";
 			mes ".........";
-			Emotion e_dots;
+			emotion e_dots;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "Huh...?";
@@ -372,7 +371,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "easily, so it scares me to";
 			mes "death to ride the Airship";
 			mes "all the way to Juno.";
-			Emotion e_dots;
+			emotion e_dots;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "Now I'm in trouble!";
@@ -380,7 +379,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "time I just can't help it.";
 			mes "There's nothing I can do!";
 			mes "Oh, I'm gonna lose this job!";
-			Emotion e_sob;
+			emotion e_sob;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "Wait... You adventurers";
@@ -396,7 +395,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "It's none of your ";
 			mes "business, I know, but";
 			mes "I'm just so desperate...";
-			Emotion e_sob;
+			emotion e_sob;
 			set prt_curse,2;
 			close;
 		}
@@ -408,7 +407,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "Summon all my courage...";
 			mes "and b-board that Airship!";
 			mes "Argh! No, I can't do it!";
-			Emotion e_dots;
+			emotion e_dots;
 			next;
 			callsub S_GetBooks;
 			mes "[Busy-Looking Boy]";
@@ -417,7 +416,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "That guy's been waiting";
 			mes "for me to deliver his books";
 			mes "for quite a while now...";
-			Emotion e_sob;
+			emotion e_sob;
 			close;
 		}
 		else if (prt_curse == 3) {
@@ -457,7 +456,7 @@ OnTouch:
 			mes "Hey, look out!";
 			mes "Can't you be more";
 			mes "careful?! Geeeeez!";
-			Emotion e_ag;
+			emotion e_ag;
 			next;
 			mes "["+strcharinfo(0)+"]";
 			mes "Oops, I'm so sorry.";
@@ -506,7 +505,7 @@ OnTouch:
 			mes "easily, so it scares me to";
 			mes "death to ride the Airship";
 			mes "all the way to Juno.";
-			Emotion e_dots;
+			emotion e_dots;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "Now I'm in trouble!";
@@ -514,7 +513,7 @@ OnTouch:
 			mes "time I just can't help it.";
 			mes "There's nothing I can do!";
 			mes "Oh, I'm gonna lose this job!";
-			Emotion e_sob;
+			emotion e_sob;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "Wait... You adventurers";
@@ -530,7 +529,7 @@ OnTouch:
 			mes "It's none of your ";
 			mes "business, I know, but";
 			mes "I'm just so desperate...";
-			Emotion e_sob;
+			emotion e_sob;
 			set prt_curse,2;
 			close;
 		}
@@ -624,7 +623,7 @@ yuno,311,195,3	script	Historian#prt01	754,{
 		mes "[Historian]";
 		mes "GRRRRRRRRR!";
 		mes "Where are my books?!";
-		Emotion e_ag;
+		emotion e_ag;
 		next;
 		select("Are you alright?");
 		mes "[Historian]";
@@ -655,7 +654,7 @@ yuno,311,195,3	script	Historian#prt01	754,{
 		}
 		else {
 			select("Oh, I'm delivering the books for him.");
-			Emotion e_what;
+			emotion e_what;
 			mes "[Historian]";
 			mes "Ah, really?";
 			mes "Great, you're here!";
@@ -812,7 +811,7 @@ yuno,311,195,3	script	Historian#prt01	754,{
 		mes "ruling the kingdom, the 7 warriors agreed to hold a contest amongst";
 		mes "their families each generation to prevent royal corruption.";
 		next;
-		Emotion e_swt2;
+		emotion e_swt2;
 		mes "[Historian]";
 		mes "Oh... Not too excited";
 		mes "about history, huh? Well,";
@@ -957,7 +956,7 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 		mes "can't be good for my skin...";
 		mes "Ooh, I wish I were back home";
 		mes "in the Schwaltzvalt Republic~";
-		Emotion e_sob;
+		emotion e_sob;
 		next;
 		mes "[Historian Rodafrian]";
 		mes "Hello there.";
@@ -1208,11 +1207,11 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 			mes "that you have learned to";
 			mes "Rodafrian, choosing not";
 			mes "to withhold any secrets.^000000";
-			Emotion e_ic;
+			emotion e_ic;
 			next;
 			mes "[Historian Rodafrian]";
 			mes ".....................!";
-			Emotion e_gasp;
+			emotion e_gasp;
 			next;
 			mes "[Historian Rodafrian]";
 			mes "Thank you for sharing that";
@@ -1251,10 +1250,13 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 			mes "that she might spread around!";
 			mes "Oh well, I guess I better head";
 			mes "back to the priests...)^000000";
-			if (prt_curse == 30) 
+			if (prt_curse == 30)  {
 				set prt_curse,31;
-			else 
+				changequest 18042,18044;
+			} else {
 				set prt_curse,60;
+				changequest 18051,18052;
+			}
 			close;
 		}
 
@@ -1279,10 +1281,13 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 		mes "through Karlomoff's report.";
 		mes "For now, it would be best";
 		mes "to return to Father Bamph.^000000";
-		if (prt_curse == 30)
+		if (prt_curse == 30) {
 			set prt_curse,40;
-		else
+			changequest 18042,18045;
+		} else {
 			set prt_curse,56;
+			completequest 18051;
+		}
 		close;
 	}
 	else if (prt_curse == 31 || prt_curse == 40) {
@@ -1294,7 +1299,7 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 		close;
 	}
 	else if (prt_curse == 56) {
-		Emotion e_an;
+		emotion e_an;
 		mes "[Historian Rodafrian]";
 		mes "I just paid a visit to";
 		mes "Karlomoff and gave him";
@@ -1305,7 +1310,7 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 		close;
 	}
 	else if (prt_curse == 60) {
-		Emotion e_an;
+		emotion e_an;
 		mes "[Historian Rodafrian]";
 		mes "I just aid a visit to";
 		mes "Karlomoff and gave him";
@@ -1357,6 +1362,7 @@ S_GiveName:
 	mes "for the sake of my research...";
 	if (getarg(0) == 1) delitem 7342,1; //File01
 	set prt_curse,8;
+	changequest 18031,18032;
 	close;
 }
 
@@ -1495,6 +1501,7 @@ mjolnir_01,135,168,3	script	Historian#prt03	754,{
 		mes "for. Good luck in your";
 		mes "travels, adventurer.";
 		set prt_curse,11;
+		changequest 18032,18033;
 		close;
 	}
 	else {
@@ -1935,8 +1942,9 @@ mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 		mes "I should deliver these";
 		mes "herbs to Prontera Church";
 		mes "before I talk to Rodafrian.)^000000";
-		getitem 7432,1;
+		getitem 7432,1; //Leather_Pouch
 		set prt_curse,13;
+		changequest 18033,18034;
 		close;
 	}
 	else if (prt_curse > 12 && prt_curse < 16) {
@@ -1988,7 +1996,7 @@ mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 		mes "with death. But the royal family and the Prontera Church took";
 		mes "mercy on me, and allowed";
 		mes "me to live here in exile.";
-		Emotion e_dots;
+		emotion e_dots;
 		next;
 		mes "[Bonnie Imbullea]";
 		mes "I began to sing this song";
@@ -2003,7 +2011,7 @@ mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 		mes "a maid found a fragment of a";
 		mes "Red Gemstone while cleaning";
 		mes "the secret ceremonial grounds.";
-		Emotion e_gasp,1;
+		emotion e_gasp,1;
 		next;
 		mes "[Bonnie Imbullea]";
 		mes "I always thought it";
@@ -2035,6 +2043,7 @@ mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 		mes "and let Father Bamph";
 		mes "know about this information.)^000000";
 		set prt_curse,17;
+		changequest 18035,18036;
 		close;
 	}
 	else if (prt_curse == 17) {
@@ -2109,14 +2118,19 @@ mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 		mes "I can finally free myself from";
 		mes "this burdensome guilt...";
 		mes "Thank you, kind adventurer~";
-		if (prt_curse == 35) set prt_curse,36;
-		else if (prt_curse == 44) set prt_curse,45;
-		else {
+		if (prt_curse == 35) {
+			set prt_curse,36;
+			completequest 18050;
+		} else if (prt_curse == 44) {
+			set prt_curse,45;
+			completequest 18049;
+		} else {
 			next;
 			mes "^3355FFNow, you can return to";
 			mes "Rodafrian, the historian";
 			mes "stationed in Morroc.^000000";
 			set prt_curse,55;
+			changequest 18049,18051;
 		}
 
 		close;
@@ -2246,7 +2260,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "sent this adventurer here";
 		mes "for a favor, it probably means";
 		mes "she trusts this person. Besides, we need somebody to carry out";
-		if (sex)
+		if (Sex)
 			mes "this task for us. Why not him?";
 		else
 			mes "this task for us. Why not her?";
@@ -2299,7 +2313,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "at a young age^000000. That is";
 		mes "Jormungand's curse and";
 		mes "the royal family's secret.";
-		Emotion e_omg,1;
+		emotion e_omg,1;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "What...?!";
@@ -2362,7 +2376,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "complicated. Please";
 		mes "listen to what we have";
 		mes "to ask from here on...";
-		Emotion e_dots;
+		emotion e_dots;
 		set prt_curse,15;
 		close;
 	}
@@ -2374,7 +2388,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "looking marks on their bodies.";
 		mes "It almost looked as if they";
 		mes "were growing snake scales.";
-		Emotion e_gasp,1;
+		emotion e_gasp,1;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Wait, they grew snake";
@@ -2443,6 +2457,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "remember anything that happened";
 		mes "after the exorcism failed...";
 		set prt_curse,16;
+		changequest 18034,18035;
 		close;
 	}
 	else if (prt_curse == 16) {
@@ -2483,6 +2498,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "within the bookshelf and";
 		mes "I will meet you there.";
 		set prt_curse,18;
+		changequest 18036,18037;
 		close;
 	}
 	else if (prt_curse > 17 && prt_curse < 22) {
@@ -2519,6 +2535,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "we can verify whether poison";
 		mes "was used to kill the princes?";
 		set prt_curse,23;
+		changequest 18039,18040;
 		close;
 	}
 	else if (prt_curse == 23) {
@@ -2552,6 +2569,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "to the secret ceremonial grounds as soon as you can? I will wait";
 		mes "over there for you once again.";
 		set prt_curse,32;
+		changequest 18044,18046;
 		close;
 	}
 	else if (prt_curse == 32 || prt_curse == 33 || prt_curse == 41 || prt_curse == 42 || prt_curse == 51 || prt_curse == 52) {
@@ -2592,6 +2610,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "you for all of your help. I'm very grateful for what you have done,";
 		mes "adventurer. May safety accompany you on all of your journeys.";
 		set prt_curse,35;
+		changequest 18047,18050;
 		close;
 	}
 	else if (prt_curse > 34 && prt_curse < 40 && !aru_monas) {
@@ -2624,6 +2643,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "to the secret ceremonial grounds as soon as you can? I will wait";
 		mes "over there for you once again.";
 		set prt_curse,41;
+		changequest 18045,18046;
 		close;
 	}
 	else if (prt_curse == 43 || prt_curse == 53) {
@@ -2661,12 +2681,12 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "that I cannot personally thank";
 		mes "you for all of your help. I'm very grateful for what you have done,";
 		mes "adventurer. May safety accompany you on all of your journeys.";
-		if (prt_curse == 43) set prt_curse,44;
-		else set prt_curse,54;
-		if(checkre(0))
-			getexp 160000,0;
+		if (prt_curse == 43)
+			set prt_curse,44;
 		else
-			getexp 1600000,0;
+			set prt_curse,54;
+		changequest 18047,18049;
+		getexp (checkre(3))?90000:1600000,0;
 		close;
 	}
 	else if (prt_curse > 43 && prt_curse < 50 && !aru_monas) {
@@ -2701,6 +2721,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "to the secret ceremonial grounds as soon as you can? I will wait";
 		mes "over there for you once again.";
 		set prt_curse,51;
+		changequest 18043,18046;
 		close;
 	}
 	else if (prt_curse == 60) {
@@ -2755,12 +2776,20 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "secret ceremonial grounds";
 		mes "from now on. Thanks again for your help, "+strcharinfo(0)+".";
 		set prt_curse,61;
+		completequest 18052;
 		close;
 	}
 	else {
 		if (prt_curse == 36 || prt_curse == 45 || prt_curse == 56 || prt_curse == 61) {
 // Begin Nameless Island Access Quest Addition
-			if (aru_monas == 1) {
+			if (aru_monas == 0) {
+				mes "[Father Bamph]";
+				mes "I'm sorry, but would it";
+				mes "be alright if we talked";
+				mes "later? I have to handle";
+				mes "a very important task now...";
+				close;
+			} else if (aru_monas == 1) {
 				mes "[Father Bamph]";
 				mes "Oh, I've been waiting for";
 				mes "you, adventurer. I'm sorry";
@@ -2791,6 +2820,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 				mes "and he will assist you in your";
 				mes "search for the lost official.";
 				set aru_monas,2;
+				changequest 17000,17001;
 				close;
 			}
 			else if (aru_monas == 2 || aru_monas == 3) {
@@ -2823,7 +2853,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 				close;
 			}
 			else if (aru_monas == 5) {
-				if (rand(1,10) == 10) {
+				if (rand(1,5) == 4) {
 					mes "[Father Bamph]";
 					mes "Well, I've considered all";
 					mes "possible scenarios. I think";
@@ -2863,8 +2893,9 @@ prt_church,185,106,3	script	Father Bamph	60,{
 					mes "Please accept this money";
 					mes "to cover your Airship fee.";
 					mes "Thank you, and good luck.";
-					set zeny,zeny+1500;
 					set aru_monas,6;
+					set Zeny, Zeny + (checkre(0)?5000:1500);
+					changequest 17002,17003;
 					close;
 				}
 				else {
@@ -2888,7 +2919,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 				mes "Everything is tied to religion.";
 				close;
 			}
-			else if (aru_monas > 6 && aru_monas < 24) {
+			else if (aru_monas > 6 && aru_monas < 25) {
 				mes "[Father Bamph]";
 				mes "Thank you so much for all";
 				mes "of your hard work. Our agents";
@@ -2898,25 +2929,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 				mes "know what we've been doing.";
 				close;
 			}
-			else if (aru_monas == 24) {
-				mes "[Father Bamph]";
-				mes "Thank you for bring us such";
-				mes "important information. With";
-				mes "your help, we were able to";
-				mes "clear a few unsolved cases.";
-				mes "We expected something like";
-				mes "this, but not this soon.";
-				next;
-				mes "[Father Bamph]";
-				mes "I fear that the Royal Court";
-				mes "has been bickering over their";
-				mes "own selfish needs. I pray that";
-				mes "it does not grow worse, devolve";
-				mes "into chaos. ^666666*Sigh*^000000 We'll see...";
-				set aru_monas,25;
-				close;
-			}
-			else if (aru_monas >= 25) {
+			else if (aru_monas == 25 || aru_monas == 26) {
 				mes "[Father Bamph]";
 				mes "Thank you for bring us such";
 				mes "important information. With";
@@ -2933,15 +2946,16 @@ prt_church,185,106,3	script	Father Bamph	60,{
 				mes "into chaos. ^666666*Sigh*^000000 We'll see...";
 				close;
 			}
-// End Nameless Island Access Quest Addition
 			else {
 				mes "[Father Bamph]";
-				mes "I'm sorry, but would it";
-				mes "be alright if we talked";
-				mes "later? I have to handle";
-				mes "a very important task now...";
+				mes "It's upsetting to me that";
+				mes "Arunafeltz has been so quiet";
+				mes "lately. You know the expression";
+				mes "about there being a quiet lull";
+				mes "before a raging storm, right?";
 				close;
 			}
+// End Nameless Island Access Quest Addition
 		}
 	}
 }
@@ -2997,10 +3011,8 @@ prt_church,184,110,3	script	Father Biscuss	60,{
 		mes "Church, I want to thank";
 		mes "you for all of your help.";
 		set prt_curse,36;
-		if(checkre(0))
-			getexp 160000,0;
-		else
-			getexp 1600000,0;
+		completequest 18048;
+		getexp (checkre(3))?90000:1600000,0;
 		close;
 	}
 	else if (prt_curse == 36) {
@@ -3158,6 +3170,7 @@ prt_church,19,111,5	script	#prince1	887,{
 		mes "note that the mark resembles";
 		mes "the scales of a serpent.^000000";
 		set prt_curse,20;
+		changequest 18037,18038;
 		close;
 	}
 	else if (prt_curse == 33 || prt_curse > 41 && prt_curse < 51 || prt_curse == 52) {
@@ -3193,7 +3206,7 @@ prt_church,21,111,5	script	#prince2	887,{
 		mes "curse, we all failed. Those";
 		mes "involved have begun to believe";
 		mes "that Odin may have abandoned us... ";
-		Emotion e_omg,1;
+		emotion e_omg,1;
 		next;
 		mes "^3355FFYou examine the body of";
 		mes "the second prince and notice";
@@ -3218,6 +3231,7 @@ prt_church,21,111,5	script	#prince2	887,{
 		mes "involved. Let's go check";
 		mes "the body of the third prince.";
 		set prt_curse,21;
+		changequest 18038,18039;
 		close;
 	}
 	else if (prt_curse == 33 || prt_curse > 41 && prt_curse < 51 || prt_curse == 52) {
@@ -3328,6 +3342,7 @@ prt_church,24,111,5	script	#prince3	887,{
 			if (prt_curse == 32) set prt_curse,33;
 			else if (prt_curse == 41) set prt_curse,42;
 			else set prt_curse,52;
+			changequest 18046,18047;
 			close;
 		}
 		mes "^3355FFYou'll need to have";
@@ -3387,6 +3402,7 @@ moc_fild16,201,295,5	script	Assassin Guildsman#poiso	884,{
 			mes "in Morroc. Go find someone";
 			mes "named ^3131FFMarjana^000000 inside.";
 			set prt_curse,24;
+			changequest 18040,18041;
 			close;
 		}
 		mes "[Assassin Guildsman]";
@@ -3573,6 +3589,7 @@ OnTouch:
 			mes "Father Bamph, so I guess";
 			mes "that I'll go talk to her first.";
 			set prt_curse,30;
+			changequest 18041,18042;
 			close;
 		}
 		mes "["+strcharinfo(0)+"]";
@@ -3582,6 +3599,7 @@ OnTouch:
 		mes "bodies. I better head over";
 		mes "to Prontera right away.";
 		set prt_curse,50;
+		changequest 18041,18043;
 		close;
 	}
 }
@@ -3614,14 +3632,14 @@ prt_in,162,99,4	script	Librarian#curse	67,{
 				mes "we will provide you with";
 				mes "replacement copies.";
 				next;
-				if (zeny > 699) {
+				if (Zeny > 699) {
 					mes "[Librarian]";
 					mes "Ah, here you are.";
 					mes "Please take these";
 					mes "replacement copies,";
 					mes "and try not to lose";
 					mes "them again. Thank you.";
-					set zeny,zeny-700;
+					set Zeny, Zeny-700;
 					getitem 7431,1; //Books
 					close;
 				}
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index ed77ef22d..a7615a9e2 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -1,18 +1,16 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Rachel Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 3.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 3.6
+//===== Description: =========================================
 //= Collection of Rachel Quests 
 //= Lost Child Quest:
 //= - End of quest coincides with opening the Sanctuary.
 //= - Variable in use: lost_boy (max 13)
 //= Bruspetti Quest:
-//= - [Aegis conversion]
+//= - [Official Conversion]
 //= - Requires friendship quest as a prerequisite.
 //= - Variable in use: rach_vice (max 24)
 //= Ice Necklace Quest:
@@ -25,34 +23,7 @@
 //= - Variable in use: Once completed MISC_QUEST bit 8192 is set
 //= - Variable in use: ra_have_donated (0 no/1 yes)
 //= - Variable in use: $rachel_donate (max 10000)
-//===== Additional Comments: ================================= 
-//= 1.0 First version, needs testing. [L0ne_W0lf]
-//= 1.1 Some slight optimization. [L0ne_W0lf]
-//= 1.2 Fixed Man Stuck in Ice only giving 1 Freezing Snow Powder. [L0ne_W0lf]
-//= 1.3 Added the ability to redeem lottery tickets before donation max is met. [L0ne_W0lf]
-//= 1.4 Removed an erroneous "case". Thanks, Jet. [L0ne_W0lf]
-//= 1.5 Fixed a bug in Bruspetti quest. [SinSloth]
-//= 1.5b Fixed some typos in various quests. [SinSloth]
-//= 1.6 Fixed a couple bugs with the Pope's Office Guards... [L0ne_W0lf]
-//= 1.7 Fixed Maheo, he will revert to his frozen state when clicked. [L0ne_W0lf]
-//=	Replaced  instances of "+name+", with "+strcharinfo(0)".
-//= 1.8 Various fixes: Hamion will now delete items used for Wind Hammer. [L0ne_W0lf]
-//=	Fixed EXP reward in Ice Necklace quest, fixed a typo in an NPC header.
-//=	Another minor fix to Hamion. "< 1" -> "< 2". Added a missing close to
-//=	the ontouch "key". Thanks to Gepard for pointing them out.
-//= 1.9 Fixed a misorder with variable checkings. [SinSloth]
-//= 2.0 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
-//= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 2.2 Maheo NPC now uses "setnpcdisplay" instead of two NPCs. [L0ne_W0lf]
-//= 2.2a Corrected a Typo error ";;". [Samuray22]
-//= 2.3 Added Zhed's portion of Thor Volcano Base Quest. (euRO) [L0ne_W0lf]
-//= 2.4 Updated Zhed's Thor Vol. Base addition dialog to iRO's. [L0ne_W0lf]
-//= 2.4a Further updates to Zhed's Veins addition. [L0ne_W0lf]
-//= 2.5 Added Nameless Island quest addition. [L0ne_W0lf]
-//= 2.6 Uncommented ontouchNPC label for Man Stuck in Ice. [L0ne_W0lf]
-//= 2.7 Corrected overlaping warp coordinates. [L0ne_W0lf]
-//= 2.8 Replaced effect numerics with constants. [L0ne_W0lf]
-//= 2.9 Replaced effect numerics with constants. [Samuray22]
+//===== Additional Comments: =================================
 //= 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]
@@ -63,11 +34,12 @@
 //= 3.4 Added quest log entries for:
 //=     - Ice Necklace Quest
 //=     - Thor Volcano Base Quest addition.
-//= 3.5 Added renewal checks for exp distribution [Streusel]
-//============================================================ 
+//= 3.5 Updated RE/Pre-RE EXP. [Euphy]
+//= 3.6 Added questlog support. [Euphy]
+//============================================================
 
-// Lost Child Quest (Prerequisite to High Priest quest)
-//============================================================ 
+// Lost Child Quest (Prerequisite to High Priest quest) :: rachel_wonjumin
+//============================================================
 ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 	if (BaseLevel < 60) {
 		mes "[Vincent]";
@@ -78,7 +50,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "work, brave adventurer.";
 		close;
 	}
-
 	if (lost_boy < 1) {
 		mes "[Vincent]";
 		mes "I am Vincert, steward of";
@@ -95,9 +66,7 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "ask you for your help with";
 		mes "a problem on his behalf.";
 		next;
-
 		switch(select("I'm too busy.:Sure, why not?")) {
-
 		case 1:
 			mes "[Vincent]";
 			mes "I understand.";
@@ -107,7 +76,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 			mes "later, then I'd like to ask for";
 			mes "your assistance once again.";
 			close;
-
 		case 2:
 			mes "[Vincent]";
 			mes "Thank you. You see,";
@@ -139,12 +107,10 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 			mes "You might want to question the";
 			mes "other servants of his whereabouts. Thanks again for your help.";
 			set lost_boy,1;
+			setquest 8089;
 			close;
-
 		}
-
 	}
-
 	else if ((lost_boy >= 1) && (lost_boy < 4)) {
 		mes "[Vincent]";
 		mes "I suggest looking around";
@@ -153,7 +119,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "Phobe's current location.";
 		close;
 	}
-
 	else if ((lost_boy >= 4) && (lost_boy < 7)) {
 		mes "[Vincent]";
 		mes "We're running out";
@@ -162,7 +127,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "as soon as you can.";
 		close;
 	}
-
 	else if (lost_boy == 7) {
 		mes "[Vincent]";
 		mes "Ah...!";
@@ -298,9 +262,9 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "just a kid, so he's probably";
 		mes "hiding somewhere in town.";
 		set lost_boy,8;
+		changequest 8094,8095;
 		close;
 	}
-
 	else if (lost_boy == 8) {
 		mes "[Vincent]";
 		mes "The gem is very special...";
@@ -339,7 +303,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "hiding somewhere in town...";
 		close;
 	}
-
 	else if (lost_boy == 9) {
 		mes "[Vincent]";
 		mes "You came back!";
@@ -385,9 +348,9 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "Jenny about Phobe?";
 		mes "Sure, sure, I'll do that.";
 		set lost_boy,10;
+		changequest 8097,8097;
 		close;
 	}
-
 	else if (lost_boy == 10) {
 		mes "[Vincent]";
 		mes "Oh! While I return this";
@@ -402,7 +365,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "Sure, sure, I'll do that.";
 		close;
 	}
-
 	else if (lost_boy == 11) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I told Jenny that";
@@ -446,8 +408,9 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "I don't know what's inside,";
 		mes "but I know these items are";
 		mes "quite valuable nowadays...";
-		getitem 617,1; //Old_Violet_Box
 		set lost_boy,12;
+		changequest 8098,8099;
+		getitem 617,1; //Old_Violet_Box
 		next;
 		mes "[Vincent]";
 		mes "Ah, and this note is a";
@@ -462,7 +425,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "from Vincent.^000000";
 		close;
 	}
-
 	else {
 		mes "[Vincent]";
 		mes "Thank you for everything";
@@ -472,7 +434,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "hesitate to ask me, alright?";
 		close;
 	}
-
 }
 
 rachel,114,232,3	script	Logan#ra_in01	869,{
@@ -486,7 +447,6 @@ rachel,114,232,3	script	Logan#ra_in01	869,{
 		mes "don't distract me, please.";
 		close;
 	}
-
 	else if (lost_boy == 1) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but do";
@@ -532,9 +492,9 @@ rachel,114,232,3	script	Logan#ra_in01	869,{
 		mes "inside the mansion. He's";
 		mes "been working here for a while.";
 		set lost_boy,2;
+		changequest 8089,8090;
 		close;
 	}
-
 	else if (lost_boy == 2) {
 		mes "[Logan]";
 		mes "If you want to learn";
@@ -545,7 +505,6 @@ rachel,114,232,3	script	Logan#ra_in01	869,{
 		mes "the mansion is a good bet.";
 		close;
 	}
-
 }
 
 ra_in01,372,200,3	script	Manson#ra_in01	929,{
@@ -559,7 +518,6 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "cleaning up after visitors.";
 		close;
 	}
-
 	else if (lost_boy == 1) {
 		mes "[Manson]";
 		mes "You know, considering";
@@ -570,7 +528,6 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "Sir Zhed here in the mansion.";
 		close;
 	}
-
 	else if (lost_boy == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but do you";
@@ -633,9 +590,9 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "now, and she'd appreciate";
 		mes "your help in finding Phobe.";
 		set lost_boy,3;
+		changequest 8090,8091;
 		close;
 	}
-
 	else if (lost_boy == 3) {
 		mes "[Manson]";
 		mes "You know, if you want to";
@@ -646,7 +603,6 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "your help in finding Phobe.";
 		close;
 	}
-
 	else {
 		mes "[Manson]";
 		mes "Nuts, there's so much";
@@ -656,7 +612,6 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "Ah well, it's a living.";
 		close;
 	}
-
 }
 
 rachel,48,237,3	script	Jenny#ra_in01	894,{
@@ -669,7 +624,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "haven't been invited!";
 		close;
 	}
-
 	else if (lost_boy == 3) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but are";
@@ -719,9 +673,9 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "Alright, I guess I can go";
 		mes "to the market and ask around.";
 		set lost_boy,4;
+		changequest 8091,8092;
 		close;
 	}
-
 	else if ((lost_boy >= 3) && (lost_boy < 6)) {
 		mes "[Jenny]";
 		mes "Please find Phobe,";
@@ -737,7 +691,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "Phobe was last seen.";
 		close;
 	}
-
 	else if (lost_boy == 6) {
 		mes "[Jenny]";
 		mes "Please find Phobe,";
@@ -747,7 +700,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "about that boy, you know?";
 		close;
 	}
-
 	else if ((lost_boy > 6) && (lost_boy < 11)) {
 		mes "[Jenny]";
 		mes "Oh! You're back!";
@@ -760,7 +712,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "important to discuss";
 			mes "with Vincent first.";
 		}
-
 		else if (lost_boy == 8) {
 			mes "["+strcharinfo(0)+"]";
 			mes "Actually... Uh...";
@@ -769,7 +720,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "lead! Don't worry, I'll";
 			mes "find him soon, I promise.";
 		}
-
 		else if (lost_boy == 9) {
 			mes "["+strcharinfo(0)+"]";
 			mes "Actually... Uh...";
@@ -779,7 +729,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "some good news soon,";
 			mes "I promise. Se eyou later~";
 		}
-
 		else if (lost_boy == 10) {
 			mes "["+strcharinfo(0)+"]";
 			mes "Yes, he's fine, just";
@@ -820,11 +769,10 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "happier. Thank you for";
 			mes "all of your help, adventurer~";
 			set lost_boy,11;
+			changequest 8097,8098;
 		}
-
 		close;
 	}
-
 	else if ((lost_boy > 10) && (lost_boy < 13)) {
 		mes "[Jenny]";
 		mes "Thank you so much for";
@@ -835,9 +783,7 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "I am to you as a mother...";
 		close;
 	}
-
 	end;
-	
 }
 
 rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
@@ -851,7 +797,6 @@ rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
 		mes "pack it up and go home.";
 		close;
 	}
-
 	else if (lost_boy == 4) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me?";
@@ -931,7 +876,6 @@ rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
 		set lost_boy,5;
 		close;
 	}
-
 	else if (lost_boy >= 5) {
 		mes "["+strcharinfo(0)+"]";
 		mes "(^333333I better ask the other";
@@ -942,7 +886,6 @@ rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
 		mes "ridiculous mock vegetables.^000000)";
 		close;
 	}
-
 }
 
 rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
@@ -955,7 +898,6 @@ rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
 		mes "make a living like this.";
 		close;
 	}
-
 	else if (lost_boy == 5) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me,";
@@ -1003,9 +945,9 @@ rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
 		mes "in that ice cave. That place";
 		mes "can be plenty dangerous.";
 		set lost_boy,6;
+		changequest 8092,8093;
 		close;
 	}
-
 	else if (lost_boy == 6) {
 		mes "[Idle Merchant]";
 		mes "So yeah, last night,";
@@ -1038,8 +980,6 @@ rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
 		mes "can be plenty dangerous.";
 		close;
 	}
-
-
 }
 
 ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
@@ -1052,7 +992,6 @@ ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
 		mes "precious oxygen!";
 		close;
 	}
-
 	if (lost_boy == 6) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but do you";
@@ -1133,9 +1072,9 @@ ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
 		mes "to Vincent and make";
 		mes "him explain everything.";
 		set lost_boy,7;
+		changequest 8093,8094;
 		close;
 	}
-
 	else if (lost_boy == 7) {
 		mes "[Mogan]";
 		mes "It looks like he set";
@@ -1152,7 +1091,6 @@ ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
 		mes "him explain everything.";
 		close;
 	}
-
 }
 
 rachel,263,32,3	script	Kid#ra_in01	931,{
@@ -1161,7 +1099,6 @@ rachel,263,32,3	script	Kid#ra_in01	931,{
 		mes "Leave me alone!";
 		close;
 	}
-
 	else if (lost_boy == 8) {
 		mes "^3355FFYou catch a shining";
 		mes "glint from this boy's";
@@ -1246,9 +1183,9 @@ rachel,263,32,3	script	Kid#ra_in01	931,{
 		mes "you should bring this red";
 		mes "jewel back to Vincent.^000000";
 		set lost_boy,9;
+		changequest 8095,8096;
 		close;
 	}
-
 	else if (lost_boy == 9) {
 		mes "[Phobe]";
 		mes "I... I'm not ready";
@@ -1264,7 +1201,6 @@ rachel,263,32,3	script	Kid#ra_in01	931,{
 		mes "jewel back to Vincent.^000000";
 		close;
 	}
-
 	else {
 		mes "["+strcharinfo(0)+"]";
 		mes "You know, you should";
@@ -1288,14 +1224,10 @@ rachel,263,32,3	script	Kid#ra_in01	931,{
 		mes "Gosh... Fine.";
 		close;
 	}
-
 }
 
-//End of Lost Child quest
-//============================================================ 
-
-//Bruspetti Quest (Perequisite: Lighthalzen "Friendship" quest)
-//============================================================ 
+// Bruspetti Quest (Perequisite: Lighthalzen "Friendship" quest) :: rachel_ryu
+//============================================================
 ra_in01,235,194,5	script	Katinshuell	931,{
 	if (rach_vice > 21) {
 		mes "[Katinshuell]";
@@ -1306,7 +1238,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "could have had a chance...";
 		close;
 	}
-
 	else if ((rach_vice == 21) && (countitem(1201) > 0)) {
 		mes "[Katinshuell]";
 		mes "Please... Please just";
@@ -1317,9 +1248,9 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "turn me in, go ahead...";
 		delitem 1201,1; //Knife
 		set rach_vice,22;
+		changequest 8121,8122;
 		close;
 	}
-
 	else if (rach_vice == 21) {
 		mes "[Katinshuell]";
 		mes "I suppose it's my";
@@ -1329,7 +1260,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "truly happy. Bruspetti...";
 		close;
 	}
-
 	else if ((rach_vice == 20) && (countitem(1201) > 0)) {
 		mes "[Katinshuell]";
 		mes "I suppose there's";
@@ -1434,7 +1364,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "God! My life sucks!";
 		close;
 	}
-
 	else if (rach_vice == 21) {
 		mes "[Katinshuell]";
 		mes "^333333*Pant pant*^000000";
@@ -1445,7 +1374,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "h-haunt me... Ha ha ha...";
 		close;
 	}
-
 	else if ((rach_vice == 20) && (countitem(1201) > 0)) {
 		mes "[Katinshuell]";
 		mes "I...";
@@ -1487,7 +1415,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "Mr. Katinshuell?";
 		close;
 	}
-
 	else if ((rach_vice == 19) || (rach_vice == 20)) {
 		mes "[Katinshuell]";
 		mes "I...";
@@ -1507,6 +1434,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "I... I don't have";
 		mes "to tell you anything!";
 		set rach_vice,20;
+		changequest 8120,8121;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "(^333333He's still resisting";
@@ -1514,7 +1442,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "him to reveal the truth?^000000)";
 		close;
 	}
-
 	else if (rach_vice == 18) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Let's see...";
@@ -1581,7 +1508,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes ".........";
 		close;
 	}
-
 	else if (rach_vice == 17) {
 		mes "[Katinshuell]";
 		mes "Damn it! I don't want to";
@@ -1599,7 +1525,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		set rach_vice,18;
 		close;
 	}
-
 	else if (rach_vice == 16) {
 		mes "[Katinshuell]";
 		mes "Ha ha ha...";
@@ -1635,7 +1560,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 			mes "I don't know what";
 			mes "you're talking about!";
 			close;
-
 		case 2:
 			mes "[" + strcharinfo(0) + "]";
 			mes "You know, I found out";
@@ -1684,7 +1608,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 				mes "backfired, so I'm going";
 				mes "to have to try this again.)^000000";
 				close;
-
 			case 2:
 				mes "[" + strcharinfo(0) + "]";
 				mes "So while she was away";
@@ -1703,7 +1626,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 				mes "backfired, so I'm going";
 				mes "to have to try this again.)^000000";
 				close;
-
 			case 3:
 				mes "[" + strcharinfo(0) + "]";
 				mes "Wait a second! Your break-up";
@@ -1739,7 +1661,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 					mes "backfired, so I'm going";
 					mes "to have to try this again.)^000000";
 					close;
-
 				case 2:
 					mes "[" + strcharinfo(0) + "]";
 					mes "Hmm... Why are you";
@@ -1767,9 +1688,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 					mes "before I get really angry!";
 					close;
 				}
-
 			}
-
 		case 3:
 			mes "[" + strcharinfo(0) + "]";
 			mes "Freya's Spring.";
@@ -1787,7 +1706,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 			mes "That's a pretty";
 			mes "good reason.";
 			close;
-
 		case 4:
 			mes "[" + strcharinfo(0) + "]";
 			mes "If Bruspetti is not";
@@ -1808,11 +1726,8 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 			mes "to question him again until";
 			mes "my gut feeling is satisfied!^000000)";
 			close;
-
 		}
-
 	}
-
 	else if ((rach_vice == 15) && (countitem(7571))) {
 		mes "[Katinshuell]";
 		mes "Oh, it's you again.";
@@ -1865,11 +1780,11 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		next;
 		mes "[Katinshuell]";
 		mes "......!";
+		delitem 7571,1; //Diary_Of_Blue
 		set rach_vice,16;
-		delitem 7571,1; //Blue_Diary
+		changequest 8119,8120;
 		close;
 	}
-
 	else if ((rach_vice == 10) || (rach_vice == 11)) {
 		mes "[Katinshuell]";
 		mes "Argh! I'm so depressed.";
@@ -1915,6 +1830,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 			close;
 		}
 		set rach_vice,11;
+		changequest 8114,8115;
 		mes "[Katinshuell]";
 		mes "You happy, now?";
 		mes "Quit trying to pry into";
@@ -1924,7 +1840,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "you came to do, right?";
 		close;
 	}
-
 	else if (rach_vice == 4) {
 		mes "[Katinshuell]";
 		mes "Uh... ";
@@ -1934,9 +1849,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "be left alone. Go away...";
 		close;
 	}
-
 	else if (rach_vice == 3) {
-		set rach_vice,4;
 		mes "[Katinshuell]";
 		mes "Eh? Oh, it's one of you";
 		mes "guys, those do-gooder";
@@ -1951,9 +1864,10 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "can't handle. Me and my";
 		mes "girlfriend are history now.";
 		mes "It's over between us.";
+		set rach_vice,4;
+		changequest 8107,8108;
 		close;
 	}
-
 	else if (rach_vice == 2) {
 		mes "[Katinshuell]";
 		mes "You're an adventurer,";
@@ -1970,7 +1884,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "of mine never cease to haunt me...";
 		close;
 	}
-
 	else if (rach_vice == 1) {
 		mes "[Katinshuell]";
 		mes "You're an adventurer,";
@@ -1986,7 +1899,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "left all alone, these thoughts of mine never cease to haunt me...";
 		close;
 	}
-
 	else if (rach_vice == 0) {
 		mes "[Katinshuell]";
 		mes "You're an adventurer,";
@@ -2042,7 +1954,6 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "Thanks, adventurer.";
 		close;
 	}
-
 	else if (rach_vice == 14) {
 		mes "[Mr. Shendar]";
 		mes "So you have a pretty";
@@ -2066,7 +1977,6 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "to hate and distrust him!";
 		close;
 	}
-
 	else if (rach_vice == 13) {
 		mes "[Mr. Shendar]";
 		mes "Hey! Hey! Are you";
@@ -2117,7 +2027,6 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "around here? I'd better go";
 		mes "and ask him about this...";
 		next;
-		set rach_vice,14;
 		mes "[Mr. Shendar]";
 		mes "Wait, where are";
 		mes "you going? I... I'm";
@@ -2146,9 +2055,10 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "father. Besides, adventurers";
 		mes "like you can offer her the";
 		mes "best protection...";
+		set rach_vice,14;
+		changequest 8117,8118;
 		close;
 	}
-
 	else if (rach_vice == 9) {
 		mes "[Mr. Shendar]";
 		mes "Curses! I should have never";
@@ -2158,9 +2068,7 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "is naturally too curious...!";
 		close;
 	}
-
 	else if (rach_vice == 8) {
-		set rach_vice,9;
 		mes "[Mr. Shendar]";
 		mes "What? My daughter went";
 		mes "to Lighthalzen? She doesn't";
@@ -2197,11 +2105,11 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "Oh, but how a father";
 		mes "worries. Will my sweet,";
 		mes "darling Bruspetti be alright?";
+		set rach_vice,9;
+		changequest 8112,8113;
 		close;
 	}
-
 	else if ((rach_vice == 4) || (rach_vice == 5)) {
-		set rach_vice,5;
 		mes "[Mr. Shendar]";
 		mes "I miss my daughter. Yes,";
 		mes "the house smells different";
@@ -2216,9 +2124,10 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "distinctively pleasant";
 		mes "scent about them. I guess";
 		mes "it must be pheremonal?";
+		set rach_vice,5;
+		changequest 8108,8109;
 		close;
 	}
-
 	else if (rach_vice == 2) {
 		mes "[Mr. Shendar]";
 		mes "Take my advice: never";
@@ -2237,9 +2146,7 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "little neck! At least, I should...";
 		close;
 	}
-
 	else if (rach_vice == 1) {
-		set rach_vice,2;
 		mes "[Mr. Shendar]";
 		mes "I just found out that";
 		mes "my precious daughter has";
@@ -2263,9 +2170,10 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "awful long time, but she's";
 		mes "also an adult now. I... I guess";
 		mes "she should be just fine.";
+		set rach_vice,2;
+		setquest 8106;
 		close;
 	}
-
 	mes "[Mr. Shendar]";
 	mes "I just found out that";
 	mes "my precious daughter has";
@@ -2295,7 +2203,6 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "I can't wait to see her~";
 		close;
 	}
-
 	else if ((rach_vice == 11) || (rach_vice == 12)) {
 		mes "[Lachellen]";
 		mes "Oh, hello again~";
@@ -2317,7 +2224,6 @@ rachel,73,244,3	script	Lachellen	919,{
 			next;
 		}
 		else if (.@input$ == "Freya's Spring") {
-			set rach_vice,12;
 			mes "[Lachellen]";
 			mes "Freya's Spring?";
 			mes "Oh, I like that place!";
@@ -2340,6 +2246,8 @@ rachel,73,244,3	script	Lachellen	919,{
 			mes "so you look like a real loser";
 			mes "if you go there alone. That's";
 			mes "why I want a boyfriend now...";
+			set rach_vice,12;
+			changequest 8115,8116;
 			next;
 		}
 		else {
@@ -2358,7 +2266,6 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "just a little bit.";
 		close;
 	}
-
 	else if (rach_vice == 7) {
 		mes "[Lachellen]";
 		mes "Let's see... Bruspetti";
@@ -2377,9 +2284,7 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "tell her I said ''hi,'' okay?";
 		close;
 	}
-
 	else if (rach_vice == 6) {
-		set rach_vice,7;
 		mes "[Lachellen]";
 		mes "Oh, Bruspetti's dad";
 		mes "was talking about how";
@@ -2411,11 +2316,11 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "and her boyfriend usually";
 		mes "went on dates, you might";
 		mes "be able to find something.";
+		set rach_vice,7;
+		changequest 8110,8111;
 		close;
 	}
-
 	else if ((rach_vice == 2) || (rach_vice == 3)) {
-		set rach_vice,3;
 		mes "[Lachellen]";
 		mes "Ooh, I'm so jealous";
 		mes "of Bruspetti! She's been";
@@ -2430,9 +2335,10 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "she's also admitted that";
 		mes "she doesn't know much about";
 		mes "him. Let's see... He grew up in Lighthalzen? That's all she knows.";
+		set rach_vice,3;
+		changequest 8106,8107;
 		close;
 	}
-
 	mes "[Lachellen]";
 	mes "My friend Bruspetti";
 	mes "is a really nice girl~";
@@ -2509,7 +2415,6 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 		mes "not particularly special.";
 		close;
 	}
-
 	else if (rach_vice == 13) {
 		mes "[Grandma]";
 		mes "When you get to be my";
@@ -2520,9 +2425,7 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 		mes "worry when I could've relaxed.";
 		close;
 	}
-
 	else if (rach_vice == 12) {
-		set rach_vice,13;
 		mes "[Grandma]";
 		mes "Oh, back again, eh?";
 		mes "I guess you must really";
@@ -2549,6 +2452,8 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 		mes "to let go of whatever's";
 		mes "bothering you, and just";
 		mes "enjoy life as it is now.";
+		set rach_vice,13;
+		changequest 8116,8117;
 		close;
 	}
 	mes "[Grandma]";
@@ -2568,7 +2473,6 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 lhz_in02,213,207,0	script	#ratrace1	111,4,4,{
 OnTouch:
 	if (rach_vice == 5) {
-		set rach_vice,6;
 		mes "[" + strcharinfo(0) + "]";
 		mes "This...";
 		mes "This smell...";
@@ -2580,6 +2484,8 @@ OnTouch:
 		mes "Wait, could this be";
 		mes "the scent that Bruspetti's";
 		mes "father mentioned earlier?";
+		set rach_vice,6;
+		changequest 8109,8110;
 		close;
 	}
 	end;
@@ -2621,14 +2527,15 @@ OnTouch:
 		mes "Who would be to blame?";
 		next;
 		set rach_vice,24;
-		if(checkre(0)) {
-		if (BaseLevel > 90) getexp 130000,0;
-		else if (BaseLevel > 75) getexp 85000,0;
-		else getexp 45000,0;
+		completequest 8122;
+		if (checkre(3)) {
+			if (BaseLevel > 90) getexp 130000,0;
+			else if (BaseLevel > 75) getexp 85000,0;
+			else getexp 45000,0;
 		} else {
-		if (BaseLevel > 90) getexp 1400000,0;
-		else if (BaseLevel > 75) getexp 800000,0;
-		else getexp 400000,0;
+			if (BaseLevel > 90) getexp 1300000,0;
+			else if (BaseLevel > 75) getexp 850000,0;
+			else getexp 450000,0;
 		}
 		mes "[" + strcharinfo(0) + "]";
 		mes "Somehow, I wish that";
@@ -2638,7 +2545,6 @@ OnTouch:
 		mes "forgive himself.";
 		close;
 	}
-
 	else if (rach_vice == 22) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "This must be where";
@@ -2670,7 +2576,6 @@ OnTouch:
 		mes "...What?";
 		close;
 	}
-
 	else if (rach_vice == 8) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "That old woman told";
@@ -2680,9 +2585,7 @@ OnTouch:
 		mes "make sure I tread carefully.";
 		close;
 	}
-
 	else if (rach_vice == 7) {
-		set rach_vice,8;
 		mes "[???]";
 		mes "Oh, be very careful!";
 		mes "You don't want to get";
@@ -2700,6 +2603,8 @@ OnTouch:
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Ah, I see.";
+		set rach_vice,8;
+		changequest 8111,8112;
 		close;
 	}
 	end;
@@ -2714,10 +2619,10 @@ ra_in01,255,25,0	script	Book#ra_in	111,{
 		mes "you talk to Katinshuell.^000000";
 		close;
 	}
-
 	else if (rach_vice == 14) {
 		set rach_vice,15;
-		getitem 7571,1; //Blue_Diary
+		changequest 8118,8119;
+		getitem 7571,1; //Diary_Of_Blue
 		mes "^3355FFThis must be";
 		mes "Bruspetti's diary!";
 		mes "You now have permission";
@@ -2726,25 +2631,22 @@ ra_in01,255,25,0	script	Book#ra_in	111,{
 		mes "Katinshuell are connected...^000000";
 		close;
 	}
-
 	else if ((rach_vice == 9) || (rach_vice == 10)) {
-		set rach_vice,10;
 		mes "^3355FFThis must be";
 		mes "Bruspetti's diary!";
 		mes "But... reading it";
 		mes "would make you feel";
 		mes "like a real creep.";
 		mes "So don't touch it.^000000";
+		set rach_vice,10;
+		changequest 8113,8114;
 		close;
 	}
 
 }
 
-//End of Bruspetti quest
-//============================================================ 
-
-// Ice Necklace/Summon Ktullanux Quest and Glacial Heart buyer
-//============================================================ 
+// Ice Necklace/Summon Ktullanux Quest and Glacial Heart buyer :: rachel_tre
+//============================================================
 //iRO Changed this NPC to avoid "offending" people.
 //To enable how it originally looked, uncomment the
 //line below (npc header), and comment the line
@@ -2931,12 +2833,9 @@ rachel,157,183,3	script	Sincere Follower Urstia	916,{
 			mes "token of my appreication for";
 			mes " what you have done for me.";
 			delitem 7573,1; //Magic_Necklace_
-			if(checkre(0))
-				getexp 70000,0;
-			else
-				getexp 700000,0;
-			completequest 2113;
+			getexp (checkre(3))?90000:700000,0;
 			set ice_necklace_q,6;
+			completequest 2113;
 			next;
 			mes "["+strcharinfo(0)+"]";
 			mes "Oh, let's just say it was";
@@ -2997,12 +2896,12 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "this ice off of me!.";
 		next;
 		if (getskilllv("MG_FIREBOLT") > 0) {
-			misceffect EF_FIREBALL;
+			specialeffect EF_FIREBALL;
 			mes "^3355FFYou cast Fire Bolt at";
 			mes "the ice..^000000";
 		}
 		else {
-			misceffect EF_HIT2;
+			specialeffect EF_HIT2;
 			mes "^3355FFYou hammer at the";
 			mes "ice with all your might.^000000";
 		}
@@ -3163,8 +3062,8 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "this prison of ice. He can";
 		mes "be found near Freya's Spring:";
 		mes "beseech him on my behalf!";
-		changequest 2109,2110;
 		set ice_necklace_q,2;
+		changequest 2109,2110;
 		close2;
 		cutin "",255;
 		end;
@@ -3226,9 +3125,9 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "swung it down at the ice";
 		mes "with all of your strength.^000000";
 		next;
-		misceffect EF_TEIHIT3;
-		misceffect EF_FREEZE;
-		misceffect EF_ICECRASH;
+		specialeffect EF_TEIHIT3;
+		specialeffect EF_FREEZE;
+		specialeffect EF_ICECRASH;
 		mes "^3355FF*Pzzzzz*";
 		mes "*CRASH!*^000000";
 		next;
@@ -3239,7 +3138,7 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "After all of this";
 		mes "time! I'm free!";
 		next;
-		misceffect EF_BEGINSPELL4;
+		specialeffect EF_BEGINSPELL4;
 		mes "[Maheo]";
 		mes "Now, all of the monsters";
 		mes "in this cave will taste the";
@@ -3252,7 +3151,7 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		monster "ice_dun02",114,112,"Snowier",1775,1,"Man Stuck in Ice#cave::OnMyMobDead";
 		monster "ice_dun02",126,105,"Snowier",1775,1,"Man Stuck in Ice#cave::OnMyMobDead";
 		monster "ice_dun02",121,99,"Snowier",1775,1,"Man Stuck in Ice#cave::OnMyMobDead";
-		misceffect EF_LORD;
+		specialeffect EF_LORD;
 		killmonster "ice_dun02","Man Stuck in Ice#cave::OnMyMobDead";
 		mes "[Maheo]";
 		mes "Muhahahahahahahaha!";
@@ -3276,7 +3175,7 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "[Maheo]";
 		mes "Let's see, now...";
 		next;
-		misceffect EF_FROSTWEAPON;
+		specialeffect EF_FROSTWEAPON;
 		mes "^3355FF*Ting*^000000";
 		next;
 		mes "[Maheo]";
@@ -3286,12 +3185,12 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "And please don't mention";
 		mes "the fact that I trapped myself";
 		mes "in ice to anyone else, okay?";
+		set ice_necklace_q,5;
+		changequest 2112,2113;
+		delitem 7569,1; //Hammer_Of_Wind
 		delitem 7572,1; //Magic_Necklace
-		delitem 7569,1; //Wind Of_Hammer
-		getitem 7574,4; //Freezing Snow Powder
 		getitem 7573,1; //Magic_Necklace_
-		changequest 2112,2113;
-		set ice_necklace_q,5;
+		getitem 7574,4; //Ice_Particle
 		close2;
 		cutin "",255;
 		setnpcdisplay "Man Stuck in Ice#cave",924;
@@ -3396,8 +3295,8 @@ rachel,265,98,3	script	Hamion#aru	930,{
 		mes "not one of those smithing tools.";
 		mes "I'd help you if I could, but...";
 		mes "I'm just smart, not strong.";
-		changequest 2110,2111;
 		set ice_necklace_q,3;
+		changequest 2110,2111;
 		close;
 	}
 	else if (ice_necklace_q == 3) {
@@ -3463,12 +3362,12 @@ rachel,265,98,3	script	Hamion#aru	930,{
 		mes "This hammer will only work";
 		mes "once, so make sure that you";
 		mes "smash that ice properly!";
+		delitem 1354,1; //Hammer
 		delitem 996,5; //Rough_Wind
-		delitem 1354,1; //Empty_Scroll
-		delitem 7433,1; //Hammer
-		getitem 7569,1; //Hammer_of_Wind
-		changequest 2111,2112;
+		delitem 7433,1; //Scroll
 		set ice_necklace_q,4;
+		changequest 2111,2112;
+		getitem 7569,1; //Hammer_of_Wind
 		close;
 	}
 	else if (ice_necklace_q >= 4) {
@@ -3579,7 +3478,7 @@ rachel,113,96,5	script	Mohadian	929,10,10,{
 		mes "It's always a pleasure";
 		mes "doing business with you~";
 		delitem 7561,.@hearts; //Glacial Hearts
-		set zeny,zeny+.@totalprice;
+		set Zeny, Zeny+.@totalprice;
 		close;
 	}
 
@@ -3592,7 +3491,6 @@ OnTouch:
 		close;
 	}
 	end;
-
 }
 
 ice_dun03,126,126,3	script	Blazing Fire#ice1	802,{
@@ -3602,7 +3500,7 @@ ice_dun03,126,126,3	script	Blazing Fire#ice1	802,{
 	mes "you can put this fire out";
 	mes "with conventional means.^000000";
 	if (ice_necklace_q > 4) {
-		if ($ktullanux_summon < 4) {
+		if ($@ktullanux_summon < 4) {
 			if (countitem(7574) > 0) {
 				next;
 				select("Use Freezing Snow Powder.");
@@ -3611,8 +3509,8 @@ ice_dun03,126,126,3	script	Blazing Fire#ice1	802,{
 				mes "flickers before extinguising.^000000";
 				delitem 7574,1; //Freezing Snow Powder
 				hideonnpc "Blazing Fire#ice1";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
 			else if (countitem(7562) > 0) {
 				next;
@@ -3622,18 +3520,13 @@ ice_dun03,126,126,3	script	Blazing Fire#ice1	802,{
 				mes "extinguising.^000000";
 				delitem 7562,1; //Ice Scale
 				hideonnpc "Blazing Fire#ice1";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
 		}
 	}
 	close;
-
-OnInit:
-	set $ktullanux_summon,0;
-	end;
-
 }
 
 
@@ -3644,7 +3537,7 @@ ice_dun03,172,126,0	script	Blazing Fire#ice2	802,{
 	mes "you can put this fire out";
 	mes "with conventional means.^000000";
 	if (ice_necklace_q > 4) {
-		if ($ktullanux_summon < 4) {
+		if ($@ktullanux_summon < 4) {
 			if (countitem(7574) > 0) {
 				next;
 				select("Use Freezing Snow Powder.");
@@ -3653,8 +3546,8 @@ ice_dun03,172,126,0	script	Blazing Fire#ice2	802,{
 				mes "flickers before extinguising.^000000";
 				delitem 7574,1; //Freezing Snow Powder
 				hideonnpc "Blazing Fire#ice2";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
 			else if (countitem(7562) > 0) {
 				next;
@@ -3664,18 +3557,13 @@ ice_dun03,172,126,0	script	Blazing Fire#ice2	802,{
 				mes "extinguising.^000000";
 				delitem 7562,1; //Ice Scale
 				hideonnpc "Blazing Fire#ice2";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
 		}
 	}
 	close;
-
-OnInit:
-	set $ktullanux_summon,0;
-	end;
-
 }
 
 ice_dun03,172,172,0	script	Blazing Fire#ice3	802,{
@@ -3685,7 +3573,7 @@ ice_dun03,172,172,0	script	Blazing Fire#ice3	802,{
 	mes "you can put this fire out";
 	mes "with conventional means.^000000";
 	if (ice_necklace_q > 4) {
-		if ($ktullanux_summon < 4) {
+		if ($@ktullanux_summon < 4) {
 			if (countitem(7574) > 0) {
 				next;
 				select("Use Freezing Snow Powder.");
@@ -3694,8 +3582,8 @@ ice_dun03,172,172,0	script	Blazing Fire#ice3	802,{
 				mes "flickers before extinguising.^000000";
 				delitem 7574,1; //Freezing Snow Powder
 				hideonnpc "Blazing Fire#ice3";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
 			else if (countitem(7562) > 0) {
 				next;
@@ -3705,18 +3593,13 @@ ice_dun03,172,172,0	script	Blazing Fire#ice3	802,{
 				mes "extinguising.^000000";
 				delitem 7562,1; //Ice Scale
 				hideonnpc "Blazing Fire#ice3";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
 		}
 	}
 	close;
-
-OnInit:
-	set $ktullanux_summon,0;
-	end;
-
 }
 
 ice_dun03,127,172,0	script	Blazing Fire#ice4	802,{
@@ -3726,7 +3609,7 @@ ice_dun03,127,172,0	script	Blazing Fire#ice4	802,{
 	mes "you can put this fire out";
 	mes "with conventional means.^000000";
 	if (ice_necklace_q > 4) {
-		if ($ktullanux_summon < 4) {
+		if ($@ktullanux_summon < 4) {
 			if (countitem(7574) > 0) {
 				next;
 				select("Use Freezing Snow Powder.");
@@ -3735,8 +3618,8 @@ ice_dun03,127,172,0	script	Blazing Fire#ice4	802,{
 				mes "flickers before extinguising.^000000";
 				delitem 7574,1; //Freezing Snow Powder
 				hideonnpc "Blazing Fire#ice4";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
 			else if (countitem(7562) > 0) {
 				next;
@@ -3746,18 +3629,13 @@ ice_dun03,127,172,0	script	Blazing Fire#ice4	802,{
 				mes "extinguising.^000000";
 				delitem 7562,1; //Ice Scale
 				hideonnpc "Blazing Fire#ice4";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
 		}
 	}
 	close;
-
-OnInit:
-	set $ktullanux_summon,0;
-	end;
-
 }
 
 ice_dun03,1,173,5	script	ice_boss#broad	-1,{
@@ -3797,7 +3675,6 @@ OnTimer21000:
 	stopnpctimer;
 	donpcevent "ice_boss#on::OnStart";
 	end;
-
 }
 
 ice_dun03,1,174,3	script	ice_boss#on	-1,{
@@ -3822,7 +3699,7 @@ OnMyMobDead:
 
 OnTimer7200000:
 	stopnpctimer;
-	set $ktullanux_summon,0;
+	set $@ktullanux_summon,0;
 	hideoffnpc "Blazing Fire#ice1";
 	hideoffnpc "Blazing Fire#ice2";
 	hideoffnpc "Blazing Fire#ice3";
@@ -3837,10 +3714,10 @@ OnStart:
 	enablenpc "#ice_4f_2";
 	enablenpc "#ice_4f_3";
 	enablenpc "#ice_4f_4";
-	donpcevent "#ice_4f_1::OnEnable";
-	donpcevent "#ice_4f_2::OnEnable";
-	donpcevent "#ice_4f_3::OnEnable";
-	donpcevent "#ice_4f_4::OnEnable";
+	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_1";
+	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_2";
+	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_3";
+	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_4";
 	end;
 
 OnTimer60000:
@@ -3860,11 +3737,6 @@ OnTouch:
 OnInit:
 	disablenpc "#ice_4f_1";
 	end;
-
-OnEnable:
-	misceffect EF_MAPPILLAR2;
-	end;
-
 }
 
 ice_dun03,138,148,0	script	#ice_4f_2	45,2,2,{
@@ -3875,11 +3747,6 @@ OnTouch:
 OnInit:
 	disablenpc "#ice_4f_2";
 	end;
-
-OnEnable:
-	misceffect EF_MAPPILLAR2;
-	end;
-
 }
 
 ice_dun03,161,148,0	script	#ice_4f_3	45,2,2,{
@@ -3890,11 +3757,6 @@ OnTouch:
 OnInit:
 	disablenpc "#ice_4f_3";
 	end;
-
-OnEnable:
-	misceffect EF_MAPPILLAR2;
-	end;
-
 }
 
 ice_dun03,151,162,0	script	#ice_4f_4	45,2,2,{
@@ -3905,19 +3767,10 @@ OnTouch:
 OnInit:
 	disablenpc "#ice_4f_4";
 	end;
-
-OnEnable:
-	misceffect EF_MAPPILLAR2;
-	end;
-
 }
 
-// End of Ice Necklace/Summon Ktullanux Quest
-//============================================================ 
-
-
-// Donation Lottery Quest/High Priest Quest
-//============================================================ 
+// Donation Lottery Quest/High Priest Quest :: rachel_oz & rachel_ma1
+//============================================================
 ra_temple,119,180,0	script	Temple Entrance#ra_tem	45,1,1,{
 OnTouch:
 	if ($rachel_donate >= 10000) {
@@ -3975,7 +3828,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "a contribution. Regardless,";
 			mes "we invite you to celebrate the";
 			mes "grace of the goddess with us.";
-			Emotion e_ho;
+			emotion e_ho;
 			next;
 			mes "[Priestess Nemma]";
 			mes "There's one High Priest that";
@@ -4019,21 +3872,16 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "of 50,000 zeny, and we can only";
 			mes "accept up to 150,000 zeny at once. It's a bit complicated, I know...";
 			next;
-
 			switch(select("50,000z - 1 Lottery Ticket:100,000z - 2 Lottery Ticket:150,000z - 3 Lottery Ticket:Cancel")) {
-
 			case 1:
 				callsub S_Donate,1,"50,000";
 				break;
-
 			case 2:
 				callsub S_Donate,2,"100,000";
 				break;
-
 			case 3:
 				callsub S_Donate,3,"150,000";
 				break;
-
 			case 4:
 				cutin "ra_nemma02",2;
 				mes "[Priestess Nemma]";
@@ -4043,13 +3891,9 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "zeny. Even so, Freya is always";
 				mes "protecting you, wherever you go~";
 				break;
-
 			}
-
 			goto L_End;
-
 		}
-
 		else {
 			cutin "ra_nemma03",2;
 			mes "[Priestess Nemma]";
@@ -4059,9 +3903,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "while ago. So what brings you";
 			mes "to the temple today, hmm?";
 			next;
-
 			switch(select("I've come to donate again.:Just sight-seeing.:I came to attend the service.:I just wanted to see you again.")) {
-
 			case 1:
 				mes "[Priestess Nemma]";
 				mes "You've come to make another";
@@ -4071,21 +3913,16 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "accept donations in increments of";
 				mes "50,000 zeny up to 150,000 zeny.";
 				next;
-
 				switch(select("50,000z - 1 Lottery Ticket:100,000z - 2 Lottery Ticket:150,000z - 3 Lottery Ticket:Cancel")) {
-
 				case 1:
 					callsub S_Donate,1,"50,000";
 					break;
-
 				case 2:
 					callsub S_Donate,2,"100,000";
 					break;
-
 				case 3:
 					callsub S_Donate,3,"150,000";
 					break;
-
 				case 4:
 					cutin "ra_nemma02",2;
 					mes "[Priestess Nemma]";
@@ -4095,10 +3932,8 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 					mes "zeny. Even so, Freya is always";
 					mes "protecting you, wherever you go~";
 					break;
-
 				}
 				goto L_End;
-
 			case 2:
 				mes "[Priestess Nemma]";
 				mes "Oh! If you'd like some";
@@ -4114,7 +3949,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "Well, anyway, she'll help";
 				mes "you out. See you later!";
 				break;
-
 			case 3:
 				mes "[Priestess Nemma]";
 				mes "You're here for the";
@@ -4123,20 +3957,14 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "of calm that you can only";
 				mes "get from goddess Freya~";
 				break;
-
 			case 4:
 				mes "[Priestess Nemma]";
 				mes "Oh, how sweet of you~";
 				break;
-
 			}
-
 			goto L_End;
-
 		}
-
 	}
-
 	else {
 		if (MISC_QUEST & 8192) {
 			cutin "ra_nemma01",2;
@@ -4144,7 +3972,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "Welcome to our temple!";
 			goto L_End;
 		}
-
 		if (ra_tem_q < 1) {
 			mes "[Priestess Nemma]";
 			mes "Hello, there!";
@@ -4178,7 +4005,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			set ra_tem_q,1;
 			goto L_End;
 		}
-
 		else if ((ra_tem_q >= 1) && (ra_tem_q < 10)) {
 			mes "[Priestess Nemma]";
 			mes "If the gate's locked, then";
@@ -4194,7 +4020,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "Ooh, Panno, help me!";
 			goto L_End;
 		}
-
 		else if (ra_tem_q == 10) {
 			cutin "ra_nemma04",2;
 			mes "[Priestess Nemma]";
@@ -4221,7 +4046,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "Oooh, what should I do?!";
 			goto L_End;
 		}
-
 		else if (ra_tem_q == 11) {
 			emotion e_ho;
 			cutin "ra_nemma03",2;
@@ -4234,7 +4058,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "Lottery Tickets inside, okay?";
 			goto L_End;
 		}
-
 		else if (ra_tem_q == 12) {
 			mes "[Priestess Nemma]";
 			mes "Mmm... I know what";
@@ -4262,7 +4085,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			set ra_tem_q,13;
 			goto L_End;
 		}
-
 		else if (ra_tem_q == 13) {
 			mes "[Priestess Nemma]";
 			mes "Hey, did you bring me";
@@ -4275,11 +4097,8 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				next;
 				if (countitem(12018) >= 20) {
 					cutin "ra_nemma04",2;
-					delitem 12018,20; //FireCracker";
-					if(checkre(0))
-						getexp 20000,0;
-					else
-						getexp 200000,0;
+					delitem 12018,20; //Fire_Cracker
+					getexp (checkre(3))?50000:200000,0;
 					set ra_tem_q,14;
 					mes "[Priestess Nemma]";
 					mes "Yay!";
@@ -4310,7 +4129,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "but still. How much fun are";
 				mes "fireworks if there isn't a lot?";
 			}
-
 			else {
 				cutin "ra_nemma01",2;
 				mes "[Priestess Nemma]";
@@ -4320,16 +4138,13 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "back with, anyway~";
 			}
 			goto L_End;
-
 		}
-
 		else {
 			cutin "ra_nemma01",2;
 			mes "[Priestess Nemma]";
 			mes "Welcome to our temple!";
 		}
 		goto L_End;
-
 	}
 
 L_End:
@@ -4357,7 +4172,7 @@ S_Donate:
 		mes "generous and rewards the patient!";
 		return;
 	}
-	if (zeny >= getarg(0)*50000) {
+	if (Zeny >= getarg(0)*50000) {
 		if (!checkweight(7570,getarg(0))) {
 			cutin "ra_nemma02",2;
 			mes "[Priestess Nemma]";
@@ -4379,7 +4194,7 @@ S_Donate:
 		}
 		set $rachel_donate,$rachel_donate+getarg(0);
 		getitem 7570,getarg(0); //Temple_Lottery_Ticket
-		set zeny,zeny-getarg(0)*50000;
+		set Zeny, Zeny-getarg(0)*50000;
 		set ra_have_donated,1;
 		if ($rachel_donate > 9999) {
 			cutin "ra_nemma03",2;
@@ -4422,7 +4237,6 @@ S_Donate:
 		mes "Well, maybe another time, yes?";
 		return;
 	}
-
 }
 
 rachel,243,37,3	script	Kid#Candy Addict	921,{
@@ -4459,22 +4273,17 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 		mes "[Kid]";
 		mes "Oh hey, do";
 		mes "you like candy?";
-
 		if (ra_tem_q == 1) {
 			next;
 			switch(select("Not at all.:Yeah.:Sure, I love the stuff~:Not much.")) {
-
 			case 1:
 				mes "[Kid]";
 				mes "Hmpf! Okay.";
 				close;
-
 			case 2:
 				break;
-
 			case 3:
 				break;
-			
 			case 4:
 				mes "[Kid]";
 				mes "Oh. It's 'cause you're";
@@ -4486,10 +4295,7 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 				mes "Tell me, tell";
 				mes "me, how come?";
 				close;
-
 			}
-
-
 			if (rand(1,2) != 2) {
 				mes "[Kid]";
 				mes "Oh yeah...?";
@@ -4506,7 +4312,6 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 				mes "I tricked you!";
 				mes "You big big dummy!";
 			}
-
 			else {
 				mes "[Kid]";
 				mes "Oh, you do?";
@@ -4622,14 +4427,11 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 				mes "cool secret, so promise";
 				mes "that you won't be mad anymore.";
 				next;
-
 				switch(select("No, thanks.:What's that?")) {
-
 				case 1:
 					mes "[Kid]";
 					mes "Please~";
 					break;
-
 				case 2:
 					mes "[Kid]";
 					mes "Did you know that";
@@ -4654,16 +4456,11 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 					mes "be madder at you!";
 					set ra_tem_q,2;
 					break;
-
 				}
-
 			}
-
 		}
 		close;
-
 	}
-
 	else if (ra_tem_q == 2) {
 		mes "[Kid]";
 		mes "You're leaving?";
@@ -4688,7 +4485,6 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 		mes "huh? Gosh! Some people!";
 		close;
 	}
-
 }
 
 ra_temple,67,209,0	script	zawa00	-1,3,3,{
@@ -4715,7 +4511,6 @@ OnTouch:
 		mes "you don't get caught?^000000";
 		close;
 	}
-
 	else if ((ra_tem_q >= 3) && (ra_tem_q < 10)) {
 		mes "^3355FFWould you like to";
 		mes "enter the temple";
@@ -4731,12 +4526,11 @@ OnTouch:
 		mes "that you can enter.^000000";
 		close;
 	}
-
 	end;
 }
 
 que_rachel,63,82,0	script	Window#ra_temple	111,{
-	mes "^3355FFThis window it open^000000";
+	mes "^3355FFThis window is open.^000000";
 	next;
 	if(select("Stay:Exit Through Window") == 2) {
 		close2;
@@ -4754,7 +4548,6 @@ OnTouch:
 		set ra_tem_q,3;
 		close;
 	}
-
 	end;
 }
 
@@ -4769,9 +4562,7 @@ OnTouch:
 		set ra_tem_q,4;
 		close;
 	}
-
 	end;
-
 }
 
 que_rachel,94,139,0	script	zawa03	-1,10,10,{
@@ -4782,9 +4573,7 @@ OnTouch:
 		set ra_tem_q,5;
 		close;
 	}
-
 	end;
-
 }
 
 que_rachel,132,70,0	script	zawa04	-1,10,10,{
@@ -4801,9 +4590,7 @@ OnTouch:
 		set ra_tem_q,6;
 		close;
 	}
-
 	end;
-
 }
 
 que_rachel,28,315,0	script	Bloody Spot	-1,5,5,{
@@ -4827,16 +4614,13 @@ OnTouch:
 			set ra_tem_q,7;
 			close;
 		}
-
 		else {
 			mes "^3355FFYou decide that your";
 			mes "time would be better spent";
 			mes "investigating something else.^000000";
 			close;
 		}
-
 	}
-
 	else if (ra_tem_q == 7) {
 		mes "^3355FFThis dark spot on the";
 		mes "ground is really creepy,";
@@ -4860,16 +4644,13 @@ OnTouch:
 			set ra_tem_q,8;
 			close;
 		}
-
 		else {
 			mes "^3355FFYou decide that your";
 			mes "time would be better spent";
 			mes "investigating something else.^000000";
 			close;
 		}
-
 	}
-
 	else if (ra_tem_q == 8) {
 		mes "^3355FFThis blood stain on the";
 		mes "ground is a pretty bad";
@@ -4879,7 +4660,6 @@ OnTouch:
 		mes "bleeding does the same to you.^000000";
 		close;
 	}
-
 	end;
 }
 
@@ -4909,7 +4689,6 @@ OnTouch:
 		set ra_tem_q,9;
 		close;
 	}
-
 	end;
 }
 
@@ -4921,9 +4700,7 @@ que_rachel,160,37,0	duplicate(nemma01)	nemma05	-1,5,5
 que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 	mes "^3355FFThe gate is closed.^000000";
 	next;
-
 	switch(select("Push Gate:Examine Gate:Kick Gate:Smash Gate with Weapon")) {
-
 	case 1:
 		mes "^3355FFYou push the gate";
 		mes "with all of your might...";
@@ -4935,7 +4712,6 @@ que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 		}
 		mes "But it won't even budge.^000000";
 		break;
-
 	case 2:
 		mes "^3355FFThere's some strange";
 		mes "machinery installed on";
@@ -4944,7 +4720,6 @@ que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 		mes "a card or permit. The lights";
 		mes "are on, so it must be working.^000000";
 		break;
-
 	case 3:
 		mes "^3355FFYou angrily kick the gate...";
 		if (ra_tem_q == 9) {
@@ -4958,7 +4733,6 @@ que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 		mes "gate refuses to open for you.";
 		mes "Oh, and your foot hurts too.^000000.";
 		break;
-
 	case 4:
 		mes "^3355FFWait! That's not";
 		mes "a good idea. You can't";
@@ -4969,7 +4743,6 @@ que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 
 	}
 	close;
-
 }
 
 ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
@@ -5064,10 +4837,11 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		mes "you in your travels. Peace";
 		mes "be with you, "+strcharinfo(0)+".";
 		close2;
-		cutin "ra_gman",255;
+		cutin "",255;
 		set lost_boy,13;
+		completequest 8099;
 		specialeffect2 EF_ABSORBSPIRITS;
-		getexp 90000,0;
+		getexp (checkre(3))?90000:900000,0;
 		end;
 	}
 	else if ((lost_boy == 13) && (ra_tem_q < 14)) {
@@ -5107,7 +4881,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 			mes "someone that I can really";
 			mes "rely on to do this for me...";
 			close2;
-			cutin "ra_gman",255;
+			cutin "",255;
 			end;
 		}
 		cutin "ra_gman",2;
@@ -5229,8 +5003,12 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		next;
 		mes "^3355FFYou received a High";
 		mes "Priest's recommendation.^000000";
+		close2;
+		cutin "",255;
 		set ra_tem_q,15;
 		set lost_boy,14;
+		setquest 8100;
+		end;
 	}
 	else if ((ra_tem_q == 15) || (ra_tem_q == 16)) {
 		mes "[High Priest Zhed]";
@@ -5323,6 +5101,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		mes "discussion. Why don't you";
 		mes "wait and relax in the next room";
 		mes "over there in the meantime?";
+		changequest 8101,8102;
 		close2;
 		cutin "",255;
 		warp "ra_temin",297,156;
@@ -5380,7 +5159,11 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		mes "the Holy Ground? Regardless...";
 		mes "If you want to go there, then";
 		mes "just go there. Who'll stop you?^000000";
+		close2;
+		cutin "",255;
 		set ra_tem_q,20;
+		changequest 8103,8104;
+		end;
 	}
 	else if ((ra_tem_q >= 20) && (ra_tem_q < 22)) {
 		cutin "ra_gman2",2;
@@ -5481,8 +5264,9 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		set MISC_QUEST,MISC_QUEST | 8192;
 		set ra_tem_q,0;
 		cutin "",255;
+		completequest 8105;
 		specialeffect2 EF_ABSORBSPIRITS;
-		if(checkre(0))
+		if (checkre(3))
 			getexp 90000,60000;
 		else
 			getexp 900000,600000;
@@ -5553,6 +5337,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "I'm sure that she can tell you";
 					mes "more about what happened.";
 					set aru_monas,12;
+					changequest 17007,17008;
 					next;
 					mes "[High Priest Zhed]";
 					mes "If you do decide to";
@@ -5578,7 +5363,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "me like that! Saying";
 				mes "it like that is kind of";
 				mes "overdoing it, isn't it?";
-				emotion 54,1;
+				emotion e_sigh,1;
 				next;
 				mes "[High Priest Zhed]";
 				mes "Not at all. In fact, I'm";
@@ -5588,7 +5373,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "by the Valkyries. Now, how";
 				mes "may I help you, my friend?";
 				next;
-				select("Mysterious Building in the Volcano:");
+				select("Mysterious Building in the Volcano");
 				mes "["+strcharinfo(0)+"]";
 				mes "Actually, I was wondering";
 				mes "if you knew of anything about";
@@ -5791,10 +5576,10 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "of a really good way";
 				mes "for you to infiltrate";
 				mes "that place. Hmmmm...";
-				setquest 2114;
 				set aru_vol,1;
+				setquest 2114;
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if ((aru_vol > 0) && (aru_vol < 5)) {
@@ -5883,7 +5668,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					break;
 				}
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if (aru_vol == 5) {
@@ -5964,8 +5749,8 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "best chance of entering the Thor";
 					mes "Volcano camp without suspicion.";
 					delitem 7342,1; //File01
-					changequest 2115,2116;
 					set aru_vol,6;
+					changequest 2115,2116;
 				}
 				else {
 					mes "["+strcharinfo(0)+"]";
@@ -5984,7 +5769,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "best chance of entering the Thor";
 				mes "Volcano camp without suspicion.";
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if ((aru_vol > 6) && (aru_vol < 26)) {
@@ -5997,7 +5782,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "best chance of entering the Thor";
 				mes "Volcano camp without suspicion.";
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if (aru_vol == 26) {
@@ -6039,14 +5824,11 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "I will be contacting you again.";
 				mes "Together, we can protect";
 				mes "peace between our nations.";
-				completequest 60213;
 				set aru_vol,27;
-				if(checkre(0))
-					getexp 20000,0;
-				else
-					getexp 200000,0;
+				completequest 60213;
+				getexp (checkre(3))?20000:200000,0;
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if (aru_vol > 26) {
@@ -6118,7 +5900,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "before the other High";
 					mes "Priests ruin our nation.";
 					next;
-					Emotion e_omg,1;
+					emotion e_omg,1;
 					mes "["+strcharinfo(0)+"]";
 					mes "Y-you're not thinking";
 					mes "of overthrowing the";
@@ -6126,7 +5908,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "that a bit extreme?";
 					next;
 					cutin "ra_gman2",2;
-					Emotion e_swt;
+					emotion e_swt;
 					mes "[High Priest Zhed]";
 					mes "What? No, no!";
 					mes "Don't jump to conclusions";
@@ -6245,7 +6027,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "I already have someone in";
 					mes "mind that might help us.";
 					next;
-					Emotion 52,1;
+					emotion e_flash,1;
 					mes "["+strcharinfo(0)+"]";
 					mes "That sounds good.";
 					mes "Who is he?";
@@ -6258,7 +6040,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "may even think I deserve";
 					mes "to be excommunicated...";
 					next;
-					Emotion e_no1,1;
+					emotion e_no1,1;
 					mes "["+strcharinfo(0)+"]";
 					mes "Come on, it wouldn't";
 					mes "hurt to try! Besides,";
@@ -6484,7 +6266,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;
-					getexp 150000,0;
+					getexp (checkre(3))?150000:1500000,0;
 				}
 				else {
 					mes "[High Priest Zhed]";
@@ -7171,9 +6953,10 @@ ra_temsky,99,99,5	script	Pope#rachel	936,{
 		mes "learning. Now I have to";
 		mes "go officiate services, so...";
 		mes "This is goodbye for now...";
-		set ra_tem_q,17;
 		close2;
 		cutin "",255;
+		set ra_tem_q,17;
+		changequest 8100,8101;
 		end;
 	}
 	else {
@@ -7275,7 +7058,6 @@ OnTimer120000:
 	stopnpctimer;
 	hideonnpc "High Priestess Niren#ra";
 	end;
-
 }
 
 ra_temin,293,144,0	script	out1#rachel	-1,3,3,{
@@ -7297,7 +7079,6 @@ OnTouch:
 		end;
 	}
 	end;
-
 }
 
 ra_temin,288,151,0	script	hidden1#rachel	-1,1,6,{
@@ -7456,11 +7237,10 @@ OnTouch:
 		mes "For now, you may as well";
 		mes "talk to High Priest Zhed.^000000";
 		set ra_tem_q,19;
+		changequest 8102,8103;
 		close;
 	}
-
 	end;
-
 }
 
 ra_temin,272,143,0	script	key1#rachel	-1,3,3,{
@@ -7485,7 +7265,6 @@ OnTouch:
 		set ra_tem_q,21;
 		close;
 	}
-
 	end;
 }
 
@@ -7511,10 +7290,8 @@ OnTouch:
 		}
 		close;
 	}
-
 	mes "^3355FFThe door is locked.^000000";
 	close;
-	
 }
 
 que_san04,119,115,0	script	imir1#rachel	-1,2,2,{
@@ -7601,14 +7378,16 @@ OnTouch:
 		mes "with Bekento, I'm letting";
 		mes "you off easy. Remember that.";
 		next;
-		sc_start SC_Blind,600000,0;
+		sc_start SC_BLIND,600000,0;
 		mes "^3355FFNiren began to chant";
 		mes "in a low voice, and your";
 		mes "eyelids grow heavier as you";
 		mes "grow drowsier and sleepier...^000000";
-		set ra_tem_q,22;
 		close2;
+		cutin "",255;
 		hideonnpc "High Priestess Niren#r2";
+		set ra_tem_q,22;
+		changequest 8104,8105;
 		warp "rachel",163,152;
 		end;
 	}
@@ -7641,7 +7420,7 @@ OnTouch:
 		mes "back to Rachel Town. How long";
 		mes "have you been unconscious?^000000";
 		next;
-		sc_end SC_Blind;
+		sc_end SC_BLIND;
 		mes "^3355FFIt would be best to";
 		mes "ask High Priest Zhed";
 		mes "about what had happened.^000000";
@@ -7686,5 +7465,34 @@ OnTouch:
 	end;
 }
 
-// End of Donation Lottery/High Priest quest
 //============================================================
+// Old changelog
+//============================================================
+//= 1.0 First version, needs testing. [L0ne_W0lf]
+//= 1.1 Some slight optimization. [L0ne_W0lf]
+//= 1.2 Fixed Man Stuck in Ice only giving 1 Freezing Snow Powder. [L0ne_W0lf]
+//= 1.3 Added the ability to redeem lottery tickets before donation max is met. [L0ne_W0lf]
+//= 1.4 Removed an erroneous "case". Thanks, Jet. [L0ne_W0lf]
+//= 1.5 Fixed a bug in Bruspetti quest. [SinSloth]
+//= 1.5b Fixed some typos in various quests. [SinSloth]
+//= 1.6 Fixed a couple bugs with the Pope's Office Guards... [L0ne_W0lf]
+//= 1.7 Fixed Maheo, he will revert to his frozen state when clicked. [L0ne_W0lf]
+//=     Replaced  instances of "+name+", with "+strcharinfo(0)".
+//= 1.8 Various fixes: Hamion will now delete items used for Wind Hammer. [L0ne_W0lf]
+//=     Fixed EXP reward in Ice Necklace quest, fixed a typo in an NPC header.
+//=     Another minor fix to Hamion. "< 1" -> "< 2". Added a missing close to
+//=     the ontouch "key". Thanks to Gepard for pointing them out.
+//= 1.9 Fixed a misorder with variable checkings. [SinSloth]
+//= 2.0 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 2.2 Maheo NPC now uses "setnpcdisplay" instead of two NPCs. [L0ne_W0lf]
+//= 2.2a Corrected a Typo error ";;". [Samuray22]
+//= 2.3 Added Zhed's portion of Thor Volcano Base Quest. (euRO) [L0ne_W0lf]
+//= 2.4 Updated Zhed's Thor Vol. Base addition dialog to iRO's. [L0ne_W0lf]
+//= 2.4a Further updates to Zhed's Veins addition. [L0ne_W0lf]
+//= 2.5 Added Nameless Island quest addition. [L0ne_W0lf]
+//= 2.6 Uncommented ontouchNPC label for Man Stuck in Ice. [L0ne_W0lf]
+//= 2.7 Corrected overlaping warp coordinates. [L0ne_W0lf]
+//= 2.8 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 2.9 Replaced effect numerics with constants. [Samuray22]
+//============================================================
\ No newline at end of file
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index 11a5f1acb..54823189b 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Umbala
-//===== By: ================================================== 
+//===== By: ==================================================
 //= sabernet09 & rAthena Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2a
-//===== Compatible With: ===================================== 
-//= rAthena 7.15 +
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Umbalian Language Quest, Umbala Skeletal Gate Quest,
 //= Umbala Event, Create Essence/Dismantle Stone
 //	Phase 1. Learning the Language
@@ -23,7 +21,7 @@
 //= Umbala Domestic Dispute?
 //= - This quest is only avaliable if you have not done language quest.
 //= - Variables in use: um_wind, MISC_QUEST (Bit 32768)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= fixed by x[tsk], Lupus, PoW
 //= Quest completion is now registered
 //= 1.1 fixed Poporing Egg ID -> Poring Egg, fixed condition
@@ -32,14 +30,14 @@
 //= 1.7a Removed all custom quests to custom folder [Lupus]
 //= 1.8 Added official chance of failure to Create Essence/Dismantle Stone [Lupus]
 //= 1.9 Added functionality to allow players to dismantle more
-//= than a stone at once, up to 10. [SinSloth]
+//=     than a stone at once, up to 10. [SinSloth]
 //= 2.0 Updated hack check and added a weight check to dismantling. [SinSloth]
 //= 2.1 Rescripted to Aegis 10.3 standards. Added strange quest. [L0ne_W0lf]
 //= 2.2 Readded the ability to dismantle multiple stones at once. [L0ne_W0lf]
 //= 2.2a Fixed weight check from previous update. [L0ne_w0lf]
-//============================================================ 
+//============================================================
 
-// Umbalian Language Quest
+// Umbalian Language Quest :: um_trans
 //============================================================
 um_in,39,122,5	script	Utan Chief	784,{
 	if (event_umbala == 0) {
@@ -362,7 +360,7 @@ um_in,39,122,5	script	Utan Chief	784,{
 	}
 }
 
-// Create Essence/Dismantle Stone Quest
+// Create Essence/Dismantle Stone Quest :: um_npc
 //============================================================
 um_in,44,71,2	script	Utan Shaman	782,{
 	if (checkweight(908,600) == 0) {
@@ -979,8 +977,8 @@ umbala,221,193,1	script	#Skulldoor	111,{
 	}
 }
 
-// Umbala Domestic Dispute Quest
-//============================================================ 
+// Umbala Domestic Dispute Quest :: um_npc_ryu
+//============================================================
 um_in,139,48,5	script	Phrenetan	783,{
 	if (event_umbala >= 3) {
 		mes "[Phrenetan]";
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 0fad3c34e..bfd7f7d51 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -1,10 +1,10 @@
 //===== Hercules Script ======================================
 //= Veins Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 2.2
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.5
+//===== Description: =========================================
 //= [Official Conversion]
 //= Collection of Veins Quests 
 //= Stone Quest:
@@ -23,12 +23,12 @@
 //= - Missing addition to High Priest Zhed to start quest.
 //= - Infiltrate Thor Volcano Base. What is Arunafeltz up to?
 //= - Variable in use: rachel_camel (max 27)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Added Veins Stone quest. [L0ne_W0lf]
 //= 1.1 Added Veins Spy Quest. [L0ne_W0lf]
 //= 1.2 Added Veins Siblings Quest. [L0ne_W0lf]
-//=	Added Veins Thor Volcano Base Quest NPC. [L0ne_W0lf]
-//=	Start NPC is missing, but will be added when I get it.
+//=     Added Veins Thor Volcano Base Quest NPC. [L0ne_W0lf]
+//=     Start NPC is missing, but will be added when I get it.
 //= 1.3 Fixed two typos small in Asbar. [L0ne_W0lf]
 //= 1.3a More fixes to some of the Base quest NPCs. [L0ne_W0lf]
 //= 1.4 Added missing checkweights. [L0ne_W0lf]
@@ -43,11 +43,14 @@
 //=     - Thor Volcano Base Quest
 //= 2.0 Removed level requirement. (bugreport:4678) [L0ne_W0lf]
 //= 2.1 Added missing changequest (3071-3076). [Joseph]
-//= 2.2 Added renewal checks for exp distribution [Streusel]
-//============================================================ 
-
-// Stone Quest
-//============================================================ 
+//= 2.2 Moved "Wincing Old Man" to pre-re/re coordinates. [Euphy]
+//= 2.3 Fixed incorrect use of 'close'. [Joseph]
+//= 2.4 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.5 Added GM management NPC. [Euphy]
+//============================================================
+
+// Stone Quest :: veins_stone
+//============================================================
 -	script	::WincingOldMan_veins	-1,{
 	if ((MaxWeight - Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
@@ -288,10 +291,7 @@
 		mes "find these useful. Anyway,";
 		mes "I hope you like these rocks...";
 		set veins_stone,8;
-		if(checkre(0))
-			getexp 30000,0;
-		else
-			getexp 300000,0;
+		getexp (checkre(3))?30000:300000,0;
 		getitem 985,3; //Elunium
 		close;
 	}
@@ -641,8 +641,8 @@ ve_in02,68,39,7	script	Factory Worker#ve2	943,{
 	close;
 }
 
-// Spy Quest
-//============================================================ 
+// Spy Quest :: veins_secret
+//============================================================
 prontera,202,122,0	script	Kid#sch	703,{
 	if (que_sch == 0) {
 		mes "[Rooney]";
@@ -722,7 +722,7 @@ prontera,202,122,0	script	Kid#sch	703,{
 		mes "[Rooney]";
 		mes "Hey, alright! Thanks";
 		mes "for the cash! Heh heh~";
-		set zeny,zeny-100;
+		set Zeny, Zeny-100;
 		set que_sch,3;
 		close;
 	}
@@ -818,7 +818,7 @@ prt_church,89,108,6	script	Bard#sch	741,{
 		mes "kid that was supposed";
 		mes "to come find me here.";
 		set que_sch,2;
-		set zeny,zeny+100;
+		set Zeny, Zeny+100;
 		next;
 		mes "[Lasda]";
 		mes "I'd like you to come";
@@ -975,10 +975,7 @@ prt_church,89,108,6	script	Bard#sch	741,{
 		mes "reward with our sincere thanks.";
 		set que_sch,26;
 		getitem 12106,1; //Accessory_Box
-		if(checkre(0))
-			getexp 60000,0;
-		else
-			getexp 600000,0;
+		getexp (checkre(3))?60000:600000,0;
 		close;
 	}
 	else {
@@ -1584,7 +1581,7 @@ job_duncer,93,106,6	script	Dance Instructor#sch	892,{
 			mes "your Megaphone. Thanks";
 			mes "for everything, and I'll see";
 			mes "you around, adventurer~";
-			set zeny,zeny-500000;
+			set Zeny, Zeny-500000;
 			set que_sch,18;
 			getitem 7040,1; //Megaphone
 			close;
@@ -1630,7 +1627,7 @@ job_duncer,93,106,6	script	Dance Instructor#sch	892,{
 				mes "so I'm not supposed to let";
 				mes "you have this. Don't let";
 				mes "anyone know I gave you this!";
-				set zeny,zeny-500000;
+				set Zeny, Zeny-500000;
 				getitem 7040,1; //Megaphone
 				close;
 			}
@@ -2651,8 +2648,22 @@ comodo,135,299,0	script	Young Man#sch2	809,{
 	}
 }
 
-// Siblings Quest
-//============================================================ 
+sec_in02,10,43,4	script	Extra Story Patch	809,{
+	callfunc "F_GM_NPC";
+	mes "[Patch]";
+	mes "Yeah, you can try.";
+	next;
+	if(select("Now:How many?") == 2) {
+		input .@input,0,1000;
+		set que_sch, .@input;
+	}
+	mes " ";
+	mes ""+que_sch;
+	close;
+}
+
+// Siblings Quest :: veins_camel
+//============================================================
 veins,327,185,3	script	Kid#camelcamel	944,{
 	if (MISC_QUEST & 8192) {
 		if (rachel_camel == 0) {
@@ -3047,8 +3058,8 @@ veins,327,185,3	script	Kid#camelcamel	944,{
 			completequest 3083;
 			set rachel_camel,25;
 			specialeffect2 EF_ABSORBSPIRITS;
-			if(checkre(0))
-				getexp 100000,70000;
+			if (checkre(3))
+				getexp 100000,50000;
 			else
 				getexp 1000000,700000;
 			close;
@@ -3134,6 +3145,7 @@ veins,327,185,3	script	Kid#camelcamel	944,{
 				mes "I'm happy that";
 				mes "I can help you too!";
 				set aru_monas,16;
+				changequest 17011,17012;
 				close;
 			}
 			else if (aru_monas < 26) {
@@ -4014,7 +4026,7 @@ veins,181,166,3	script	Lockenlock	900,{
 		mes "The army's rotten to the core";
 		mes "for doing something like this.";
 		next;
-		mes "	[Locksmith Lockenlock]";
+		mes "[Locksmith Lockenlock]";
 		mes "You're a real good person,";
 		mes "and I'm glad I got to know";
 		mes "you. I don't know if we'll";
@@ -5059,9 +5071,8 @@ veins,221,120,5	script	Young Town Native	943,{
 	}
 }
 
-// Thor Volcano Base Quest
-//============================================================ 
-
+// Thor Volcano Base Quest :: veins_camp
+//============================================================
 ra_temin,87,133,1	script	Rachel Guard#vol1	934,5,2,{
 	if (aru_vol == 2) {
 		mes "[Guard Karlum]";
@@ -5187,14 +5198,12 @@ ra_temin,87,133,1	script	Rachel Guard#vol1	934,5,2,{
 		disablenpc "Rachel Guard#vol1";
 		end;
 	}
-	else {
-		mes "[Guard Karlum]";
-		mes "High Priest Vildt isn't";
-		mes "here right now. Please";
-		mes "come back later if you";
-		mes "wish to see him.";
-		close;
-	}
+	mes "[Guard Karlum]";
+	mes "High Priest Vildt isn't";
+	mes "here right now. Please";
+	mes "come back later if you";
+	mes "wish to see him.";
+	close;
 
 OnInit:
 	enablenpc "Rachel Guard#vol1";
@@ -5202,7 +5211,7 @@ OnInit:
 
 OnTouch:
 	warp "ra_temin",85,137;
-	close;
+	end;
 }
 
 ra_temin,82,133,7	script	Rachel Guard#vol2	934,5,2,{
@@ -6091,10 +6100,7 @@ ve_in,281,214,3	script	Bookshelf#vol	111,{
 		else {
 			getitem 12103,1; //Bloody_Dead_Branch
 		}
-		if(checkre(0))
-			getexp 80000,0;
-		else
-			getexp 800000,0;
+		getexp (checkre(3))?100000:800000,0;
 		mes "^3355FFWell, you've done all";
 		mes "that you could here.";
 		mes "Now would be a good time";
@@ -6334,7 +6340,7 @@ thor_camp,250,104,3	script	Sahedi#vol	934,{
 		mes "like this in the past, but...";
 		mes "Is this... How bad is this?";
 		next;
-		emotion 19,1;
+		emotion e_swt2,1;
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh... Oh, no!";
 		mes "Yikes! I guess if it's";
@@ -6425,7 +6431,7 @@ thor_camp,250,104,3	script	Sahedi#vol	934,{
 		mes "It'll be a disaster, just";
 		mes "like it happened in the past!";
 		next;
-		emotion 52,1;
+		emotion e_flash,1;
 		mes "["+strcharinfo(0)+"]";
 		mes "Yes, I agree. There's";
 		mes "a good chance of an...";
@@ -6437,7 +6443,7 @@ thor_camp,250,104,3	script	Sahedi#vol	934,{
 		mes "How much time do we";
 		mes "have to evacuate?";
 		next;
-		emotion 52,1;
+		emotion e_flash,1;
 		mes "["+strcharinfo(0)+"]";
 		mes "Well... Uh...";
 		mes "According to my data...";
@@ -7141,6 +7147,7 @@ thor_camp,156,57,3	duplicate(VeinsDummy)	Dummy#5	111
 thor_camp,162,57,3	duplicate(VeinsDummy)	Dummy#6	111
 
 thor_camp,248,104,5	script	Aitra#vol	939,{
+	end;
 OnInit:
 	disablenpc "Aitra#vol";
 	end;
@@ -7355,7 +7362,7 @@ ve_in,237,131,1	script	Female Customer#ve1	940,{
 	next;
 	mes "["+strcharinfo(0)+"]";
 	mes "Meee?";
-	emotion 19,1;
+	emotion e_swt2,1;
 	next;
 	mes "[Female Customer]";
 	mes "Mmm...";
diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt
index d6ed2a268..e03deed5c 100644
--- a/npc/quests/quests_yuno.txt
+++ b/npc/quests/quests_yuno.txt
@@ -1,11 +1,11 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Juno
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.0a
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Metto Quest:
 //= - Not really sure exaclty what it's for. :P
 //= - Variable in use: metto_q (max 9)
@@ -17,23 +17,23 @@
 //= - Part 1: Found in Quests_Comodo.txt
 //= - Part 3: Found in Doomed_Swords.txt
 //= - Variable in use dmdswrd_Q (Max 45)
-//===== Additional Comments: ================================= 
-//= v1.1 Re-did the text and re-organized the script.  Corrected some items. [kobra_k88]
-//= v1.2 Added part to Bro's for alchemist quest [Darkchild]
+//===== Additional Comments: =================================
+//= 1.1 Re-did the text and re-organized the script.  Corrected some items. [kobra_k88]
+//= 1.2 Added part to Bro's for alchemist quest [Darkchild]
 //= 1.3 fixed that part of Alch Job Quest. [Lupus]
 //= 1.4 Fixed exploit [Lupus]
 //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Merged metto_quest.txt into Juno quest file.
-//=	Added the Juno portion of the Doomed Swords quest.
+//=     Merged metto_quest.txt into Juno quest file.
+//=     Added the Juno portion of the Doomed Swords quest.
 //= 1.6 Fixed various errors in the Bajin NPC. [L0ne_W0lf]
 //= 1.7 Changed ALCH_Q check and set to corrispond to new alchemist job quest. [L0ne_W0lf]
 //= 1.8 Fixed metto_q never reaching 2. Made some names more unique. [L0ne_W0lf]
 //= 1.9 Fixed Missing Variables in Metto quest. (bugreport:473) [Samuray22]
 //= 2.0 Added missing checkweights. [L0ne_W0lf]
 //= 2.0a Fixed several typos (bugreport:1786) [akrus]
-//============================================================ 
+//============================================================
 
-// Metto Quest
+// Metto Quest :: yuno_ryusei
 //============================================================
 yuno_in03,26,39,3	script	Metto#juno	709,{
 	mes "[Metto]";
@@ -227,8 +227,7 @@ yuno_in01,17,30,5	script	Wagan#juno	85,{
 		next;
 		mes "[Wagan]";
 		if (Class == Job_Sage) {
-			set .@now_weight,maxweight - weight;
-			if (.@now_weight < 300) {
+			if (MaxWeight - Weight < 300) {
 				mes "Oh no, it seems that you are carrying too much stuff! Would you make some room?";
 				close;
 			}
@@ -237,8 +236,7 @@ yuno_in01,17,30,5	script	Wagan#juno	85,{
 			getitem 715,10; //Yellow_Gemstone
 			close;
 		}
-		set .@now_weight,maxweight - weight;
-		if (.@now_weight < 150) {
+		if (MaxWeight - Weight < 150) {
 			mes "Oh no, it seems that you are carrying too much! Would you make some room?";
 			close;
 		}
@@ -422,7 +420,7 @@ yuno_in03,178,43,0	script	CiCi#juno	121,{
 	}
 }
 
-// Alchemist Brothers Quest
+// Alchemist Brothers Quest :: yuno_ryusei
 //============================================================
 yuno_in01,103,157,3	script	Bain#juno	98,{
 	if (checkweight(1201,1) == 0) {
@@ -531,7 +529,7 @@ S_DelItems:
 	delitem 7043,5; //Fine_Sand
 	delitem 757,3; //Elunium_Stone
 	delitem 756,3; //Oridecon_Stone
-	set zeny,zeny-2000;
+	set Zeny, Zeny-2000;
 	getitem getarg(0),getarg(1); //Gold
 	mes "[Bain]";
 	mes "AHHH, it is a success!";
@@ -659,7 +657,7 @@ S_DelItems:
 	delitem 7043,5; //Fine_Sand
 	delitem 757,3; //Elunium_Stone
 	delitem 756,3; //Oridecon_Stone
-	set zeny,zeny-2000;
+	set Zeny, Zeny-2000;
 	getitem getarg(0),getarg(1); //Gold
 	mes "[Bajin]";
 	mes "AHHH, it is a success!";
@@ -684,8 +682,8 @@ S_DelItems:
 	close;
 }
 
-// Doomed Swords - Juno Portion
-//============================================================ 
+// Doomed Swords - Juno Portion :: matnani_yuno
+//============================================================
 yuno,157,87,4	script	A Citizen of Juno#juno	102,{
 	mes "[Shalima]";
 	mes "When you go north from Al De Baran, you will arrive at 'Elmeth Plateau,' a place covered with molten rock.";
@@ -1096,7 +1094,7 @@ yuno,213,298,4	script	Sage Esklah#juno	735,{
 			mes "^3355FF5 Decayed Nail^000000.";
 			next;
 			mes "[Esklah]";
-			mes "For someone seeking the doomed sword, this should be a relatively simple task. Now go, and bring me what I have asked."			;
+			mes "For someone seeking the doomed sword, this should be a relatively simple task. Now go, and bring me what I have asked.";
 			set dmdswrd_Q,28;
 			close;
 		case 28:
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index 45e80aaf0..afdaee690 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -1,10 +1,10 @@
 //===== Hercules Script ======================================
-//= Brisingamen seal unlocking NPCs.
-//===== By: ================================================== 
+//= God Item Quest - Brisingamen Seal
+//===== By: ==================================================
 //= SinSloth
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.7
+//===== Description: =========================================
 //= Quest for breaking the seal of Brisingamen.
 //===== Additional Comments: =================================
 //= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
@@ -15,12 +15,14 @@
 //= 1.3a Changed some " + name +" to strcharinfo(0) [Samuray22]
 //= 1.4 Replaced effect numerics with constants. [Samuray22]
 //= 1.5 Corrected serverwide announcement. [L0ne_W0lf]
+//= 1.6 Updated RE/Pre-RE EXP. [Euphy]
+//= 1.7 Renewal script update. [Euphy]
 //============================================================
 
 prt_fild08,175,374,3	script	Bard#brising	51,{
 	cutin "god_nelluad01",2;
-	if (($God2 > 49) && ($God3 < 100)){
-		if (god_brising > 49){
+	if ($God2 >= $@god_check1 && $God3 < $@god_check2) {
+		if (god_brising > 49) {
 			mes "[Nelliorde]";
 			mes "Oh, I guess all is going well for you. So how has everything else been?";
 			next;
@@ -244,7 +246,7 @@ prt_fild08,175,374,3	script	Bard#brising	51,{
 				break;
 			}
 		}
-		else if((god_brising > 0) && (god_brising < 50)){
+		else if ((god_brising > 0) && (god_brising < 50)){
 			mes "[Nelliorde]";
 			mes "So, have you";
 			mes "met Mr. Kaili?";
@@ -843,7 +845,7 @@ yuno_in04,47,113,1	script	Studying Scholar#1	749,{
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
 	}
-	if ($God3 == 100) {
+	if ($God3 == $@god_check2) {
 		mes "[Studying Scholar]";
 		mes "Hmmm...";
 		mes "The highest quality Red Potion ever...";
@@ -852,7 +854,7 @@ yuno_in04,47,113,1	script	Studying Scholar#1	749,{
 		mes "If only I could figure a way to balance the consistency of the ground Red Herbs mixed with the water. That part is most crucial...";
 		close;
 	}
-	if ($God2 > 49) {
+	if ($God2 >= $@god_check1) {
 		if (god_brising == 50) {
 			mes "[Enrico Kaili]";
 			mes "Ah, " + strcharinfo(0) + ",";
@@ -874,40 +876,36 @@ yuno_in04,47,113,1	script	Studying Scholar#1	749,{
 			mes "[Enrico Kaili]";
 			mes "Oh! I'm so excited! I don't know what to do first! Should I report to His Majesty or publish my findings or...";
 			next;
-			switch(select("^333333*Ahem!*^000000 My reward!")) {
-			case 1:
-				mes "[Enrico Kaili]";
-				mes "Oh, right.";
-				mes "Thank you for all the trouble you have endured for my sake. You are truly one of the best researchers I've ever met.";
-				next;
-				mes "[Enrico Kaili]";
-				mes "Then as promised...";
-				mes "I will give you something from my precious collection! Now, let me see what we have here...";
-				next;
-				mes "[Enrico Kaili]";
-				mes "Please...";
-				mes "Take this";
-				set god_brising,50;
-				getitem 616,1; // Old_Card_Album
-				getexp 60000,0;
-				next;
-				mes "[Enrico Kaili]";
-				mes "Please accept this as my way of thanking you for assisting in my";
-				mes "research. If the opportunity arises, I would like to ask you for your help once again. Now please, take care.";
-				if ($God3 < 100) set $God3,$God3 +1;
-					if ($God3 == 50) {
-						announce "The 3rd Seal of [Brisingamen] has appeared.",bc_all;
-					}
-					else if ($God3 == 100) {
-						if ($God1 == 100 && $God2 == 100 && $God3 == 100 && $God4 == 100) {
-							announce "Four seals have been released at the same time with the seal of [Brisingamen].",bc_all;
-						}
-						else {
-							announce "The 3rd seal of [Brisingamen] has been released.",bc_all;
-						}
-					}
-				}
-				close;
+			select("^333333*Ahem!*^000000 My reward!");
+			mes "[Enrico Kaili]";
+			mes "Oh, right.";
+			mes "Thank you for all the trouble you have endured for my sake. You are truly one of the best researchers I've ever met.";
+			next;
+			mes "[Enrico Kaili]";
+			mes "Then as promised...";
+			mes "I will give you something from my precious collection! Now, let me see what we have here...";
+			next;
+			mes "[Enrico Kaili]";
+			mes "Please...";
+			mes "Take this.";
+			set god_brising,50;
+			getitem 616,1; // Old_Card_Album
+			getexp (checkre(3))?60000:600000,0;
+			next;
+			mes "[Enrico Kaili]";
+			mes "Please accept this as my way of thanking you for assisting in my";
+			mes "research. If the opportunity arises, I would like to ask you for your help once again. Now please, take care.";
+			if ($God3 < $@god_check2)
+				set $God3,$God3 +1;
+			if ($God3 == $@god_check1)
+				announce "The 3rd Seal of [Brisingamen] has appeared.",bc_all;
+			else if ($God3 == $@god_check2) {
+				if ($God1 == $@god_check2 && $God2 == $@god_check2 && $God3 == $@god_check2 && $God4 == $@god_check2)
+					announce "Four seals have been released at the same time with the seal of [Brisingamen].",bc_all;
+				else
+					announce "The 3rd seal of [Brisingamen] has been released.",bc_all;
+			}
+			close;
 		}
 		else if (god_brising == 48) {
 			mes "[Enrico Kaili]";
@@ -1259,7 +1257,7 @@ yuno_in04,47,113,1	script	Studying Scholar#1	749,{
 			mes "If she'll let you look at her records, you can probably find out where he lives. Now why don't you talk to that lady towards the left part of this room?";
 			close;
 		}
-		else if(god_brising == 2) {
+		else if (god_brising == 2) {
 			mes "[Enrico Kaili]";
 			mes "So, have you";
 			mes "considered my proposal?";
@@ -1397,7 +1395,7 @@ yuno_in04,47,113,1	script	Studying Scholar#1	749,{
 }
 
 prt_church,113,103,1	script	Praying Man	798,{
- 	if ($God2 < 50) {
+ 	if ($God2 < $@god_check1) {
 		mes "[Praying Man]";
 		mes "Let everyone live a life";
 		mes "of happiness. Let there be";
@@ -1409,7 +1407,7 @@ prt_church,113,103,1	script	Praying Man	798,{
 		mes "month's paycheck on...";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "[Praying Man]";
 		mes "Now is the time to reflect upon the past to prepare for the future.";
 		next;
@@ -1541,9 +1539,8 @@ prt_church,113,103,1	script	Praying Man	798,{
 		mes "to Lowen.";
 		close;
 	}
-	else if(god_brising == 5) {
-		set @brising_try,rand(1,4);
-		if(@brising_try == 1) {
+	else if (god_brising == 5) {
+		if (rand(1,4) == 1) {
 			mes "[Hermite Charles]";
 			mes "You're still here.";
 			mes "Does that mean you";
@@ -2084,13 +2081,13 @@ prt_church,113,103,1	script	Praying Man	798,{
 }
 
 prt_castle,80,52,0	script	Personnel Record#book1	111,{
-	if ($God2 < 50) {
+	if ($God2 < $@god_check1) {
 		mes "[Librarian]";
 		mes "What are you doing?";
 		mes "Don't touch anything!";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "[Librarian]";
 		mes "What are you doing?";
 		mes "Don't touch anything!";
@@ -2267,13 +2264,13 @@ prt_castle,80,52,0	script	Personnel Record#book1	111,{
 
 //-----------librarian----------------------------------------------------------
 prt_castle,84,51,5	script	Librarian#2	105,{
-	if ($God2 < 50) {
+	if ($God2 < $@god_check1) {
 		mes "[Librarian]";
 		mes "What are you doing here?";
 		mes "Don't touch anything!";
 		close;
 	}
- 	if ($God3 > 99) {
+ 	if ($God3 >= $@god_check2) {
 		mes "[Librarian]";
 		mes "What are you doing here?";
 		mes "Don't touch anything!";
@@ -2441,7 +2438,7 @@ prt_castle,84,51,5	script	Librarian#2	105,{
 }
 
 prontera,260,354,4	script	Woman#Rosa Ellenen	101,{
-	if ($God2 < 50){ 
+	if ($God2 < $@god_check1){ 
 		mes "[Woman]";
 		mes "Hm?";
 		mes "What brings";
@@ -2451,7 +2448,7 @@ prontera,260,354,4	script	Woman#Rosa Ellenen	101,{
 		mes "take a walk.";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "[Woman]";
 		mes "Hm?";
 		mes "What brings";
@@ -2461,7 +2458,7 @@ prontera,260,354,4	script	Woman#Rosa Ellenen	101,{
 		mes "take a walk.";
 		close;
 	}
-	if(god_brising > 33) {
+	if (god_brising > 33) {
 		mes "[Rosa Ellenen]";
 		mes "Are you the one";
 		mes "who visited me before?";
@@ -2567,7 +2564,7 @@ prontera,260,354,4	script	Woman#Rosa Ellenen	101,{
 }
 
 prontera,262,353,0	script	Gravestone	111,{
-	if($God2 > 49) {
+	if ($God2 > $@god_check1) {
 		if (god_brising > 33) {
 			mes "Lowen Ellenen";
 			mes " ";
@@ -2583,7 +2580,7 @@ prontera,262,353,0	script	Gravestone	111,{
 			close;
 		}
 	}
-	else	{
+	else {
 		mes "^3355FFIt's just an";
 		mes "ordinary gravestone.^000000";
 		next;
@@ -2594,12 +2591,12 @@ prontera,262,353,0	script	Gravestone	111,{
 }
  
 gef_dun01,89,192,0	script	#lowentrace	111,3,3,{
-	if($God2 < 50) {
+	if ($God2 < $@god_check1) {
 		mes "^3355FFIt's just an old,";
 		mes "dry piece of wood.^000000";
 		close;
 	}
-	if($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "^3355FFIt's just an old,";
 		mes "dry piece of wood.^000000";
 		close;
@@ -2611,7 +2608,7 @@ gef_dun01,89,192,0	script	#lowentrace	111,3,3,{
 		switch(select("Yes:No")) {
 		case 1:
 			input @lowenstring$;
-			if(@lowenstring$ == "Lowen") {
+			if (@lowenstring$ == "Lowen") {
 				if (god_brising == 30) {
 					mes "[Lowen Ellenen]";
 					mes "^6E7B8B...Y-you're...";
@@ -2710,21 +2707,19 @@ gef_dun01,89,192,0	script	#lowentrace	111,3,3,{
 	}
 
 OnTouch:
-	if((god_brising > 9) && (god_brising < 34)) {
+	if ((god_brising > 9) && (god_brising < 34)) {
 		emotion e_gasp;
 	}
 	end;
 }
 
 gef_dun01,203,48,0	script	#lowentrace1	111,3,3,{
-
-	if ($God2 < 50) {
+	if ($God2 < $@god_check1) {
 		mes "^3355FFIt's just an old,";
 		mes "dry piece of wood.^000000";
 		close;
 	}
-
-	if( $God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "^3355FFIt's just an old,";
 		mes "dry piece of wood.^000000";
 		close;
@@ -2736,8 +2731,8 @@ gef_dun01,203,48,0	script	#lowentrace1	111,3,3,{
 		switch(select("Yes:No")) {
 		case 1:
 			input @lowenstring$;
-				if(@lowenstring$ == "Lowen") {
-					if(god_brising == 31) {
+				if (@lowenstring$ == "Lowen") {
+					if (god_brising == 31) {
 					mes "[Lowen Ellenen]";
 					mes "^6E7B8BYou came back!";
 					mes "You'll be with me";
@@ -2758,7 +2753,7 @@ gef_dun01,203,48,0	script	#lowentrace1	111,3,3,{
 						mes "care of yourself...^000000";
 						close;
 					}
-				} else if(god_brising == 30) {
+				} else if (god_brising == 30) {
 					mes "[Lowen Ellenen]";
 					mes "^6E7B8BAh yes. This is it.";
 					mes "You look very curious about me, yet I am amazed that you can hear my voice. Please let me tell you an old story.^000000";
@@ -2844,7 +2839,7 @@ gef_dun01,203,48,0	script	#lowentrace1	111,3,3,{
 	}
 
 OnTouch:
-	if((god_brising > 9) && (god_brising < 34)) {
+	if ((god_brising > 9) && (god_brising < 34)) {
 		emotion e_gasp;
 	}
 	end;
@@ -3132,7 +3127,7 @@ OnSummon:
 
 OnMobDeath:
 	set .brisinmobdead,.brisinmobdead -1;
-	if(.brisinmobdead > 0) end;
+	if (.brisinmobdead > 0) end;
 	set god_brising,31;
 	hideoffnpc "Valkyrie#1";
 	end;
@@ -3153,29 +3148,12 @@ OnReset:
 	end;
 }
 
-que_god02,173,58,4	script	#doppelganger1	739,{
-	end;
-}
-
-que_god02,175,55,4	script	#doppelganger2	739,{
-	end;
-}
-
-que_god02,175,54,1	script	#lowen	745,{
-	end;
-}
-
-que_god02,178,49,1	script	#knight1	751,{
-	end;
-}
-
-que_god02,168,53,7	script	#knight2	734,{
-	end;
-}
-
-que_god02,167,58,4	script	#knight3	752,{
-	end;
-}
+que_god02,173,58,4	script	#doppelganger1	739,{ end; }
+que_god02,175,55,4	script	#doppelganger2	739,{ end; }
+que_god02,175,54,1	script	#lowen	745,{ end; }
+que_god02,178,49,1	script	#knight1	751,{ end; }
+que_god02,168,53,7	script	#knight2	734,{ end; }
+que_god02,167,58,4	script	#knight3	752,{ end; }
 
 que_god02,174,49,0	script	#lowenone	139,0,0,{
 
@@ -3531,13 +3509,13 @@ que_god02,178,127,3	script	Valkyrie#1	811,{
 }
 
 xmas,38,105,0	script	#brisindwarf1	111,3,3,{
-	if ($God2 < 50) {
+	if ($God2 < $@god_check1) {
 		mes "^3355FFA lot of snow";
 		mes "is heavily piled";
 		mes "here on the ground.^000000";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "^3355FFA lot of snow";
 		mes "is heavily piled";
 		mes "here on the ground.^000000";
@@ -3698,7 +3676,7 @@ xmas,38,105,0	script	#brisindwarf1	111,3,3,{
 	}
 
 OnTouch:
-	if(god_brising > 39) {
+	if (god_brising > 39) {
 		emotion e_gasp,1;
 	}
 	end;
@@ -3998,12 +3976,12 @@ OnInit:
 }
 
 prt_fild02,185,269,0	script	#brisindwarf2	111,3,3,{
-	if ($God2 < 50) {
+	if ($God2 < $@god_check1) {
 		mes "^3355FFIt's just an";
 		mes "ordinary rock.^000000";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "^3355FFIt's just an";
 		mes "ordinary rock.^000000";
 		close;
@@ -4165,7 +4143,7 @@ prt_fild02,185,269,0	script	#brisindwarf2	111,3,3,{
 	}
 
 OnTouch:
-	if(god_brising > 41) {
+	if (god_brising > 41) {
 		emotion e_gasp,1;
 	}
 	end;
@@ -4190,7 +4168,7 @@ prt_fild02,185,270,3	script	Dvalin#1	826,{
 		hideonnpc "Dvalin#1";
 		end;
 	}
-	else if(god_brising == 42) {
+	else if (god_brising == 42) {
 		mes "[Dvalin]";
 		mes "Wah, it's not Alfrik?";
 		mes "Who are you to wake Dvalin?";
@@ -4275,7 +4253,7 @@ prt_fild02,185,270,3	script	Dvalin#1	826,{
 			end;
 		}
 	}
-	else if(god_brising == 43) {
+	else if (god_brising == 43) {
 		mes "[Dvalin]";
 		mes "Why do you keep calling me? I did everything I can do for you. I even gave you the key to the question.";
 		next;
@@ -4295,11 +4273,11 @@ OnInit:
 }
 
 mjolnir_09,85,129,0	script	#brisindwarf3	111,3,3,{
-	if ($God2 < 50) {
+	if ($God2 < $@god_check1) {
 		mes "^3355FFThe sight of this bubbling stream refreshes you just by looking at it.^000000";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "^3355FFThe sight of this bubbling stream refreshes you just by looking at it.^000000";
 		close;
 	}
@@ -4359,14 +4337,14 @@ mjolnir_09,85,129,0	script	#brisindwarf3	111,3,3,{
 	}
 
 OnTouch:
-	if(god_brising > 42) {
+	if (god_brising > 42) {
 		emotion e_gasp,1;
 	}
 	end;
 }
 
 mjolnir_09,87,129,3	script	Berling#1	826,{
-	if(god_brising > 44) {
+	if (god_brising > 44) {
 		mes "[Berling]";
 		mes "You're the one that's awakened us? Hahaha, perhaps that's a sign we may see Freya again! Hahahaha!";
 		next;
@@ -4376,7 +4354,7 @@ mjolnir_09,87,129,3	script	Berling#1	826,{
 		hideonnpc "OnBerling#1";
 		end;
 	}
-	else if(god_brising == 43) {
+	else if (god_brising == 43) {
 		mes "[Berling]";
 		mes "What the...?";
 		mes "It's a human?!";
@@ -4481,7 +4459,7 @@ mjolnir_09,87,129,3	script	Berling#1	826,{
 			end;
 		}
 	}
-	else if(god_brising == 44) {
+	else if (god_brising == 44) {
 		mes "[Berling]";
 		mes "Did you already forget the lyrics? Let me tell them to you again, so don't forget this time.";
 		next;
@@ -4510,12 +4488,12 @@ OnInit:
 }
 
 mjo_dun02,126,36,0	script	#brisindwarf4	111,3,3,{
-	if ($God2 < 50) {
+	if ($God2 < $@god_check1) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Bah, no way out.";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Bah, no way out.";
 		close;
@@ -4533,35 +4511,35 @@ mjo_dun02,126,36,0	script	#brisindwarf4	111,3,3,{
 		mes "What was the first line...?";
 		next;
 		input @dwarfsong1$;
-		if(@dwarfsong1$ == "No jewel in the world can compare.") set @point,@point +1;
-		mes	"[" + strcharinfo(0) + "]";
+		if (@dwarfsong1$ == "No jewel in the world can compare.") set @point,@point +1;
+		mes "[" + strcharinfo(0) + "]";
 		mes " " + @dwarfsong1$ + "";
 		mes "Then...ummm..";
 		mes "The second line?";
 		next;
 		input @dwarfsong2$;
-		if(@dwarfsong2$ == "Our masterpiece made from love.") set @point,@point +1;
+		if (@dwarfsong2$ == "Our masterpiece made from love.") set @point,@point +1;
 		mes "[" + strcharinfo(0) + "]";
 		mes " " + @dwarfsong2$ + "";
 		mes "Now, what was";
 		mes "the third line...?";
 		next;
 		input @dwarfsong3$;
-		if(@dwarfsong3$ == "She wanted the dazzling necklace.") set @point,@point +1;
+		if (@dwarfsong3$ == "She wanted the dazzling necklace.") set @point,@point +1;
 		mes "[" + strcharinfo(0) + "]";
 		mes " " + @dwarfsong3$ + "";
 		mes "Now, the fourth";
 		mes "line after that...";
 		next;
 		input @dwarfsong4$;
-		if(@dwarfsong4$ == "We wanted the goddess of beauty.") set @point,@point +1;
+		if (@dwarfsong4$ == "We wanted the goddess of beauty.") set @point,@point +1;
 		mes "[" + strcharinfo(0) + "]";
 		mes " " + @dwarfsong4$ + "";
 		mes "Alright, now";
 		mes "for the last line...";
 		next;
 		input @dwarfsong5$;
-		if(@dwarfsong5$ == "Our happiest times were with her.") set @point,@point +1;
+		if (@dwarfsong5$ == "Our happiest times were with her.") set @point,@point +1;
 		mes "[" + strcharinfo(0) + "]";
 		mes " " + @dwarfsong5$ + "";
 		mes "Alright, let's give it a try.";
@@ -4599,12 +4577,12 @@ mjo_dun02,126,36,0	script	#brisindwarf4	111,3,3,{
 	}
 
 OnTouch:
-	if ($God2 < 50) {
+	if ($God2 < $@god_check1) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Beh, no way out.";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Beh, no way out.";
 		close;
@@ -4676,7 +4654,7 @@ mjo_dun02,126,34,1	script	Grer#1	826,{
 		hideonnpc "Grer#1";
 		end;
 	}
-	else if(god_brising == 46) {
+	else if (god_brising == 46) {
 		mes "[Grer]";
 		mes "My name is Grer.";
 		mes "I should have been";
diff --git a/npc/quests/seals/god_global.txt b/npc/quests/seals/god_global.txt
index 817255060..94f6ae0f2 100644
--- a/npc/quests/seals/god_global.txt
+++ b/npc/quests/seals/god_global.txt
@@ -1,113 +1,44 @@
 //===== Hercules Script ======================================
-//= Variable Management NPC for the god item quest
-//===== By: ================================================== 
+//= God Item Quest - Variable Management
+//===== By: ==================================================
 //= MasterOfMuppets
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= Use this NPC if the seals quest variables get messed up.
 //===== Additional Comments: =================================
 //= 1.0 First version. [MasterOfMuppets]
 //= 1.1 Updated several aspects of the script. [L0ne_W0lf]
+//= 1.2 Renewal script update. [Euphy]
+//=    Added GM management function.
 //============================================================
 
 sec_in02,15,170,0	script	Golbal var	817,{
-	//mes "[Check]";
-	//mes "Please enter the password.";
-	//next;
-	//set .@check,68392411;
-	//dlgwrite 0 10000000
-	//if (check == input){
-	if (getgmlevel() > 98) {
+	callfunc "F_GM_NPC";
+	mes "[Check]";
+	mes "Please enter the password.";
+	next;
+	if (callfunc("F_GM_NPC",68392411,0) == 1) {
 		mes "[Check]";
 		mes "Please choose a menu.";
 		next;
-		switch(select("Now:No.1:No.2:No.3:No.4:Reset")) {
+		switch(select("Now:No.1:No.2:No.3:No.4:Reset:god_sl_1:god_eremes:god_brising:god_mjo_0:god_mjo_1:god_mjo_2:god_mjo_3:god_mjo_4")) {
 		case 1:
 			mes "^0000FF$God1^000000 = ^FF0000" + $God1 + "^000000.";
 			mes "^0000FF$God2^000000 = ^FF0000" + $God2 + "^000000.";
 			mes "^0000FF$God3^000000 = ^FF0000" + $God3 + "^000000.";
 			mes "^0000FF$God4^000000 = ^FF0000" + $God4 + "^000000.";
 			close;
-		case 2:
-			input .@input,0,100;
-			mes "[Check]";
-			mes "Would you like to change to "+.@input+"?";
-			next;
-			if (select("Yes:No") == 1) {
-				mes "[Check]";
-				mes "The command "+.@input+" has been confirmed.";
-				next;
-				set $God1,.@input;
-				mes "$God1 "+.@input+"";
-				close;
-			}
-			else {
-				mes "[Check]";
-				mes "The command has been canceled.";
-				close;
-			}
-		case 3:
-			input .@input,0,100;
-			mes "[Check]";
-			mes "Would you like to change to "+.@input+"?";
-			next;
-			if (select("Yes:No") == 1) {
-				mes "[Check]";
-				mes "The command "+.@input+" has been confirmed.";
-				next;
-				set $God2,.@input;
-				mes "$God2 "+.@input+"";
-				close;
-			}
-			else {
-				mes "[Check]";
-				mes "The command has been canceled.";
-				close;
-			}
-		case 4:
-			input .@input,0,100;
-			mes "[Check]";
-			mes "Would you like to change to "+.@input+"?";
-			next;
-			if (select("Yes:No") == 1) {
-				mes "[Check]";
-				mes "The command "+.@input+" has been confirmed.";
-				next;
-				set $God3,.@input;
-				mes "$God3 "+.@input+"";
-				close;
-			}
-			else {
-				mes "[Check]";
-				mes "The command has been canceled.";
-				close;
-			}
-		case 5:
-			input .@input,0,100;
-			mes "[Check]";
-			mes "Would you like to change to "+.@input+"?";
-			next;
-			if (select("Yes:No") == 1) {
-				mes "[Check]";
-				mes "The command "+.@input+" has been confirmed.";
-				next;
-				set $God4,.@input;
-				mes "$God4 "+.@input+"";
-				close;
-			}
-			else {
-				mes "[Check]";
-				mes "The command has been canceled.";
-				close;
-			}
+		case 2: callsub L_Number,"$God1"; break;
+		case 3: callsub L_Number,"$God2"; break;
+		case 4: callsub L_Number,"$God3"; break;
+		case 5: callsub L_Number,"$God4"; break;
 		case 6:
 			mes "[Check]";
 			mes "Are you really sure that you want to reset the entire list of God Globalvar?";
+			mes "Please enter the password.";
 			next;
-			if (select("Yes:No") == 1) {
+			if (callfunc("F_GM_NPC",68392411,0) == 1) {
 				mes "[Check]";
 				mes "Now, the entire list of God Globalvar is being reset.";
 				next;
@@ -120,18 +51,61 @@ sec_in02,15,170,0	script	Golbal var	817,{
 				mes "^0000FF$God3^000000 = ^FF0000" + $God3 + "^000000.";
 				mes "^0000FF$God4^000000 = ^FF0000" + $God4 + "^000000.";
 				close;
-			}
-			else {
+			} else {
 				mes "[Check]";
 				mes "The command has been canceled.";
 				close;
 			}
+		case 7: callsub L_Var,"god_sl_1"; break;
+		case 8: callsub L_Var,"god_eremes"; break;
+		case 9: callsub L_Var,"god_brising"; break;
+		case 10: callsub L_Var,"god_mjo_0"; break;
+		case 11: callsub L_Var,"god_mjo_1"; break;
+		case 12: callsub L_Var,"god_mjo_2"; break;
+		case 13: callsub L_Var,"god_mjo_3"; break;
+		case 14: callsub L_Var,"god_mjo_4"; break;
 		}
+	} else {
+		mes "[Check]";
+		mes "Incorrect password.";
+		close;
 	}
-	else {
+
+L_Number:
+	input .@input,0,$@god_check2;
+	mes "[Check]";
+	mes "Would you like to change to "+.@input+"?";
+	mes "Please enter the password.";
+	next;
+	if (callfunc("F_GM_NPC",68392411,0) == 1) {
 		mes "[Check]";
-		//mes "Incorrect password.";
-		mes "You cannot access this NPC.";
+		mes "The command "+.@input+" has been confirmed.";
+		next;
+		setd getarg(0),.@input;
+		mes getarg(0)+" "+.@input;
+		close;
+	} else {
+		mes "[Check]";
+		mes "The command has been canceled.";
 		close;
 	}
+
+L_Var:
+	input .@input;
+	setd getarg(0),.@input;
+	next;
+	mes "[Check]";
+	mes "Done.";
+	close;
+
+OnInit:
+	// Seals roll at 25/50 in Renewal and 50/100 in Pre-Renewal.
+	if (checkre(0)) {
+		set $@god_check1,25;
+		set $@god_check2,50;
+	} else {
+		set $@god_check1,50;
+		set $@god_check2,100;
+	}
+	end;
 }
diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt
index e0e5845d5..340b9a7f5 100644
--- a/npc/quests/seals/god_weapon_creation.txt
+++ b/npc/quests/seals/god_weapon_creation.txt
@@ -1,21 +1,20 @@
 //===== Hercules Script ======================================
-//= God items creation NPCs
+//= God Item Quest - Item Creation
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.3
 //===== Description: =========================================
-//= NPC that creates God Items
+//= Craft god items after the four seals are broken.
 //===== Additional Comments: =================================
 //= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
 //= 1.1 Updated several aspects of the script. [L0ne_W0lf]
 //= 1.2 Corrected several incorrect item IDs. [L0ne_W0lf]
+//= 1.3 Renewal script update. [Euphy]
+//=     Added GM management function.
 //============================================================
 
 gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
-	set .@GID,getcharid(2);
 	mes "[Dwarf Grunburti]";
 	mes "A human?!";
 	mes "This land is full";
@@ -69,8 +68,9 @@ gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
 		mes "At least I was fortunate enough to find this cave. We Dwarves are most cozy living underground, after all.";
 		close;
 	case 3:
-		if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
-			if (($God1 > 49) && ($God2 > 49) && ($God3 > 49) && ($God4 > 49) && (strcharinfo(0) == getguildmaster(.@GID))) {
+		set .@GID,getcharid(2);
+		if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
+			if (($God1 >= $@god_check1) && ($God2 >= $@god_check1) && ($God3 >= $@god_check1) && ($God4 >= $@god_check1) && (strcharinfo(0) == getguildmaster(.@GID))) {
 				mes "[Dwarf Grunburti]";
 				mes "Hmm...";
 				mes "I'll need some things to make a weapon for you. What exactly were you interested in having?";
@@ -340,7 +340,6 @@ gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
 		close;
 	}
 }
-
 gld_dun02,85,84,0	duplicate(GodDwarf)	Grunburti#2	826
 gld_dun03,92,105,0	duplicate(GodDwarf)	Grunburti#3	826
 gld_dun04,268,230,0	duplicate(GodDwarf)	Grunburti#4	826
@@ -376,7 +375,7 @@ que_god01,215,128,0	duplicate(GodEntrance)	 #que_godnpc2	111
 que_god01,213,128,0	duplicate(GodEntrance)	 #que_godnpc3	111
 
 que_god01,154,112,4	script	Grunburti#god	826,{
-	if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
+	if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
 		mes "[Dwarf Grunburti]";
 		mes "One of the godly";
 		mes "items has been created,";
@@ -463,7 +462,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 				mes "Never in my wildest";
 				mes "imaginings have I thought that I'd be crafting this masterpiece for a mere human. Give me a moment.";
 				next;
-				if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
+				if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
 					mes "[Dwarf Grunburti]";
 					mes "But...";
 					mes "The seals";
@@ -543,7 +542,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 				mes "I'd never believe that";
 				mes "something so powerful and dangerous as Megingjard would end up in the hands of a human...";
 				next;
-				if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
+				if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
 					mes "[Dwarf Grunburti]";
 					mes "But...";
 					mes "The seals";
@@ -630,7 +629,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 				mes "used by a human.";
 				mes "Give me a moment...";
 				next;
-				if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
+				if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
 					mes "[Dwarf Grunburti]";
 					mes "But...";
 					mes "The seals";
@@ -718,7 +717,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 				mes "or you will regret it.";
 				mes "Mark my words...";
 				next;
-				if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
+				if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
 					mes "[Dwarf Grunburti]";
 					mes "But...";
 					mes "The seals";
@@ -787,39 +786,60 @@ OnTimer610000:
 	end;
 
 OnTimer612000:
-	areawarp "que_god01",154,67,4,7,"prontera",156,324;
-	areawarp "que_god01",154,82,4,7,"prontera",156,324;
-	areawarp "que_god01",145,99,9,9,"prontera",156,324;
-	areawarp "que_god01",164,99,9,9,"prontera",156,324;
-	areawarp "que_god01",145,118,9,9,"prontera",156,324;
-	areawarp "que_god01",164,118,9,9,"prontera",156,324;
+	donpcevent "god_wep_warpmaster::OnEnable";
 	end;
 
 OnTimer615000:
 	donpcevent "god_wep_warpmaster::OnDisable";
-	donpcevent " #god_hopewarp1::Onreset";
+	donpcevent "#god_hopewarp1::OnReset";
 	stopnpctimer;
 	end;
 }
 
-/*
-que_god01,293,3,0	script	Godly Item Quests Related#god	90,{
+que_god01,169,82,0	script	god_wep_warpmaster	-1,{
+OnEnable:
+	for(set .@i,1; .@i<=6; set .@i,.@i+1)
+		enablenpc "god_failwarp#"+.@i;
+	end;
+OnDisable:
+	for(set .@i,1; .@i<=6; set .@i,.@i+1)
+		disablenpc "god_failwarp#"+.@i;
+	end;
+}
+
+que_god01,154,67,0	script	god_failwarp#1	-1,4,7,{
+OnInit:
+	disablenpc strnpcinfo(0);
+	end;
+OnTouch:
+	warp "prontera",156,324;
+	end;
+}
+que_god01,154,82,0	duplicate(god_failwarp#1)	god_failwarp#2	-1,4,7
+que_god01,145,99,0	duplicate(god_failwarp#1)	god_failwarp#3	-1,9,9
+que_god01,164,99,0	duplicate(god_failwarp#1)	god_failwarp#4	-1,9,9
+que_god01,145,118,0	duplicate(god_failwarp#1)	god_failwarp#5	-1,9,9
+que_god01,164,118,0	duplicate(god_failwarp#1)	god_failwarp#6	-1,9,9
+
+// Original name: "Godly Item Quests Related#god"
+que_god01,293,3,0	script	Godly Item Quests#god	90,{
+	callfunc "F_GM_NPC";
 	mes "[Use in case of emergency]";
 	mes "Please enter password.";
 	mes "If you wish to cancel, please enter 0.";
 	next;
-	input .@input,0,4001;
-	if (.@input < 0 || .@input > 4000) {
+	set .@i, callfunc("F_GM_NPC",1854,0,0,4000);
+	if (.@i == -2) {
 		mes "[Use in case of emergency]";
 		mes "Password is incorrect.";
 		close;
-	}
-	else if(.@input == 0) {
+	} else if (.@i == -1) {
 		mes "[Use in case of emergency]";
 		mes "You have canceled your request.";
 		close;
-	}
-	else if(.@input == 1854) {
+	} else if (.@i == 0) {
+		close;
+	} else {
 		mes "[Use in case of emergency]";
 		mes "What services would you like to use?";
 		next;
@@ -828,12 +848,7 @@ que_god01,293,3,0	script	Godly Item Quests Related#god	90,{
 			mes "[Use in case of emergency]";
 			mes "Press the 'Next' button to turn off warps.";
 			next;
-			areawarp "que_god01",154,67,4,7,"prontera",156,324;
-			areawarp "que_god01",154,82,4,7,"prontera",156,324;
-			areawarp "que_god01",145,99,9,9,"prontera",156,324;
-			areawarp "que_god01",164,99,9,9,"prontera",156,324;
-			areawarp "que_god01",145,118,9,9,"prontera",156,324;
-			areawarp "que_god01",164,118,9,9,"prontera",156,324;
+			donpcevent "god_wep_warpmaster::OnDisable";
 			mes "[Use in case of emergency]";
 			mes "You have successfully turned off warps.";
 			close;
@@ -849,11 +864,10 @@ que_god01,293,3,0	script	Godly Item Quests Related#god	90,{
 			mes "[Use in case of emergency]";
 			mes "Please press the 'Next' button to reset the arena chat room in que_god01.";
 			next;
-			donpcevent " #god_hopewarp1::Onreset";
+			donpcevent "#god_hopewarp1::OnReset";
 			mes "[Use in case of emergency]";
 			mes "You have successfully reset the arena chat room (Laboratory Entrance 1/2).";
 			close;
 		}
 	}
 }
-*/
diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index 4f210710b..933afb4b0 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -1,10 +1,10 @@
 //===== Hercules Script ======================================
-//= Megingjard seal unlocking NPCs.
-//===== By: ================================================== 
+//= God Item Quest - Megingjard Seal
+//===== By: ==================================================
 //= SinSloth
-//===== Current Version: ===================================== 
-//= 1.9
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.2
+//===== Description: =========================================
 //= Quest for breaking the seal of Megingjard.
 //===== Additional Comments: =================================
 //= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
@@ -17,9 +17,16 @@
 //= 1.7 Replaced effect numerics with constants. [Samuray22]
 //= 1.8 Corrected how exp reward is applied. [L0ne_W0lf]
 //= 1.9 Fixed some input checks and variable types. [brianluau]
+//= 2.0 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.1 Fixed minor bug with the Librarian Jekan
+//= 2.2 Renewal script update. [Euphy]
 //============================================================
 
 prt_castle,44,151,0	script	Rebarev Doug	56,{
+	if (checkweight(1301,3) == 0) {
+		mes "- You are carrying too many items! -";
+		close;
+	}
 	cutin "god_rebeireb",2;
 	if ((countitem(7080) > 3) && (countitem(7081) > 4) && (countitem(7082) > 3) && (countitem(7084) > 2) && (countitem(7085) > 2)) {
 		mes "[Rebarev Doug]";
@@ -50,7 +57,7 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 			break;
 		}
 	}
-	if ($God1 < 50) {
+	if ($God1 < $@god_check1) {
 		mes "[Rebarev Doug]";
 		mes "We are Crusaders that have";
 		mes "been training in preparation";
@@ -136,9 +143,9 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 			break;
 		}
 	}
-	else if($God1 > 49 && $God2 < 100) {
-		if(BaseLevel > 59) {
-			if(god_eremes == 0) {
+	else if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (BaseLevel > 59) {
+			if (god_eremes == 0) {
 				mes "[Rebarev Doug]";
 				mes "...";
 				next;
@@ -260,8 +267,8 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 					break;
 				}
 			}
-			else if(god_eremes > 0 && god_eremes < 4) {
-				if(rand(1,10) > 6 && god_eremes == 2) {
+			else if (god_eremes > 0 && god_eremes < 4) {
+				if (rand(1,10) > 6 && god_eremes == 2) {
 					mes "[Rebarev Doug]";
 					mes "I wonder how my old";
 					mes "comrades are doing now.";
@@ -357,7 +364,7 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 					}
 				}
 			}
-			else if(god_eremes > 3 && god_eremes < 18) {
+			else if (god_eremes > 3 && god_eremes < 18) {
 				mes "[Rebarev Doug]";
 				mes "Huh...?";
 				mes "The librarian";
@@ -378,8 +385,8 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 				mes "Oh...";
 				mes "It might be helpful to know that we were the ^660000Crusader Third Company, Third Platoon, First Squad^000000.";
 			}
-			else if(god_eremes > 17 && god_eremes < 20) {
-				if(god_megin_1 > 0 || god_megin_2 > 0 || god_megin_3 > 0 || god_megin_4 > 0 || god_megin_5 > 0 || god_megin_6 > 0) {
+			else if (god_eremes > 17 && god_eremes < 20) {
+				if (god_megin_1 > 0 || god_megin_2 > 0 || god_megin_3 > 0 || god_megin_4 > 0 || god_megin_5 > 0 || god_megin_6 > 0) {
 					mes "[Rebarev Doug]";
 					mes "Oh...";
 					mes "So did you meet them?";
@@ -417,7 +424,7 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 					mes "are doing for me.";
 				}
 			}
-			else if(god_eremes > 19 && god_eremes < 23) {
+			else if (god_eremes > 19 && god_eremes < 23) {
 				mes "[Rebarev Doug]";
 				mes "Welcome back~";
 				mes "It's been a while since I've last seen you. Have you met the rest";
@@ -465,7 +472,7 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 					break;
 				}
 			}
-			else if(god_eremes > 22 && god_eremes < 25) {
+			else if (god_eremes > 22 && god_eremes < 25) {
 				mes "^3355FFYou confront";
 				mes "Rebarev Doug with the";
 				mes "information you learned";
@@ -495,7 +502,7 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 				mes "If at least 100 people report the same crime, then maybe he'll hold";
 				mes "a trial. But do you really want to reveal this to the public?";
 			}
-			else if(god_eremes > 23 && god_eremes < 26) {
+			else if (god_eremes > 23 && god_eremes < 26) {
 				mes "[Rebarev Doug]";
 				mes "I didn't think";
 				mes "you'd actually do it.";
@@ -530,8 +537,8 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 }
 
 prt_castle,48,164,0	script	Crusader#God	734,{
-	if($God1 > 49 && $God2 < 100) {
-		if(god_eremes > 22 && god_eremes < 25) {
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes > 22 && god_eremes < 25) {
 			mes "[Max Von Shedough]";
 			mes "Welcome, friend!";
 			mes "Here in the Prontera Castle, we Crusaders are busily preparing for the Holy War that is to come.";
@@ -554,24 +561,24 @@ prt_castle,48,164,0	script	Crusader#God	734,{
 			mes "[Max Von Shedough]";
 			mes "However, as of now, the petition you've just given me is considered classified information. Please keep this a military secret.";
 			set $God2,$God2+1;
-			if($God2 == 50) {
+			if ($God2 == $@god_check1) {
 				announce "The 2nd seal of [Megingjard] has appeared.",bc_all;
 			}
-			else if($God1 > 99 && $God2 > 99 && $God3 > 99 && $God4 > 99) {
-				announce "Four seals have been released at the same time with the seal of [Megingjard].",bc_all;
-			}
-			else if($God2 > 99) {
-				announce "The 2nd seal of [Megingjard] has been released.",bc_all;
+			else if ($God2 == $@god_check2) {
+				if ($God1 == $@god_check2 && $God2 == $@god_check2 && $God3 == $@god_check2 && $God4 == $@god_check2)
+					announce "Four seals have been released at the same time with the seal of [Megingjard].",bc_all;
+				else
+					announce "The 2nd seal of [Megingjard] has been released.",bc_all;
 			}
-			if(god_eremes == 23) {
+			if (god_eremes == 23) {
 				set god_eremes,25;
 			}
-			else if(god_eremes == 24) {
+			else if (god_eremes == 24) {
 				set god_eremes,26;
 			}
 			close;
 		}
-		else if(god_eremes > 26) {
+		else if (god_eremes > 26) {
 			mes "[Max Von Shedough]";
 			mes "Unfortunately, I'm not sure if it's possible to hold a trial against Rebarev Doug.";
 			next;
@@ -609,13 +616,13 @@ prt_castle,48,164,0	script	Crusader#God	734,{
 }
 
 prt_in,172,109,0	script	A File#megin1	111,{
-	if(god_eremes == 12) {
+	if (god_eremes == 12) {
 		mes "^3355FFYou have found";
 		mes "^660000The 3rd Platoon Records^3355FF!^000000";
 		close;
 	}
-	else if(god_eremes > 6 && god_eremes < 12) {
-		if(rand(1,10) > 6 && god_eremes > 6) {
+	else if (god_eremes > 6 && god_eremes < 12) {
+		if (rand(1,10) > 6 && god_eremes > 6) {
 			mes "^3355FFYou see a shelf filled with many files. You begin searching through them, one by one.^000000";
 			set god_eremes,god_eremes+1;
 			close;
@@ -625,18 +632,13 @@ prt_in,172,109,0	script	A File#megin1	111,{
 			close2;
 		}
 	}
-	else if(god_eremes < 7) {
+	else if (god_eremes < 7) {
 		mes "[Librarian Jekan]";
-		if(Sex) {
-			mes "I'm sorry sir,";
-		}
-		else {
-			mes "I'm sorry ma'am,";
-		}
+		mes "I'm sorry "+((Sex)?"sir":"ma'am")+",";
 		mes "but special authorization is required to browse that section. Otherwise, it's off limits.";
 		close;
 	}
-	 else {
+	else {
 		mes "[Librarian Jekan]";
 		mes "W-wait...!";
 		mes "That section";
@@ -646,11 +648,11 @@ prt_in,172,109,0	script	A File#megin1	111,{
 }
 
 prt_in,170,109,0	script	A File#megin2	111,{
-	if(god_eremes == 12) {
+	if (god_eremes == 12) {
 		mes "You have found ^0000FFThe 3rd Platoon Records^000000!";
 		close;
 	}
-	else if(god_eremes > 6 && god_eremes < 12) {
+	else if (god_eremes > 6 && god_eremes < 12) {
 		if (rand(1,10) > 6 && god_eremes > 6) {
 			mes "^3355FFYou see a shelf filled with many files. You begin searching through them, one by one.^000000";
 			set god_eremes,god_eremes+1;
@@ -661,7 +663,7 @@ prt_in,170,109,0	script	A File#megin2	111,{
 			close;
 		}
 	}
-	else if(god_eremes < 7) {
+	else if (god_eremes < 7) {
 		mes "[Librarian Jekan]";
 		mes "W-wait...!";
 		mes "That section";
@@ -678,12 +680,12 @@ prt_in,170,109,0	script	A File#megin2	111,{
 }
 
 prt_in,168,109,0	script	A File#megin3	111,{
-	if(god_eremes == 12) {
+	if (god_eremes == 12) {
 		mes "You have found";
 		mes "^0000FFThe 3rd Platoon Records^000000!";
 		close;
 	}
-	else if(god_eremes > 6 && god_eremes < 12) {
+	else if (god_eremes > 6 && god_eremes < 12) {
 		if (rand(1,10) > 6 && god_eremes > 6) {
 			mes "^3355FFYou see a shelf filled with many files. You begin searching through them, one by one.^000000";
 			set god_eremes,god_eremes+1;
@@ -694,7 +696,7 @@ prt_in,168,109,0	script	A File#megin3	111,{
 			close;
 		}
 	}
-	else if(god_eremes < 7) {
+	else if (god_eremes < 7) {
 		mes "[Librarian Jekan]";
 		mes "W-wait...!";
 		mes "That section";
@@ -711,11 +713,11 @@ prt_in,168,109,0	script	A File#megin3	111,{
 }
 
 prt_in,169,109,0	script	A File#megin4	111,{
-	if(god_eremes == 12) {
+	if (god_eremes == 12) {
 		mes "You have found ^0000FFThe 3rd Platoon Records^000000!";
 		close;
 	}
-	else if(god_eremes > 6 && god_eremes < 12) {
+	else if (god_eremes > 6 && god_eremes < 12) {
 		if (rand(1,10) > 6 && god_eremes > 6) {
 			mes "^3355FFYou see a shelf filled with many files. You begin searching through them, one by one.^000000";
 			set god_eremes,god_eremes+1;
@@ -726,7 +728,7 @@ prt_in,169,109,0	script	A File#megin4	111,{
 			close;
 		}
 	}
-	else if(god_eremes < 7) {
+	else if (god_eremes < 7) {
 		mes "[Librarian Jekan]";
 		mes "W-wait...!";
 		mes "That section";
@@ -743,12 +745,12 @@ prt_in,169,109,0	script	A File#megin4	111,{
 }
 
 prt_in,166,109,0	script	A File#megin5	111,{
-	if(god_eremes == 12) {
+	if (god_eremes == 12) {
 		mes "You have found";
 		mes "^0000FFThe 3rd Platoon Records^000000!";
 		close;
 	}
-	else if(god_eremes > 6 && god_eremes < 12) {
+	else if (god_eremes > 6 && god_eremes < 12) {
 		if (rand(1,10) > 6 && god_eremes > 6) {
 			mes "^3355FFYou see a shelf filled with many files. You begin searching through them, one by one.^000000";
 			set god_eremes,god_eremes+1;
@@ -759,7 +761,7 @@ prt_in,166,109,0	script	A File#megin5	111,{
 			close;
 		}
 	}
-	else if(god_eremes < 7) {
+	else if (god_eremes < 7) {
 		mes "[Librarian Jekan]";
 		mes "W-wait...!";
 		mes "That section";
@@ -776,8 +778,8 @@ prt_in,166,109,0	script	A File#megin5	111,{
 }
 
 prt_in,172,106,0	script	Librarian#megin	833,{
-	if($God1 > 49 && $God2 < 100) {
-		if(god_eremes > 2 && god_eremes < 7) {
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes > 2 && god_eremes < 7) {
 			mes "[Librarian Jekan]";
 			mes "Ah, please do";
 			mes "not touch the files";
@@ -800,8 +802,8 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 			mes "[Librarian Jekan]";
 			mes "Darn it...!";
 			mes "I can't read anything when the light is this dim! It's bad enough my eyes have gone bad...";
-			next;
 			while(1) {
+				next;
 				switch(select("You have bad eyes?:I want to read some documents.:Let me help you find those files...:What kind of files are you looking for?")) {
 				case 1:
 					mes "[Librarian Jekan]";
@@ -809,7 +811,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 					mes "under dim light";
 					mes "for so long, my eyes have";
 					mes "gone bad. They should get me ^0000FFa new light^000000, otherwise I'll go blind sooner or later...";
-					if(god_eremes == 5 && ( countitem(2203) > 0 || countitem(1041) > 0 ) ) {
+					if (god_eremes == 5 && (countitem(2203) > 0 || countitem(1041) > 0)) {
 						next;
 						mes "[Librarian Jekan]";
 						mes "Hey, that's some pretty useful stuff that you've got with you. Do you mind letting me borrow it for a while? It'll help me in finding those files...";
@@ -825,14 +827,14 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 							mes "Oh, you are so kind!";
 							mes "Y-you really do want";
 							mes "to help me, don't you?";
-							if(countitem(2203) && countitem(1041)) {
-								delitem 1041,countitem(1041);  //Lantern
-								delitem 2203,1;  //Spectacles
+							if (countitem(2203) && countitem(1041)) {
+								delitem 1041,countitem(1041); //Lantern
+								delitem 2203,1; //Spectacles
 							}
-							else if(countitem(2203)) {
+							else if (countitem(2203)) {
 								delitem 2203,1;
 							}
-							else if(countitem(1041)) {
+							else if (countitem(1041)) {
 								delitem 1041,countitem(1041);
 							}
 							set god_eremes,6;
@@ -850,7 +852,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 							close;
 						}
 					}
-					else if(god_eremes > 5) {
+					else if (god_eremes > 5) {
 						next;
 						mes "[Librarian Jekan]";
 						mes "Thank you...";
@@ -861,7 +863,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 					}
 					break;
 				case 2:
-					if(god_eremes == 6) {
+					if (god_eremes == 6) {
 						mes "[Librarian Jekan]";
 						mes "Read some documents?";
 						mes "Well, you've come here";
@@ -894,7 +896,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						close;
 					}
 				case 3:
-					if(god_eremes == 4) {
+					if (god_eremes == 4) {
 						mes "[Librarian Jekan]";
 						mes "I'd gladly accept your";
 						mes "help if it weren't for the fact that I cannot allow classified information to be released to the public.";
@@ -910,7 +912,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "Working as a government official is easy except for the times when the beaucrats make you do stuff like this.";
 						set god_eremes,5;
 					}
-					else if(god_eremes > 4) {
+					else if (god_eremes > 4) {
 						mes "[Librarian Jekan]";
 						mes "I think I'm going to go";
 						mes "insane looking for this file...!";
@@ -954,7 +956,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 				}
 			}
 		}
-		else if(god_eremes == 2) {
+		else if (god_eremes == 2) {
 			mes "[Librarian Jekan]";
 			mes "Ah, please do not touch the files in this section. Usually, it's public domain but it seems that a classified file managed to get misplaced there.";
 			next;
@@ -999,8 +1001,8 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 				close;
 			}
 		}
-		else if(god_eremes > 6 && god_eremes < 12) {
-			if(rand(1,10) > 4) {
+		else if (god_eremes > 6 && god_eremes < 12) {
+			if (rand(1,10) > 4) {
 				mes "[Librarian Jekan]";
 				mes "Hmm? So did you find it? I've been searching for that file for a long time, but I haven't been able to find it.";
 				next;
@@ -1015,7 +1017,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 				mes "I'll go ahead and check the left side, so would you look for it in the middle or the right side?";
 			}
 		}
-		else if(god_eremes == 12) {
+		else if (god_eremes == 12) {
 			mes "[Librarian Jekan]";
 			mes "Ah! There it is!";
 			mes "Thank you so much!";
@@ -1056,8 +1058,8 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 			set god_eremes,13;
 			close;
 		}
-		else if(god_eremes == 13) {
-			if(countitem(7111) > 1 && countitem(7151) && countitem(1024) > 2 && countitem(916) > 2 && countitem(717) > 19) {
+		else if (god_eremes == 13) {
+			if (countitem(7111) > 1 && countitem(7151) && countitem(1024) > 2 && countitem(916) > 2 && countitem(717) > 19) {
 				mes "[Librarian Jekan]";
 				mes "Oh, you came back.";
 				mes "I didn't expect you to return here so quickly. Whatever's inside must be really important for you to know.";
@@ -1100,8 +1102,8 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 				close;
 			}
 		}
-		else if(god_eremes > 13 && god_eremes < 16) {
-			if(rand(1,10) > 4) {
+		else if (god_eremes > 13 && god_eremes < 16) {
+			if (rand(1,10) > 4) {
 				mes "[Librarian Jekan]";
 				mes "Let me go over and review the document before I make a copy...";
 			}
@@ -1112,7 +1114,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 			}
 			close;
 		}
-		else if(god_eremes == 16) {
+		else if (god_eremes == 16) {
 			mes "[Librarian Jekan]";
 			mes "There you go. As I thought, the document didn't seem to contain any crucially important data.";
 			next;
@@ -1121,7 +1123,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 			set god_eremes,17;
 			close;
 		}
-		else if(god_eremes > 16) {
+		else if (god_eremes > 16) {
 			mes "[Librarian Jekan]";
 			mes "Welcome, my friend!";
 			mes "So, what do you need today?";
@@ -1206,7 +1208,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 								}
 							}
 						}
-						else if(compare(.@input$,"3rd_platoon") == 1) {
+						else if (compare(.@input$,"3rd_platoon") == 1) {
 							mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 							mes "Each Company consists";
 							mes "of 4 Platoons. Please";
@@ -1214,13 +1216,13 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 							next;
 							close2;
 						}
-						else if(compare(.@input$,"1st_squad") == 1) {
+						else if (compare(.@input$,"1st_squad") == 1) {
 							mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 							mes "The 1st Squad : Crusaders.";
 							mes "Each platoon consists of 4 squads. Please specify Company and Platoon for information on a specific squad.^000000";
 							close2;
 						}
-						else if(compare(.@input$,"record") == 1) {
+						else if (compare(.@input$,"record") == 1) {
 							mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 							mes "- No result has been found.-";
 							close2;
@@ -1298,28 +1300,28 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 							}
 						}
 					}
-					else if(compare(.@input$,"3rd_platoon") == 1) {
+					else if (compare(.@input$,"3rd_platoon") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "The 3rd Platoon : ";
 						mes "- No result has been found.-";
 						mes "- Suggested to enter a more specific keyword.-";
 						close2;
 					}
-					else if(compare(.@input$,"1st_squad") == 1) {
+					else if (compare(.@input$,"1st_squad") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "The 3rd Company : ";
 						mes "- No result has been found.-";
 						mes "- Suggested to enter a more specific keyword.-";
 						close2;
 					}
-					else if((compare(.@input$,"record") == 1) && (god_eremes > 17)) {
+					else if ((compare(.@input$,"record") == 1) && (god_eremes > 17)) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "- No result has been found.-";
 						mes "- Suggested to enter a specific name of the force for a better research.-";
 						next;
 						close2;
 					}
-					else if(compare(.@input$,"rebarev_doug") == 1) {
+					else if (compare(.@input$,"rebarev_doug") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former leader of";
 						mes "3rd Company, 3rd Platoon,";
@@ -1331,12 +1333,12 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Prontera Castle, Prontera^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"egnigem") == 1) {
+					else if (compare(.@input$,"egnigem") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "^FF0000Prohibited Search Term!^000000";
 						close2;
 					}
-					else if(compare(.@input$,"zan.huadoku") == 1) {
+					else if (compare(.@input$,"zan.huadoku") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1348,7 +1350,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Blacksmith Guild, Geffen^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"cuaque_donon") == 1) {
+					else if (compare(.@input$,"cuaque_donon") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1360,7 +1362,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Inn, Morroc^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"jack_o") == 1) {
+					else if (compare(.@input$,"jack_o") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1371,7 +1373,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Alberta Port^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"emma_searth") == 1) {
+					else if (compare(.@input$,"emma_searth") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1383,7 +1385,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Al De Baran^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"royal_myst") == 1) {
+					else if (compare(.@input$,"royal_myst") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1394,7 +1396,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Casino, Comodo^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"the_nineball") == 1) {
+					else if (compare(.@input$,"the_nineball") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1534,8 +1536,8 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 }
 
 geffen_in,109,161,3	script	Crusader#God1	751,{
-	if($God1 > 49 && $God2 < 100) {
-		if(god_eremes > 17 && god_megin_1 < 2) {
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes > 17 && god_megin_1 < 2) {
 			mes "[Zan.Huadoku]";
 			mes "^333333*Phew...*^000000";
 			mes "This work is really getting to me. Going on a mission with my war buddies sounds a lot better than this.";
@@ -1550,7 +1552,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 			next;
 			switch(select("Ask him about the 1st Squad.:Ask him how he's been doing.:Ask him about the 1st Squad's last mission.")) {
 			case 1:
-				if(god_eremes == 18) {
+				if (god_eremes == 18) {
 					mes "[Zan.Huadoku]";
 					mes "Yeah, I was a member of the 1st Squad in the 3rd Platoon a long time ago. How did you know that?";
 					next;
@@ -1560,7 +1562,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 					mes "^3355FFYou tell Zan about Rebarev Doug, and about how he is now an instructor for Crusader Boot Camp. He seems to be absorbed in his thoughts of the past.^000000";
 					close;
 				}
-				else if(god_eremes > 18) {
+				else if (god_eremes > 18) {
 					mes "[Zan.Huadoku]";
 					mes "Yeah, I was a member of the 1st Squad in the 3rd Platoon a long time ago. How did you know that?";
 					next;
@@ -1594,7 +1596,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 					next;
 					mes "[Zan.Huadoku]";
 					mes "^3355FFZan looks very confused and his eyes begin to glaze with a dazed look. You try speaking to him again, but he doesn't respond at all.^000000";
-					if(!god_megin_1) {
+					if (!god_megin_1) {
 						set god_megin_1,1;
 					}
 					close;
@@ -1614,7 +1616,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 				mes "A lot of people have been asking me weird questions about me recently. I feel like I'm getting spied on, but maybe I'm just getting paranoid.";
 				close;
 			case 3:
-				if(god_eremes == 18) {
+				if (god_eremes == 18) {
 					mes "[Zan.Huadoku]";
 					mes "Yeah, on our";
 					mes "final mission...";
@@ -1629,7 +1631,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 					mes "^3355FFZan seems to be having a very difficult time recalling that specific memory of his past.^000000";
 					close;
 				}
-				else if(god_eremes > 18 && god_megin_1 > 0) {
+				else if (god_eremes > 18 && god_megin_1 > 0) {
 					mes "[Zan.Huadoku]";
 					mes "The last mission...";
 					next;
@@ -1665,7 +1667,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 					mes "I can't think about anything further than that. I can't even remember what we found. But I'm sure it was damned important.";
 					next;
 					mes "^3355FFZan stood still in silence, with a pained look on his face.^000000";
-					if(god_megin_1 == 1) {
+					if (god_megin_1 == 1) {
 						set god_megin_1,2;
 					}
 					close;
@@ -1684,7 +1686,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 				}
 			}
 		}
-		else if(god_megin_1 > 1 && god_megin_1 < 3) {
+		else if (god_megin_1 > 1 && god_megin_1 < 3) {
 			mes "...";
 			next;
 			mes "...";
@@ -1708,7 +1710,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 			set god_megin_1,3;
 			close;
 		}
-		else if(god_megin_1 > 2) {
+		else if (god_megin_1 > 2) {
 			mes "^3355FFGrabbing his head,";
 			mes "tearing his hair and writhing in Agony, Zan kept repeating the same words over and over again...^000000";
 			next;
@@ -1788,8 +1790,8 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 }
 
 morocc_in,146,179,0	script	Employee#megin1	66,{
-	if($God1 > 49 && $God2 < 100) {
-		if(god_eremes > 17 && god_megin_2 < 1) {
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes > 17 && god_megin_2 < 1) {
 			mes "^3355FFThe Inn Employee";
 			mes "eyes you suspiciously.^000000";
 			next;
@@ -1812,7 +1814,7 @@ morocc_in,146,179,0	script	Employee#megin1	66,{
 					mes "here, maybe?";
 					close;
 				}
-				else if(god_eremes > 18) {
+				else if (god_eremes > 18) {
 					next;
 					mes "^3355FFOnce you said that name, she immediately drew closer to you";
 					mes "and began speaking in a low, threatening tone.^000000";
@@ -1826,7 +1828,7 @@ morocc_in,146,179,0	script	Employee#megin1	66,{
 					next;
 					switch(select("Rebarev Doug sent me!:Wait, is he in hiding?:Just... curious.")) {
 					case 1:
-						if(rand(1,10) > 3) {
+						if (rand(1,10) > 3) {
 							mes "[Ms. Scary Inn Employee]";
 							mes "Rebarev Doug...?!";
 							mes "That old coot must be afraid";
@@ -1863,7 +1865,7 @@ morocc_in,146,179,0	script	Employee#megin1	66,{
 							close;
 						}
 					case 2:
-						if(rand(1,10) > 4) {
+						if (rand(1,10) > 4) {
 							mes "[Ms. Scary Inn Employee]";
 							mes "Right.";
 							mes "If you're here";
@@ -1954,7 +1956,7 @@ morocc_in,146,179,0	script	Employee#megin1	66,{
 				close2;
 			}
 		}
-		else if(god_megin_2 > 0) {
+		else if (god_megin_2 > 0) {
 			mes "[Inn Employee]";
 			mes "Welcome to the Inn.";
 			mes "When you move to the entrance, you can also enter a PvP zone though a PvP doorman.";
@@ -1993,8 +1995,8 @@ morocc_in,146,179,0	script	Employee#megin1	66,{
 }
 
 in_rogue,243,61,0	script	Suspicious Man#megin	748,{
-	if($God1 > 49 && $God2 < 100) {
-		if(god_eremes == 18) {
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes == 18) {
 			mes "[Cuaque Donon]";
 			mes "Wh-who are you?!";
 			mes "How the hell did";
@@ -2003,8 +2005,8 @@ in_rogue,243,61,0	script	Suspicious Man#megin	748,{
 			mes "Geeeet awwwway!";
 			close;
 		}
-		else if(god_eremes > 18) {
-			if(god_megin_2 > 0 && god_megin_2 < 4) {
+		else if (god_eremes > 18) {
+			if (god_megin_2 > 0 && god_megin_2 < 4) {
 				mes "[Cuaque Donon]";
 				mes "Wh-who are you?!";
 				mes "How the hell did";
@@ -2018,31 +2020,31 @@ in_rogue,243,61,0	script	Suspicious Man#megin	748,{
 					if (countitem(740) > 0) {
 						set .@toy$,"Puppet";
 					}
-					else if(countitem(741) > 0) {
+					else if (countitem(741) > 0) {
 						set .@toy$,"Poring Doll";
 					}
-					else if(countitem(742) > 0) {
+					else if (countitem(742) > 0) {
 						set .@toy$,"Chonchon Doll";
 					}
-					else if(countitem(743) > 0) {
+					else if (countitem(743) > 0) {
 						set .@toy$,"Spore Doll";
 					}
 					else if (countitem(744) > 0) {
 						set .@toy$,"Baphomet Doll";
 					}
-					else if(countitem(751) > 0) {
+					else if (countitem(751) > 0) {
 						set .@toy$,"Osiris Doll";
 					}
-					else if(countitem(752) > 0) {
+					else if (countitem(752) > 0) {
 						set .@toy$,"Rocker Doll";
 					}
-					else if(countitem(753) > 0) {
+					else if (countitem(753) > 0) {
 						set .@toy$,"Yoyo Doll";
 					}
-					else if(countitem(754) > 0) {
+					else if (countitem(754) > 0) {
 						set .@toy$,"Racoon Doll";
 					}
-					else if(countitem(7206) > 0) {
+					else if (countitem(7206) > 0) {
 						set .@toy$,"Black Cat Doll";
 					}
 					else {
@@ -2262,8 +2264,8 @@ in_rogue,243,61,0	script	Suspicious Man#megin	748,{
 }
 
 alberta,196,146,0	script	Crusader#megin2	751,{
-	if ($God1 > 49 && $God2 < 100) {
-		if(god_eremes == 18) {
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes == 18) {
 			mes "[Jack O]";
 			mes "^333333*Yawn...*^000000";
 			mes "It's quiet and boring, as per usual. Let's see if there's any Swordmen I can recruit today.";
@@ -2453,14 +2455,18 @@ alberta,196,146,0	script	Crusader#megin2	751,{
 }
 
 aldebaran,66,213,0	script	Lady#megin	69,{
-	if ($God1 > 49 && $God2 < 100) {
-		if(god_eremes == 18) {
+	if (checkweight(1301,3) == 0) {
+		mes "- You are carrying too many items!";
+		close;
+	}
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes == 18) {
 			mes "[Emma Searth]";
 			mes "^333333*Sigh...*^000000 I haven't gotten any response from them. I don't know";
 			mes "if I can wait much longer to join the Kafra Corporation.";
 			close;
 		}
-		else if(god_eremes > 18 && god_eremes < 26) {
+		else if (god_eremes > 18 && god_eremes < 26) {
 			if (god_megin_4 < 2) {
 				mes "[Emma Searth]";
 				mes "^333333*Sigh...*^000000 I haven't gotten any response from them. I don't know";
@@ -2610,7 +2616,7 @@ aldebaran,66,213,0	script	Lady#megin	69,{
 					}
 				}
 			}
-			else if(god_megin_4 > 1) {
+			else if (god_megin_4 > 1) {
 				mes "[Emma Searth]";
 				mes "^0000FFJack O, The Nineball, Zan.Huadoku, Cuaque Donon, Egnigem.^000000 Oh, I really miss those guys...";
 				close;
@@ -2646,7 +2652,27 @@ aldebaran,66,213,0	script	Lady#megin	69,{
 			mes "I really appreciate you coming here to talk to me about the old days. I, I want you to have this.";
 			set god_eremes,28;
 			getitem 603,1; // Old_Blue_Box
-			getexp 122036,0;
+			if (checkre(3)) {
+				if (BaseLevel < 56) getexp 2700,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 3000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 5605,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 8223,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 21227,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 39073,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 45102,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 54615,0;
+				else getexp 122035,0;
+			} else {
+				if (BaseLevel < 56) getexp 27000,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 30000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 56052,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 82233,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 212271,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 390738,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 451020,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 546156,0;
+				else getexp 1220358,0;
+			}
 			close;
 		}
 		else if (god_eremes == 28) {
@@ -2678,7 +2704,7 @@ aldebaran,66,213,0	script	Lady#megin	69,{
 }
 
 cmd_in02,190,94,3	script	Man#megin	828,{
-	if ($God1 > 49 && $God2 < 100) {
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
 		if (god_eremes == 18) {
 			mes "[Royal Myst]";
 			mes "Wha...?";
@@ -2731,7 +2757,7 @@ cmd_in02,190,94,3	script	Man#megin	828,{
 				mes "which one do I bet on...?";
 				next;
 			}
-			else if(god_megin_6 > 0) {
+			else if (god_megin_6 > 0) {
 				mes "[Royal Myst]";
 				mes "Hmm?";
 				mes "What's up?";
@@ -2882,7 +2908,7 @@ cmd_in02,190,94,3	script	Man#megin	828,{
 }
 
 jawaii_in,44,110,0	script	Security Officer#megin	734,{
-	if ($God1 > 49 && $God2 < 100) {
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
 		if (god_eremes == 18) {
 			mes "[The Nineball]";
 			mes "Welcome to Jawaii,";
@@ -2940,7 +2966,7 @@ jawaii_in,44,110,0	script	Security Officer#megin	734,{
 }
 
 niflheim,109,254,0	script	Egnigem	796,{
-	if ($God1 > 49 && $God2 < 100) {
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
 		if (god_eremes > 19 && god_eremes < 25) {
 			if (god_eremes > 22) {
 				mes "[Egnigem]";
@@ -3165,7 +3191,27 @@ niflheim,109,254,0	script	Egnigem	796,{
 			specialeffect EF_LOCKON;
 			specialeffect2 EF_HOLYCROSS;
 			set god_eremes,27;
-			getexp 122036,0;
+			if (checkre(3)) {
+				if (BaseLevel < 56) getexp 2700,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 3000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 5605,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 8223,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 21227,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 39073,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 45102,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 54615,0;
+				else getexp 122035,0;
+			} else {
+				if (BaseLevel < 56) getexp 27000,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 30000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 56052,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 82233,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 212271,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 390738,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 451020,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 546156,0;
+				else getexp 1220358,0;
+			}
 			close;
 		}
 		else if (god_eremes == 26) {
@@ -3203,7 +3249,27 @@ niflheim,109,254,0	script	Egnigem	796,{
 			specialeffect EF_LOCKON;
 			specialeffect2 EF_HOLYCROSS;
 			set god_eremes,27;
-			getexp 122036,0;
+			if (checkre(3)) {
+				if (BaseLevel < 56) getexp 2700,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 3000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 5605,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 8223,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 21227,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 39073,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 45102,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 54615,0;
+				else getexp 122035,0;
+			} else {
+				if (BaseLevel < 56) getexp 27000,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 30000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 56052,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 82233,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 212271,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 390738,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 451020,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 546156,0;
+				else getexp 1220358,0;
+			}
 			close;
 		}
 		else if (god_eremes < 20) {
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index 5c796c3b8..d2e7ba1ca 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script ======================================= 
-//= Mjolnir seal unlocking NPCs.
-//===== By: ================================================== 
+//===== Hercules Script ======================================
+//= God Item Quest - Mjolnir Seal
+//===== By: ==================================================
 //= SinSloth
-//===== Current Version: ===================================== 
-//= 1.8a
-//===== Compatible With: ===================================== 
-//= rAthena
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.9
+//===== Description: =========================================
 //= Quest for breaking the seal of Mjolnir.
 //===== Additional Comments: =================================
 //= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
@@ -21,10 +19,15 @@
 //= 1.7 Fixed a copy/paste error in Nordri. [L0ne_W0lf]
 //= 1.8 Fixed item check for Oridecon. [L0ne_W0lf]
 //= 1.8a Added 'disable_items' command. [Euphy]
+//= 1.9 Renewal script update. [Euphy]
 //============================================================
 
 prontera,124,297,3	script	Tialfi	706,{
-	if ($God3 < 50) {
+	if (checkweight(1301,3) == 0) {
+		mes "- You are carrying too many items! -";
+		close;
+	}
+	if ($God3 < $@god_check1) {
 		cutin "god_tialpi01",2;
 		mes "[Tialfi]";
 		mes "Hmmm...";
@@ -36,12 +39,12 @@ prontera,124,297,3	script	Tialfi	706,{
 		mes "going on!";
 	}
 	else {
-		if(god_mjo_0 == 11) {
+		if (god_mjo_0 == 11) {
 			cutin "god_tialpi01",2;
 			mes "[Tialfi]";
 			mes "I'm waiting for the day when I'll finally get to see Thor's thunder for myself. I believe that one of these days, my dream will become reality.";
 		}
-		else if(god_mjo_1 == 2 && god_mjo_2 == 2 && god_mjo_3 == 2 && god_mjo_4 == 2) {
+		else if (god_mjo_1 == 2 && god_mjo_2 == 2 && god_mjo_3 == 2 && god_mjo_4 == 2) {
 			if (god_mjo_0 == 10) {
 				if ((countitem(756) > 49) && (countitem(757) > 49)) {
 					set .@gift,0;
@@ -63,7 +66,7 @@ prontera,124,297,3	script	Tialfi	706,{
 					else if (BaseJob == Job_Assassin){
 						set .@gift,6;
 					}
-					else if(BaseJob == Job_Crusader){
+					else if (BaseJob == Job_Crusader){
 						set .@gift,7;
 					}
 					else if (BaseJob == Job_Monk){
@@ -81,7 +84,7 @@ prontera,124,297,3	script	Tialfi	706,{
 					else if (BaseJob == Job_Bard){
 						set .@gift,12;
 					}
-					else if(BaseJob == Job_Hunter){
+					else if (BaseJob == Job_Hunter){
 						set .@gift,13;
 					}
 					else {
@@ -123,46 +126,46 @@ prontera,124,297,3	script	Tialfi	706,{
 					mes "It must be around--Ah!";
 					mes "Here we are~";
 					next;
-					delitem 756,50;  //Oridecon_Stone
-					delitem 757,50;  //Elunium_Stone
+					delitem 756,50; //Oridecon_Stone
+					delitem 757,50; //Elunium_Stone
 					set god_mjo_0,11;
 					if (.@gift == 1) {
 						getitem 1471,1; // Hell_Fire
 					}
-					else if(.@gift == 2) {
+					else if (.@gift == 2) {
 						getitem 1526,1; // Slash
 					}
-					else if(.@gift == 3) {
+					else if (.@gift == 3) {
 						getitem 1231,1; // Bazerald
 					}
-					else if(.@gift == 4) {
+					else if (.@gift == 4) {
 						getitem 1367,1; // Slaughter
 					}
-					else if(.@gift == 5) {
+					else if (.@gift == 5) {
 						getitem 1722,1; // Balistar
 					}
-					else if(.@gift == 6) {
+					else if (.@gift == 6) {
 						getitem 1230,1; // House_Auger
 					}
-					else if(.@gift == 7) {
+					else if (.@gift == 7) {
 						getitem 1141,1; // Immaterial_Sword
 					}
-					else if(.@gift == 8) {
+					else if (.@gift == 8) {
 						getitem 1813,1; // Kaiser_Knuckle
 					}
-					else if(.@gift == 9) {
+					else if (.@gift == 9) {
 						getitem 1557,1; // Book_Of_The_Apocalypse
 					}
-					else if(.@gift == 10) {
+					else if (.@gift == 10) {
 						getitem 1235,1; // Azoth
 					}
-					else if(.@gift == 11) {
+					else if (.@gift == 11) {
 						getitem 1227,1; // Weeder_Knife
 					}
-					else if(.@gift == 12) {
+					else if (.@gift == 12) {
 						getitem 1913,1; // Electronic_Guitar
 					}
-					else if(.@gift == 13) {
+					else if (.@gift == 13) {
 						getitem 1963,1; // Rapture_Rose
 					}
 					else {
@@ -190,7 +193,7 @@ prontera,124,297,3	script	Tialfi	706,{
 				}
 			}
 			else {
-				if ($God4 > 99) {
+				if ($God4 >= $@god_check2) {
 					mes "[Tialfi]";
 					mes "I sense a strange energy growing more powerful somewhere on this continent...";
 					next;
@@ -203,14 +206,13 @@ prontera,124,297,3	script	Tialfi	706,{
 				}
 				else {
 					set $God4,$God4 +1;
-					if($God4 == 50) {
+					if ($God4 == $@god_check1)
 						announce "The 4th seal of [Mjolnir] has appeared.",bc_all;
-					}
-					else if($God4 == 100 && $God2 == 100 && $God3 == 100 && $God1 == 100) {
-						announce "Four seals have been released at the same time with the seal of [Mjolnir].",bc_all;
-					}
-					else if($God4 == 100) {
-						announce "The 4th seal of [Mjolnir] has been released.",bc_all;
+					else if ($God4 == $@god_check2) {
+						if ($God4 == $@god_check2 && $God2 == $@god_check2 && $God3 == $@god_check2 && $God1 == $@god_check2)
+							announce "Four seals have been released at the same time with the seal of [Mjolnir].",bc_all;
+						else
+							announce "The 4th seal of [Mjolnir] has been released.",bc_all;
 					}
 					set god_mjo_0,10;
 					mes "[Tialfi]";
@@ -237,7 +239,7 @@ prontera,124,297,3	script	Tialfi	706,{
 				}
 			}
 		}
-		else if(god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
+		else if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 			mes "[Tialfi]";
 			mes "Hmm...";
 			mes "The Dwarven Blacksmiths";
@@ -260,7 +262,7 @@ prontera,124,297,3	script	Tialfi	706,{
 			mes "You should be okay now.";
 			mes "By this time, they've probably forgotten the insult. But make sure you speak to my sister for advice first.";
 		}
-		else if(god_mjo_0 == 2 || god_mjo_0 == 1) {
+		else if (god_mjo_0 == 2 || god_mjo_0 == 1) {
 			cutin "god_tialpi01",2;
 			mes "[Tialfi]";
 			mes "Sorry for the trouble.";
@@ -268,8 +270,8 @@ prontera,124,297,3	script	Tialfi	706,{
 			mes "in finding the Dwarves!";
 			mes "Just... Don't insult them!";
 		}
-		else if(god_mjo_0 == 0) {
-			if($God4 > 99) {
+		else if (god_mjo_0 == 0) {
+			if ($God4 >= $@god_check2) {
 				cutin "god_tialpi01",2;
 				mes "[Tialfi]";
 				mes "I sense a strange energy growing more powerful somewhere on this continent...";
@@ -282,7 +284,7 @@ prontera,124,297,3	script	Tialfi	706,{
 				mes "I think we'd better wait and see what's happening. Someone will deliver the news to us. Though, I am unsure of whether or not it will be good news or bad...";
 				close;
 			}
-			else if(BaseLevel < 70) {
+			else if (BaseLevel < 70) {
 				cutin "god_tialpi02",2;
 				mes "[Tialfi]";
 				mes "One of my ancestors supposedly was a servant of Thor. Still, I find it difficult to believe.";
@@ -366,7 +368,7 @@ prontera,124,297,3	script	Tialfi	706,{
 }
 
 prt_fild01,196,47,3	script	Roskva	703,{
-	if(god_mjo_0 == 1) {
+	if (god_mjo_0 == 1) {
 		mes "[Roskva]";
 		mes "You should know that Dwarven Blacksmiths are extremely offended if you do not speak to them with the utmost respect.";
 		next;
@@ -385,7 +387,7 @@ prt_fild01,196,47,3	script	Roskva	703,{
 		mes "If you happen to speak to them in the wrong order, please go talk to my brother Tialfi again.";
 		close;
 	}
-	else if(god_mjo_0 == 2) {
+	else if (god_mjo_0 == 2) {
 		mes "[Roskva]";
 		mes "You should know that Dwarven Blacksmiths are extremely offended if you do not speak to them with the utmost respect.";
 		next;
@@ -419,18 +421,18 @@ prt_fild01,196,47,3	script	Roskva	703,{
 }
 
 mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
-	if ($God3 < 50) {
+	if ($God3 < $@god_check1) {
 		mes "[Austri]";
 		mes "Something is happening somewhere on this continent. You might not believe me, but I keep getting visions of the Fenrir-Wolf.";
 		close;
 	}
 	else {
-		if($God4 > 99) {
+		if ($God4 >= $@god_check2) {
 			mes "[Austri]";
 			mes "Something is happening somewhere on this continent. You might not believe me, but I keep getting visions of the Fenrir-Wolf.";
 			close;
 		}
-		else if(god_mjo_0 == 11) {
+		else if (god_mjo_0 == 11) {
 			mes "[Austri]";
 			mes "When my people finally retrieve the memories of their past, we will be able to grant the power of the gods to humans.";
 			next;
@@ -439,19 +441,19 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 			mes "time is coming...";
 			close;
 		}
-		else if(god_mjo_0 == 10) {
+		else if (god_mjo_0 == 10) {
 			mes "[Austri]";
 			mes "Hm? I sense that you were asked to do a favor for that human. If I were you, I'd finish that task as soon as I could. Somehow, that human's fate, as well as that of the Dwarves, are intertwined...";
 			close;
 		}
-		else if(god_mjo_0 == 1) {
+		else if (god_mjo_0 == 1) {
 			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Austri]";
 				mes "What is it?! I refuse to speak to human as rude and contemptible";
 				mes "as you! Now, get out of my sight!";
 				close;
 			}
-			else if(god_mjo_1 == 2) {
+			else if (god_mjo_1 == 2) {
 				mes "[Austri]";
 				mes "What...?";
 				mes "I have nothing";
@@ -479,7 +481,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 					close;
 				}
 			}
-			else if(god_mjo_1 == 1) {
+			else if (god_mjo_1 == 1) {
 				mes "[Austri]";
 				mes "What has made";
 				mes "you come to me?";
@@ -509,7 +511,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 1) {
+							else if (.@talk_to == 1) {
 								mes "[Austri]";
 								mes "Mjolnir...?";
 								mes "Thor's legendary weapon?";
@@ -529,7 +531,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 2) {
+							else if (.@talk_to == 2) {
 								mes "[Austri]";
 								mes "One day, Loki came to our village and showed off his treasures. He boasted that we couldn't possibly create something to surpass their quality.";
 								next;
@@ -545,7 +547,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 3) {
+							else if (.@talk_to == 3) {
 								mes "[Austri]";
 								mes "Of the three treasures my ancestors created, Mjolnir was the last and greatest.";
 								next;
@@ -563,7 +565,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 4) {
+							else if (.@talk_to == 4) {
 								mes "[Austri]";
 								mes "Despite this minor flaw, Mjolnir is still considered the greatest of legendary weapons.";
 								next;
@@ -581,7 +583,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 5) {
+							else if (.@talk_to == 5) {
 								mes "[Austri]";
 								mes "The reason this mountain is called Mount Mjolnir is because it was actually created by the hammer.";
 								next;
@@ -601,7 +603,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 6) {
+							else if (.@talk_to == 6) {
 								mes "[Austri]";
 								mes "Hmm... But perhaps an ambitious dwarf can forge something similar to Mjolnir so that it can actually be used by humans. It would have less power, but it'd be perfectly crafted.";
 								next;
@@ -617,7 +619,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 7) {
+							else if (.@talk_to == 7) {
 								mes "[Austri]";
 								mes "Well, I happened to speak much longer than I intended. But I hope you learned what you wished to";
 								mes "know about Mjolnir.";
@@ -638,7 +640,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 8) {
+							else if (.@talk_to == 8) {
 								set god_mjo_1,2;
 								mes "[Austri]";
 								mes "Alright then...";
@@ -670,7 +672,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 					}
 				}
 			}
-			else if(god_mjo_1 == 0) {
+			else if (god_mjo_1 == 0) {
 				mes "[Austri]";
 				mes "What has made";
 				mes "you come to me?";
@@ -704,21 +706,21 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 2) {
-			if(god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
+		else if (god_mjo_0 == 2) {
+			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Austri]";
 				mes "What is it?! I refuse to speak to human as rude and contemptible";
 				mes "as you! Now, get out of my sight!";
 				close;
 			}
-			else if(god_mjo_4 == 2) {
+			else if (god_mjo_4 == 2) {
 				mes "[Austri]";
 				mes "What is it...?";
 				mes "I have nothing";
 				mes "to say to you.";
 				close;
 			}
-			else if(god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_2 == 0 || god_mjo_2 == 1 || god_mjo_3 == 0 || god_mjo_3 == 1) {
+			else if (god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_2 == 0 || god_mjo_2 == 1 || god_mjo_3 == 0 || god_mjo_3 == 1) {
 				mes "[Austri]";
 				mes "What made you come to me?";
 				next;
@@ -735,7 +737,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 					close;
 				}
 			}
-			else if(god_mjo_4 == 1) {
+			else if (god_mjo_4 == 1) {
 				mes "[Austri]";
 				mes "What has made";
 				mes "you come to me?";
@@ -928,7 +930,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 					}
 				}
 			}
-			else if(god_mjo_4 == 0) {
+			else if (god_mjo_4 == 0) {
 				mes "[Austri]";
 				mes "What made you come to me?";
 				next;
@@ -961,7 +963,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 0) {
+		else if (god_mjo_0 == 0) {
 			mes "[Austri]";
 			mes "Ah...";
 			mes "It feels like today's going to be a great day.";
@@ -979,7 +981,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 }
 
 mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
-	if ($God3 < 50) {
+	if ($God3 < $@god_check1) {
 		mes "[Sudri]";
 		mes "I want to compete";
 		mes "and fight with stronger and stronger opponents!";
@@ -989,7 +991,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 		close;
 	}
 	else {
-		if ($God4 > 99) {
+		if ($God4 >= $@god_check2) {
 			mes "[Sudri]";
 			mes "Wait, this is";
 			mes "not the right time";
@@ -999,7 +1001,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 			mes "Something that has been hidden is about to be born out of the sweat of determination and tears of sacrifice. We must wait until then.";
 			close;
 		}
-		else if(god_mjo_0 == 11) {
+		else if (god_mjo_0 == 11) {
 			mes "[Sudri]";
 			mes "I want to compete with a stronger one!";
 			mes "I will be stronger and stronger,";
@@ -1008,12 +1010,12 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 			mes "Muhahahaha...!";
 			close;
 		}
-		else if(god_mjo_10 == 10) {
+		else if (god_mjo_10 == 10) {
 			mes "[Sudri]";
 			mes "I must admit that you're a really strong human. Let us fight again when we have a chance. The next time, you may not be so lucky!";
 			close;
 		}
-		else if(god_mjo_0 == 1) {
+		else if (god_mjo_0 == 1) {
 			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Sudri]";
 				mes "Go back to where you belong before I beat you to death!";
@@ -1022,13 +1024,13 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 				mes "All you can gain here are a few herbs.";
 				close;
 			}
-			else if(god_mjo_2 == 2) {
+			else if (god_mjo_2 == 2) {
 				mes "[Sudri]";
 				mes "That was a great fight!";
 				mes "Mwahahaha! I'm satisfied with the results. I may have lost, but we fought honorably with everything we had.";
 				close;
 			}
-			else if(god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_3 != 0 || god_mjo_4 != 0) {
+			else if (god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_3 != 0 || god_mjo_4 != 0) {
 				mes "[Sudri]";
 				mes "So...";
 				mes "What brings";
@@ -1054,7 +1056,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					close;
 				}
 			}
-			else if(god_mjo_2 == 1) {
+			else if (god_mjo_2 == 1) {
 				set .@n_vit,200;
 				set .@p_vit,100;
 				while(1) {
@@ -1088,15 +1090,15 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "" + strcharinfo(0) + "";
 						mes "attacks Sudri's head!";
 					}
-					else if(.@p_atk == 2) {
+					else if (.@p_atk == 2) {
 						mes "" + strcharinfo(0) + "";
 						mes "strikes Sudri's chest!";
 					}
-					else if(.@p_atk == 3) {
+					else if (.@p_atk == 3) {
 						mes "" + strcharinfo(0) + "";
 						mes "aims for Sudri's legs!";
 					}
-					else if(.@p_atk == 4) {
+					else if (.@p_atk == 4) {
 						mes "" + strcharinfo(0) + "";
 						mes "requests a break!";
 					}
@@ -1114,7 +1116,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "" + strcharinfo(0) + " misses!";
 						}
-						else if(.@n_def == 2) {
+						else if (.@n_def == 2) {
 							mes "--------------------";
 							mes "Sudri blocks your";
 							mes "attack by crossing";
@@ -1122,7 +1124,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "" + strcharinfo(0) + "'s attack is blocked!";
 						}
-						else if(.@n_def == 3) {
+						else if (.@n_def == 3) {
 							mes "--------------------";
 							mes "Sudri dodges your";
 							mes "attack with a graceful";
@@ -1131,14 +1133,14 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "" + strcharinfo(0) + " misses!";
 						}
 					}
-					else if(.@p_atk == 4) {
+					else if (.@p_atk == 4) {
 						specialeffect2 EF_HEAL;
 						set .@p_vit,.@p_vit + 10;
 						mes "--------------------";
 						mes "" + strcharinfo(0) + "";
 						mes "has gained 10 HP!";
 					}
-					else if(.@p_atk == 1) {
+					else if (.@p_atk == 1) {
 						specialeffect EF_HIT5;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1147,7 +1149,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "Sudri has lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 2) {
+					else if (.@p_atk == 2) {
 						specialeffect EF_HIT2;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1157,7 +1159,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "Sudri has";
 						mes "lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 3) {
+					else if (.@p_atk == 3) {
 						specialeffect EF_HIT4;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1167,7 +1169,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "Sudri has";
 						mes "lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 0) {
+					else if (.@p_atk == 0) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - 10;
 						mes "--------------------";
@@ -1220,7 +1222,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					if (.@n_atk == 1) {
 						mes "Sudri aims for the head!";
 					}
-					else if(.@n_atk == 2) {
+					else if (.@n_atk == 2) {
 						mes "Sudri strikes the chest!";
 					}
 					else {
@@ -1237,7 +1239,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "Sudri has failed to attack.";
 						}
-						else if(.@p_def == 2) {
+						else if (.@p_def == 2) {
 							mes "--------------------";
 							mes "" + strcharinfo(0) + "";
 							mes "barely blocked";
@@ -1245,7 +1247,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "Sudri has failed to attack.";
 						}
-						else if(.@p_def == 3) {
+						else if (.@p_def == 3) {
 							mes "--------------------";
 							mes "" + strcharinfo(0) + " jumped,";
 							mes "dodged Sudri's attack at ease.";
@@ -1253,7 +1255,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "Sudri has failed to attack.";
 						}
 					}
-					else if(.@p_def == 4) {
+					else if (.@p_def == 4) {
 						set .@count,rand(1,4);
 						mes "--------------------";
 						mes "" + strcharinfo(0) + "";
@@ -1282,7 +1284,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "" + strcharinfo(0) + " has lost 30 HP!";
 						}
 					}
-					else if(.@n_atk == 1) {
+					else if (.@n_atk == 1) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1292,7 +1294,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 2) {
+					else if (.@n_atk == 2) {
 						specialeffect2 EF_HIT2;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1302,7 +1304,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 3) {
+					else if (.@n_atk == 3) {
 						specialeffect2 EF_HIT4;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1312,7 +1314,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 0) {
+					else if (.@n_atk == 0) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1346,7 +1348,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					mes "Go out, train some and get stronger before you even think about coming back!";
 					close;
 				}
-				else if(.@n_vit < p_vit) {
+				else if (.@n_vit < p_vit) {
 					set god_mjo_2,2;
 					mes "[Sudri]";
 					mes "You're stronger than me. I never thought I'd meet a human as strong as you.";
@@ -1361,7 +1363,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					close;
 				}
 			}
-			else if(god_mjo_2 == 0) {
+			else if (god_mjo_2 == 0) {
 				mes "[Sudri]";
 				mes "So...";
 				mes "What brings";
@@ -1422,14 +1424,14 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 2) {
+		else if (god_mjo_0 == 2) {
 			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Sudri]";
 				mes "[Sudri]";
 				mes "Get out of here before I beat you to death! All you can gain over here is a few herbs, anyway!";
 				close;
 			}
-			else if(god_mjo_3 == 2) {
+			else if (god_mjo_3 == 2) {
 				mes "[Sudri]";
 				mes "That was a great fight!";
 				mes "Hahahahahahahahahaah!";
@@ -1459,7 +1461,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					close;
 				}
 			}
-			else if(god_mjo_3 == 1) {
+			else if (god_mjo_3 == 1) {
 				mes "[Sudri]";
 				mes "Cool, let's fight!";
 				next;
@@ -1496,15 +1498,15 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "" + strcharinfo(0) + "";
 						mes "attacks Sudri's head!";
 					}
-					else if(.@p_atk == 2) {
+					else if (.@p_atk == 2) {
 						mes "" + strcharinfo(0) + "";
 						mes "strikes Sudri's chest!";
 					}
-					else if(.@p_atk == 3) {
+					else if (.@p_atk == 3) {
 						mes "" + strcharinfo(0) + "";
 						mes "aims for Sudri's legs!";
 					}
-					else if(.@p_atk == 4) {
+					else if (.@p_atk == 4) {
 						mes "" + strcharinfo(0) + "";
 						mes "requests a break!";
 					}
@@ -1522,7 +1524,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "" + strcharinfo(0) + " misses!";
 						}
-						else if(.@n_def == 2) {
+						else if (.@n_def == 2) {
 							mes "--------------------";
 							mes "Sudri blocks your";
 							mes "attack by crossing";
@@ -1530,7 +1532,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "" + strcharinfo(0) + "'s attack is blocked!";
 						}
-						else if(.@n_def == 3) {
+						else if (.@n_def == 3) {
 							mes "--------------------";
 							mes "Sudri dodges your";
 							mes "attack with a graceful";
@@ -1539,14 +1541,14 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "" + strcharinfo(0) + " misses!";
 						}
 					}
-					else if(.@p_atk == 4) {
+					else if (.@p_atk == 4) {
 						specialeffect2 EF_HEAL;
 						set .@p_vit,.@p_vit + 10;
 						mes "--------------------";
 						mes "" + strcharinfo(0) + "";
 						mes "has gained 10 HP!";
 					}
-					else if(.@p_atk == 1) {
+					else if (.@p_atk == 1) {
 						specialeffect EF_HIT5;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1555,7 +1557,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "Sudri has lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 2) {
+					else if (.@p_atk == 2) {
 						specialeffect EF_HIT2;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1565,7 +1567,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "Sudri has";
 						mes "lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 3) {
+					else if (.@p_atk == 3) {
 						specialeffect EF_HIT4;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1575,7 +1577,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "Sudri has";
 						mes "lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 0) {
+					else if (.@p_atk == 0) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - 10;
 						mes "--------------------";
@@ -1628,7 +1630,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					if (.@n_atk == 1) {
 						mes "Sudri aims for the head!";
 					}
-					else if(.@n_atk == 2) {
+					else if (.@n_atk == 2) {
 						mes "Sudri strikes the chest!";
 					}
 					else {
@@ -1644,7 +1646,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "Sudri has failed to attack.";
 						}
-						else if(.@p_def == 2) {
+						else if (.@p_def == 2) {
 							mes "--------------------";
 							mes "" + strcharinfo(0) + "";
 							mes "barely blocked";
@@ -1652,7 +1654,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "Sudri has failed to attack.";
 						}
-						else if(.@p_def == 3) {
+						else if (.@p_def == 3) {
 							mes "--------------------";
 							mes "" + strcharinfo(0) + " jumped,";
 							mes "dodged Sudri's attack at ease.";
@@ -1660,7 +1662,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "Sudri has failed to attack.";
 						}
 					}
-					else if(.@p_def == 4) {
+					else if (.@p_def == 4) {
 						set .@count,rand(1,4);
 						mes "--------------------";
 						mes "" + strcharinfo(0) + "";
@@ -1689,7 +1691,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "" + strcharinfo(0) + " has lost 30 HP!";
 						}
 					}
-					else if(.@n_atk == 1) {
+					else if (.@n_atk == 1) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1699,7 +1701,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 2) {
+					else if (.@n_atk == 2) {
 						specialeffect2 EF_HIT2;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1709,7 +1711,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 3) {
+					else if (.@n_atk == 3) {
 						specialeffect2 EF_HIT4;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1719,7 +1721,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 0) {
+					else if (.@n_atk == 0) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1753,7 +1755,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					mes "Go out, train some and get stronger before you even think about coming back!";
 					close;
 				}
-				else if(.@n_vit < .@p_vit) {
+				else if (.@n_vit < .@p_vit) {
 					set god_mjo_3,2;
 					mes "[Sudri]";
 					mes "You're stronger than me. I never thought I'd meet a human as strong as you.";
@@ -1768,7 +1770,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					close;
 				}
 			}
-			else if(god_mjo_3 == 0) {
+			else if (god_mjo_3 == 0) {
 				mes "[Sudri]";
 				mes "What made you come to me?";
 				next;
@@ -1829,7 +1831,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 0) {
+		else if (god_mjo_0 == 0) {
 			mes "[Sudri]";
 			mes "In a one on one fight, you put everything on the line to show your might to your opponent.";
 			next;
@@ -1846,7 +1848,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 }
 
 mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
-	if($God3 < 50) {
+	if ($God3 < $@god_check1) {
 		mes "[Vestri]";
 		mes "If you want something, you should earn it through your own efforts.";
 		next;
@@ -1859,7 +1861,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 		close;
 	}
 	else {
-		if($God4 > 99) {
+		if ($God4 >= $@god_check2) {
 			mes "[Vestri]";
 			mes "I don't feel";
 			mes "like doing anything";
@@ -1872,7 +1874,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 			mes "Yeah, I think I need a break! Don't you think I need a break, human?";
 			close;
 		}
-		else if(god_mjo_0 == 11) {
+		else if (god_mjo_0 == 11) {
 			mes "[Vestri]";
 			mes "There's nothing like taking a relaxing break after putting your heart into your work.";
 			next;
@@ -1882,7 +1884,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 			mes "of life's simple pleasures?";
 			close;
 		}
-		else if(god_mjo_0 == 10) {
+		else if (god_mjo_0 == 10) {
 			mes "[Vestri]";
 			mes "If you want something, you should earn it through your own efforts.";
 			next;
@@ -1894,13 +1896,13 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 			mes "Kids these days...";
 			close;
 		}
-		else if(god_mjo_0 == 1) {
-			if(god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
+		else if (god_mjo_0 == 1) {
+			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Vestri]";
 				mes "I really hope I meet a decent human being next time. So far, I haven't met one useful human.";
 				close;
 			}
-			else if(god_mjo_3 == 2) {
+			else if (god_mjo_3 == 2) {
 				mes "[Vestri]";
 				mes "Perfect preparation does not always result in success. There's a point when you've got to just go out and do it.";
 				next;
@@ -1912,7 +1914,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				mes "plan to accomplish in life.";
 				close;
 			}
-			else if(god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_2 == 0 || god_mjo_2 == 1 || god_mjo_4 != 0) {
+			else if (god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_2 == 0 || god_mjo_2 == 1 || god_mjo_4 != 0) {
 				mes "[Vestri]";
 				mes "What do you want?";
 				next;
@@ -1934,7 +1936,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					close;
 				}
 			}
-			else if(god_mjo_3 == 1) {
+			else if (god_mjo_3 == 1) {
 				disable_items;
 				mes "[Vestri]";
 				mes "Great...!";
@@ -1943,11 +1945,9 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 
 				setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
 				set .@menu$,"";
-				for( set .@i,1; .@i <= 10; set .@i,.@i+1 )
-				{
-					if( getequipisequiped(.@i) )
+				for(set .@i,1; .@i <= 10; set .@i,.@i+1) {
+					if (getequipisequiped(.@i))
 						set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]";
-
 					set .@menu$, .@menu$ + ":";
 				}
 				set .@part,select(.@menu$);
@@ -2011,8 +2011,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				mes "If you understand,";
 				mes "then let's get on with it!";
 				next;
-				if( select("Sure, let's do it!:N-no, I changed my mind!") == 2 )
-				{
+				if(select("Sure, let's do it!:N-no, I changed my mind!") == 2) {
 					mes "[Vestri]";
 					mes "Bah...!";
 					mes "How do you survive";
@@ -2076,7 +2075,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				mes "Take care.";
 				close;
 			}
-			else if(god_mjo_3 == 0) {
+			else if (god_mjo_3 == 0) {
 				mes "[Vestri]";
 				mes "What do you want?";
 				next;
@@ -2114,13 +2113,13 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 2) {
+		else if (god_mjo_0 == 2) {
 			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Vestri]";
 				mes "I really hope I meet a decent human being next time. So far, I haven't met one useful human.";
 				close;
 			}
-			else if(god_mjo_2 == 2) {
+			else if (god_mjo_2 == 2) {
 				mes "[Vestri]";
 				mes "Perfect preparation does not always result in success. There's a point when you've got to just go out and do it.";
 				next;
@@ -2155,7 +2154,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					close;
 				}
 			}
-			else if(god_mjo_2 == 1) {
+			else if (god_mjo_2 == 1) {
 				disable_items;
 				mes "[Vestri]";
 				mes "Great...!";
@@ -2164,11 +2163,9 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				
 				setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
 				set .@menu$,"";
-				for( set .@i,1; .@i <= 10; set .@i,.@i+1 )
-				{
-					if( getequipisequiped(.@i) )
+				for(set .@i,1; .@i <= 10; set .@i,.@i+1) {
+					if (getequipisequiped(.@i))
 						set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]";
-
 					set .@menu$, .@menu$ + ":";
 				}
 				set .@part,select(.@menu$);
@@ -2227,8 +2224,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				mes "If you understand,";
 				mes "then let's get on with it!";
 				next;
-				if( select("Sure, let's do it!:...no, I am out.") == 2 )
-				{
+				if(select("Sure, let's do it!:...no, I am out.") == 2) {
 					mes "[Vestri]";
 					mes "Bah...!";
 					mes "How do you survive";
@@ -2291,7 +2287,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				mes "Take care.";
 				close;
 			}
-			else if(god_mjo_2 == 0) {
+			else if (god_mjo_2 == 0) {
 				mes "[Vestri]";
 				mes "What do you want?";
 				next;
@@ -2329,7 +2325,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 0) {
+		else if (god_mjo_0 == 0) {
 			mes "[Vestri]";
 			mes "It's always a pleasure to engage myself in hard work, especially smithing.";
 			next;
@@ -2347,7 +2343,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 }
 
 mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
-	if ($God3 < 50) {
+	if ($God3 < $@god_check1) {
 		mes "[Nordri]";
 		mes "What...?";
 		mes "I don't have any";
@@ -2358,7 +2354,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 		close;
 	}
 	else {
-		if ($God4 > 99) {
+		if ($God4 >= $@god_check2) {
 			mes "[Nordri]";
 			mes "What's happening?";
 			mes "I sense change in the winds, but what that change may be, I cannot tell.";
@@ -2458,7 +2454,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 								break;
 							}
 						}
-						else if(.@talk_to == 1) {
+						else if (.@talk_to == 1) {
 							mes "[Nordri]";
 							mes "Yes, only a Blaze could have effortlessly consumed meat, bones and plates by burning. Of course!";
 							mes "I remember now!";
@@ -2478,7 +2474,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 								break;
 							}
 						}
-						else if(.@talk_to == 2) {
+						else if (.@talk_to == 2) {
 							mes "[Nordri]";
 							mes "Yes, right! Tialfi was racing 'thoughts!' Nothing can move faster than the speed of thought, so it's no wonder Tialfi would always lose.";
 							next;
@@ -2497,7 +2493,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 								break;
 							}
 						}
-						else if(.@talk_to == 3) {
+						else if (.@talk_to == 3) {
 							mes "[Nordri]";
 							mes "Yes, Thor was wrestling with 'Old Age!' No matter how strong anybody is, you can't fight against aging.";
 							next;
@@ -2544,7 +2540,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 					close;
 				}
 			}
-			else if(god_mjo_4 == 0) {
+			else if (god_mjo_4 == 0) {
 				mes "[Nordri]";
 				mes "What business";
 				mes "do you have with";
@@ -2573,7 +2569,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 				close2;
 			}
 		}
-		else if(god_mjo_0 == 2) {
+		else if (god_mjo_0 == 2) {
 			if ((god_mjo_1 == 3) || (god_mjo_2 == 3) || (god_mjo_3 == 3) || (god_mjo_4 == 3)){
 				mes "[Nordri]";
 				mes "Eh heh heh~";
@@ -2611,7 +2607,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 					close;
 				}
 			}
-			else if(god_mjo_1 == 1) {
+			else if (god_mjo_1 == 1) {
 				if (countitem(501) > 0) {
 
 					delitem 501,1;  //Red_Potion
@@ -2676,7 +2672,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 								break;
 							}
 						}
-						else if(.@talk_to == 3) {
+						else if (.@talk_to == 3) {
 							mes "[Nordri]";
 							mes "Yes! Gods refer to the";
 							mes "moon as the 'false sun.'";
diff --git a/npc/quests/seals/seal_status.txt b/npc/quests/seals/seal_status.txt
new file mode 100644
index 000000000..c9e6515fb
--- /dev/null
+++ b/npc/quests/seals/seal_status.txt
@@ -0,0 +1,50 @@
+//===== Hercules Script ======================================
+//= God Item Quest - Seal Status
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.3
+//===== Description: =========================================
+//= God Item Seal Status.
+//===== Additional Comments: =================================
+//= 1.0 Translated from the official. [L0ne_W0lf]
+//= 1.1 Now checks proper char vars. [L0ne_W0lf]
+//= 1.2 Cleaning. [Euphy]
+//= 1.3 Renewal script update. [Euphy]
+//============================================================
+
+prontera,113,294,3	script	Sign Post#god	837,{
+	mes "======== God Seal Status ========";
+	setarray .@seal$[1], "Sleipnir","Megingjard","Brisingamen","Mjolnir";
+	for(set .@i,1; .@i<=4; set .@i,.@i+1) {
+		set .@val, getd("$God"+.@i);
+		if (.@val == 0)
+			set .@status$,"Unseen";
+		else if (.@val < $@god_check1)
+			set .@status$,"Active";
+		else if (.@val < $@god_check2)
+			set .@status$,"Appeared";
+		else
+			set .@status$,"Released";
+		mes .@seal$[.@i]+" Seal: "+.@status$;
+	}
+	mes " ";
+	mes "======= Your Seal Status ========";
+	if (god_sl_1 < 51)
+		mes "^ff0000Sleipnir Seal: Not Completed^000000";
+	else
+		mes "^00ff00Sleipnir Seal: Completed^000000";
+	if (god_eremes < 28)
+		mes "^ff0000Megingjard Seal: Not Completed^000000";
+	else
+		mes "^00ff00Megingjard Seal: Completed^000000";
+	if (god_brising < 50)
+		mes "^ff0000Brisingamen Seal: Not Completed^000000";
+	else
+		mes "^00ff00Brisingamen Seal: Completed^000000";
+	if (god_mjo_0 < 11)
+		mes "^ff0000Mjolnir Seal: Not Completed^000000";
+	else
+		mes "^00ff00Mjolnir Seal: Completed^000000";
+	close;
+}
\ No newline at end of file
diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt
index 6fd6da4a5..4b4e70f8b 100644
--- a/npc/quests/seals/sleipnir_seal.txt
+++ b/npc/quests/seals/sleipnir_seal.txt
@@ -1,18 +1,17 @@
-//===== rAthena Script ======================================= 
-//= Sleipnir seal unlocking NPCs.
-//===== By: ================================================== 
+//===== Hercules Script ======================================
+//= God Item Quest - Sleipnir Seal
+//===== By: ==================================================
 //= MasterOfMuppets
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
 //= Quest for breaking the seal of Sleipnir.
 //===== Additional Comments: =================================
 //= 1.0 First version. [MasterOfMuppets]
 //= 1.1 Updated several aspects of the script. [L0ne_W0lf]
 //= 1.2 Minor Touchups to quest. [L0ne_W0lf]
 //= 1.3 Fixed a typo with a variable. [L0ne_W0lf]
+//= 1.4 Renewal script update. [Euphy]
 //============================================================
 
 yuno,164,200,4	script	Noyee#G	101,{
@@ -31,7 +30,7 @@ yuno,164,200,4	script	Noyee#G	101,{
 		close;
 	}
 	else {
-		if ($God1 > 99) {
+		if ($God1 >= $@god_check2) {
 			mes "[Noyee]";
 			mes "Did you know that there's a difference between the armor you can buy from NPC shops and the kinds you obtain from hunting monsters?";
 			next;
@@ -73,10 +72,10 @@ que_god01,98,98,4	script	Manager#G	69,{
 		mes "Wait...!";
 		mes "I can't even remember the last";
 		mes "time I went out with a guy! At this rate, I might retire before I can find a boyfriend. Noooo, I'm still in my prime~!";
-		Emotion ET_PROFUSELY_SWAT;
+		emotion e_swt2;
 		close;
 	}
-	if ($God1 < 100) {
+	if ($God1 < $@god_check2) {
 		if (god_sl_1 == 0) {
 			mes "[Cukure]";
 			mes "I can't believe how busy I am at work nowadays. I don't even have time to see any of my friends or go shopping.";
@@ -196,305 +195,239 @@ que_god01,98,98,4	script	Manager#G	69,{
 			mes "[Cukure]";
 			mes "Ah, there it is.";
 			mes "It might not be much, but I hope you accept it as a token of my gratitude. Good luck on your travels!";
-			if ($God1 < 100)set $God1,$God1+1;
-			if ($God1 == 50) {
+			if ($God1 < $@god_check2)
+				set $God1,$God1+1;
+			if ($God1 == $@god_check1)
 				announce "The 1st seal of [Sleipnir] has appeared.",bc_all;
-			}
-			else if ($God1 == 100) {
-				if ($God1 == 100 && $God2 == 100 && $God3 == 100 && $God4 == 100) {
+			else if ($God1 == $@god_check2) {
+				if ($God1 == $@god_check2 && $God2 == $@god_check2 && $God3 == $@god_check2 && $God4 == $@god_check2)
 					announce "our seals have been released at the same time with the seal of [Sleipnir].",bc_all;
-				}
-				else {
+				else
 					announce "The 1st seal of [Sleipnir] has been released.",bc_all;
-				}
 			}
 			set god_sl_1,51;
 			set .@god_treasure,rand(1,900);
 			set .@god_treasure1,rand(1,1000);
-			if (.@god_treasure < 101) {
-				if (.@god_treasure1 < 210) {
-					getitem 2102,1; // Guard_
-				}
-				else if (.@god_treasure1 < 420) {
-					getitem 2104,1; // Buckler_
-				}
-				else if (.@god_treasure1 < 630) {
-					getitem 2106,1; // Shield_
-				}
-				else if (.@god_treasure1 < 840) {
-					getitem 2108,1; // Mirror_Shield_
+			if (checkre(0)) {
+				if (.@god_treasure < 101) {
+					     if (.@god_treasure1 < 210) getitem 2102,1; //Guard_
+					else if (.@god_treasure1 < 420) getitem 2104,1; //Buckler_
+					else if (.@god_treasure1 < 630) getitem 2106,1; //Shield_
+					else if (.@god_treasure1 < 840) getitem 2108,1; //Mirror_Shield_
+					else getitem 2109,1; //Memorize_Book
+				}
+				else if (.@god_treasure < 201) {
+					     if (.@god_treasure1 < 48) getitem 2207,1; //Fancy_Flower
+					else if (.@god_treasure1 < 96) getitem 2210,1; //Hair_Band
+					else if (.@god_treasure1 < 150) getitem 2213,1; //Cat_Hairband
+					else if (.@god_treasure1 < 190) getitem 2215,1; //Flower_Hairband
+					else if (.@god_treasure1 < 238) getitem 2217,1; //Biretta_
+					else if (.@god_treasure1 < 290) getitem 2223,1; //Turban_
+					else if (.@god_treasure1 < 340) getitem 2227,1; //Cap_
+					else if (.@god_treasure1 < 348) getitem 2229,1; //Helm_
+					else if (.@god_treasure1 < 400) getitem 2231,1; //Gemmed_Sallet_
+					else if (.@god_treasure1 < 448) getitem 2233,1; //Circlet_
+					else if (.@god_treasure1 < 496) getitem 2236,1; //Santa's_Hat
+					else if (.@god_treasure1 < 544) getitem 2244,1; //Big_Sis'_Ribbon
+					else if (.@god_treasure1 < 592) getitem 2245,1; //Sweet_Gents
+					else if (.@god_treasure1 < 640) getitem 2247,1; //Oldman's_Romance
+					else if (.@god_treasure1 < 688) getitem 2248,1; //Western_Grace
+					else if (.@god_treasure1 < 736) getitem 2250,1; //Fillet
+					else if (.@god_treasure1 < 784) getitem 2251,1; //Holy_Bonnet
+					else if (.@god_treasure1 < 832) getitem 2252,1; //Star_Sparkling
+					else if (.@god_treasure1 < 880) getitem 2253,1; //Sunflower
+					else if (.@god_treasure1 < 940) getitem 2257,1; //Snowy_Horn
+					else getitem 2259,1; //Mini_Propeller
+				}
+				else if (.@god_treasure < 301) {
+					     if (.@god_treasure1 < 160) getitem 2267,1; //Cigar
+					else if (.@god_treasure1 < 320) getitem 2262,1; //Pierrot_Nose
+					else if (.@god_treasure1 < 480) getitem 2263,1; //Gangster_Patch
+					else if (.@god_treasure1 < 540) getitem 2265,1; //Ganster_Mask
+					else if (.@god_treasure1 < 700) getitem 2266,1; //Iron_Cane
+					else if (.@god_treasure1 < 800) getitem 2260,1; //Mini_Glasses
+					else if (.@god_treasure1 < 900) getitem 2269,1; //Centimental_Flower
+					else getitem 2270,1; //Centimental_Leaf
+				}
+				else if (.@god_treasure < 401) {
+					     if (.@god_treasure1 < 70) getitem 2298,1; //Green_Feeler
+					else if (.@god_treasure1 < 140) getitem 2275,1; //Red_Bandana
+					else if (.@god_treasure1 < 210) getitem 2276,1; //Eagle_Eyes
+					else if (.@god_treasure1 < 280) getitem 2277,1; //Nurse_Cap
+					else if (.@god_treasure1 < 350) getitem 2279,1; //Bomb_Wick
+					else if (.@god_treasure1 < 420) getitem 2282,1; //Spirit_Chain
+					else if (.@god_treasure1 < 490) getitem 2299,1; //Viking_Helm
+					else if (.@god_treasure1 < 560) getitem 2287,1; //Pirate_Bandana
+					else if (.@god_treasure1 < 630) getitem 2289,1; //Poo_Poo_Hat
+					else if (.@god_treasure1 < 700) getitem 2290,1; //Funeral_Costume
+					else if (.@god_treasure1 < 770) getitem 2291,1; //Masquerade
+					else if (.@god_treasure1 < 840) getitem 2294,1; //Star_Dust
+					else if (.@god_treasure1 < 900) getitem 2295,1; //Blinker
+					else if (.@god_treasure1 < 950) getitem 2271,1; //Jack_A_Dandy
+					else getitem 2285,1; //Apple_Of_Archer
+				}
+				else if (.@god_treasure < 501) {
+					     if (.@god_treasure1 < 80) getitem 2306,1; //Adventurere's_Suit_
+					else if (.@god_treasure1 < 160) getitem 2308,1; //Mantle_
+					else if (.@god_treasure1 < 240) getitem 2310,1; //Coat_
+					else if (.@god_treasure1 < 320) getitem 2311,1; //Mink_Coat
+					else if (.@god_treasure1 < 400) getitem 2313,1; //Padded_Armor_
+					else if (.@god_treasure1 < 480) getitem 2315,1; //Chain_Mail_
+					else if (.@god_treasure1 < 560) getitem 2329,1; //Wooden_Mail_
+					else if (.@god_treasure1 < 630) getitem 2320,1; //Formal_Suit
+					else if (.@god_treasure1 < 700) getitem 2322,1; //Silk_Robe_
+					else if (.@god_treasure1 < 760) getitem 2324,1; //Scapulare_
+					else if (.@god_treasure1 < 810) getitem 2326,1; //Saint_Robe_
+					else if (.@god_treasure1 < 850) getitem 2342,1; //Full_Plate_Armor_
+					else if (.@god_treasure1 < 900) getitem 2331,1; //Tights_
+					else if (.@god_treasure1 < 950) getitem 2333,1; //Silver_Robe_
+					else getitem 2336,1; //Thief_Clothes_
+				}
+				else if (.@god_treasure < 601) {
+					     if (.@god_treasure1 < 200) getitem 2402,1; //Sandals_
+					else if (.@god_treasure1 < 400) getitem 2404,1; //Shoes_
+					else if (.@god_treasure1 < 600) getitem 2406,1; //Boots_
+					else if (.@god_treasure1 < 800) getitem 2407,1; //Chrystal_Pumps
+					else getitem 2409,1; //Spiky_Heel
+				}
+				else if (.@god_treasure < 701) {
+					     if (.@god_treasure1 < 300) getitem 2502,1; //Hood_
+					else if (.@god_treasure1 < 550) getitem 2504,1; //Muffler_
+					else if (.@god_treasure1 < 750) getitem 2506,1; //Manteau_
+					else getitem 2508,1; //Ragamuffin_Cape
+				}
+				else if (.@god_treasure < 801) {
+					     if (.@god_treasure1 < 110) getitem 2601,1; //Ring
+					else if (.@god_treasure1 < 220) getitem 2602,1; //Earring
+					else if (.@god_treasure1 < 330) getitem 2603,1; //Necklace
+					else if (.@god_treasure1 < 440) getitem 2604,1; //Glove
+					else if (.@god_treasure1 < 550) getitem 2605,1; //Brooch
+					else if (.@god_treasure1 < 660) getitem 2607,1; //Clip
+					else if (.@god_treasure1 < 770) getitem 2608,1; //Rosary
+					else if (.@god_treasure1 < 880) getitem 2617,1; //Mitten_Of_Presbyter
+					else getitem 2618,1; //Matyr's_Flea_Guard
 				}
 				else {
-					getitem 2109,1; // Memorize_Book
-				}
-			}
-			else if (.@god_treasure < 201) {
-				if (.@god_treasure1 < 48) {
-					getitem 2254,1; // Angelic_Chain
-				}
-				else if (.@god_treasure1 < 96) {
-					getitem 2210,1; // Hair_Band
-				}
-				else if (.@god_treasure1 < 150) {
-					getitem 2213,1; // Cat_Hairband
-				}
-				else if (.@god_treasure1 < 190) {
-					getitem 2255,1; // Satanic_Chain
-				}
-				else if (.@god_treasure1 < 238) {
-					getitem 2217,1; // Biretta_
-				}
-				else if (.@god_treasure1 < 290) {
-					getitem 2223,1; // Turban_
-				}
-				else if (.@god_treasure1 < 340) {
-					getitem 2227,1; // Cap_
-				}
-				else if (.@god_treasure1 < 348) {
-					getitem 2229,1; // Helm_
-				}
-				else if (.@god_treasure1 < 400) {
-					getitem 2231,1; // Gemmed_Sallet_
-				}
-				else if (.@god_treasure1 < 448) {
-					getitem 2233,1; // Circlet_
-				}
-				else if (.@god_treasure1 < 496) {
-					getitem 5053,1; // Spinx_Helm
-				}
-				else if (.@god_treasure1 < 544) {
-					getitem 5019,1; // Corsair
-				}
-				else if (.@god_treasure1 < 592) {
-					getitem 2245,1; // Sweet_Gents
-				}
-				else if (.@god_treasure1 < 640) {
-					getitem 2247,1; // Oldman's_Romance
-				}
-				else if (.@god_treasure1 < 688) {
-					getitem 2248,1; // Western_Grace
-				}
-				else if (.@god_treasure1 < 736) {
-					getitem 5166,1; // Spinx_Helm_
-				}
-				else if (.@god_treasure1 < 784) {
-					getitem 5158,1; // Holy_Bonnet_
-				}
-				else if (.@god_treasure1 < 832) {
-					getitem 2249,1; // Coronet
-				}
-				else if (.@god_treasure1 < 880) {
-					getitem 5157,1; // Viking_Helm_
-				}
-				else if (.@god_treasure1 < 940) {
-					getitem 2285,1; // Apple_Of_Archer
-				}
-				else {
-					getitem 5093,1; // Blue_Coif_
-				}
-			}
-			else if (.@god_treasure < 301) {
-				if (.@god_treasure1 < 160) {
-					getitem 5014,1; // Fin_Helm
-				}
-				else if (.@god_treasure1 < 320) {
-					getitem 5005,1; // Gas_Mask
-				}
-				else if (.@god_treasure1 < 480) {
-					getitem 5054,1; // Assasin_Mask
-				}
-				else if (.@god_treasure1 < 540) {
-					getitem 2265,1; // Ganster_Mask
-				}
-				else if (.@god_treasure1 < 700) {
-					getitem 2266,1; // Iron_Cane
-				}
-				else if (.@god_treasure1 < 800) {
-					getitem 2260,1; // Mini_Glasses
-				}
-				else if (.@god_treasure1 < 900) {
-					getitem 5113,1; // Angry_Mouth
-				}
-				else {
-					// Pirate Dagger is iRO only, and requires extra files in client.
-					getitem 2270,1; // Centimental_Leaf
-					//getitem 5305,1 // Pirate_Dagger
-				}
-			}
-			else if (.@god_treasure < 401) {
-				if (.@god_treasure1 < 70) {
-					getitem 2286,1; // Elven_Ears
-				}
-				else if (.@god_treasure1 < 140) {
-					getitem 5002,1; // Gemmed_Crown
-				}
-				else if (.@god_treasure1 < 210) {
-					getitem 5147,1; // Baseball_Cap
-				}
-				else if (.@god_treasure1 < 280) {
-					getitem 2217,1; // Biretta_
-				}
-				else if (.@god_treasure1 < 350) {
-					getitem 5120,1; // Fedora_
-				}
-				else if (.@god_treasure1 < 420) {
-					getitem 2261,1; // Prontera_Army_Cap
-				}
-				else if (.@god_treasure1 < 490) {
-					getitem 5162,1; // Bone_Helm_
-				}
-				else if (.@god_treasure1 < 560) {
-					getitem 5030,1; // Panda_Cap
-				}
-				else if (.@god_treasure1 < 630) {
-					getitem 5109,1; // Red_Bonnet
-				}
-				else if (.@god_treasure1 < 700) {
-					getitem 5084,1; // Lazy_Raccoon
-				}
-				else if (.@god_treasure1 < 770) {
-					getitem 5168,1; // Bongun_Hat_
-				}
-				else if (.@god_treasure1 < 840) {
-					getitem 2214,1; // Bunny_Band
-				}
-				else if (.@god_treasure1 < 900) {
-					getitem 2295,1; // Blinker
-				}
-				else if (.@god_treasure1 < 950) {
-					getitem 5167,1; // Munak_Turban_
-				}
-				else {
-					getitem 5018,1; // Feather_Bonnet
-				}
-			} else if (.@god_treasure < 501) {
-				if (.@god_treasure1 < 85) {
-					getitem 2310,1; // Coat_
-				}
-				else if (.@god_treasure1 < 170) {
-					getitem 2311,1; // Mink_Coat
-				}
-				else if (.@god_treasure1 < 255) {
-					getitem 2313,1; // Padded_Armor_
-				}
-				else if (.@god_treasure1 < 340) {
-					getitem 2317,1; // Plate_Armor_
-				}
-				else if (.@god_treasure1 < 425) {
-					getitem 2319,1; // Glittering_Clothes
-				}
-				else if (.@god_treasure1 < 510) {
-					getitem 2320,1; // Formal_Suit
-				}
-				else if (.@god_treasure1 < 595) {
-					getitem 2322,1; // Silk_Robe_
-				}
-				else if (.@god_treasure1 < 680) {
-					getitem 2359,1; // Ninja_Suit_
-				}
-				else if (.@god_treasure1 < 765) {
-					getitem 2326,1; // Saint_Robe_
-				}
-				else if (.@god_treasure1 < 850) {
-					getitem 2342,1; // Full_Plate_Armor_
-				}
-				else if (.@god_treasure1 < 935) {
-					getitem 2331,1; // Tights_
-				}
-				else {
-					getitem 2336,1; // Thief_Clothes_
-				}
-			}
-			else if (.@god_treasure < 601) {
-				if (.@god_treasure1 < 200) {
-					getitem 2422,1; // High_Fashion_Sandals
-				}
-				else if (.@god_treasure1 < 400) {
-					getitem 2404,1; // Shoes_
-				}
-				else if (.@god_treasure1 < 600) {
-					getitem 2406,1; // Boots_
-				}
-				else if (.@god_treasure1 < 800) {
-					getitem 2407,1; // Chrystal_Pumps
-				}
-				else {
-					getitem 2412,1; // Grave_
-				}
-			}
-			else if (.@god_treasure < 701) {
-				if (.@god_treasure1 < 200) {
-					getitem 2513,1; // Celestial_Robe
-				}
-				else if (.@god_treasure1 < 400) {
-					getitem 2504,1; // Muffler_
-				}
-				else if (.@god_treasure1 < 600) {
-					getitem 2506,1; // Manteau_
-				}
-				else if (.@god_treasure1 < 800) {
-					getitem 2514,1; // Pauldron
-				}
-				else {
-					getitem 2508,1; // Ragamuffin_Cape
-				}
-			}
-			else if (.@god_treasure < 801) {
-				if (.@god_treasure1 < 110) {
-					getitem 1122,1; // Ring_
-				}
-				else if (.@god_treasure1 < 220) {
-					getitem 2622,1; // Earring_
-				}
-				else if (.@god_treasure1 < 330) {
-					getitem 2623,1; // Necklace_
-				}
-				else if (.@god_treasure1 < 440) {
-					getitem 2624,1; // Glove_
-				}
-				else if (.@god_treasure1 < 550) {
-					getitem 2625,1; // Brooch_
-				}
-				else if (.@god_treasure1 < 660) {
-					getitem 2607,1; // Clip
-				}
-				else if (.@god_treasure1 < 770) {
-					getitem 2626,1; // Rosary_
-				}
-				else if (.@god_treasure1 < 880) {
-					getitem 2617,1; // Mitten_Of_Presbyter
-				}
-				else {
-					getitem 2671,1; // Thimble_Of_Archer_
-				}
-			}
-			else {
-				if (.@god_treasure1 < 150) {
-					getitem 2281,1; // Phantom_Of_Opera
-				}
-				else if (.@god_treasure1 < 260) {
-					getitem 2297,1; // Goblini_Mask
-				}
-				else if (.@god_treasure1 < 370) {
-					getitem 5087,1; // Goblin_Mask_01
-				}
-				else if (.@god_treasure1 < 480) {
-					getitem 5088,1; // Goblin_Mask_02
-				}
-				else if (.@god_treasure1 < 590) {
-					getitem 5089,1; // Goblin_Mask_03
-				}
-				else if (.@god_treasure1 < 700) {
-					getitem 5090,1; // Goblin_Mask_04
-				}
-				else if (.@god_treasure1 < 810) {
-					getitem 5086,1; // Alarm_Mask
+					     if (.@god_treasure1 < 150) getitem 2288,1; //Mr_Scream
+					else if (.@god_treasure1 < 260) getitem 2297,1; //Goblini_Mask
+					else if (.@god_treasure1 < 370) getitem 5087,1; //Goblin_Mask_01
+					else if (.@god_treasure1 < 480) getitem 5088,1; //Goblin_Mask_02
+					else if (.@god_treasure1 < 590) getitem 5089,1; //Goblin_Mask_03
+					else if (.@god_treasure1 < 700) getitem 5090,1; //Goblin_Mask_04
+					else if (.@god_treasure1 < 810) getitem 5046,1; //Bongun_Hat
+					else if (.@god_treasure1 < 920) getitem 2264,1; //Munak_Turban
+					else getitem 2225,1; //Goggle_
+				}
+			} else {
+				if (.@god_treasure < 101) {
+					     if (.@god_treasure1 < 210) getitem 2102,1; //Guard_
+					else if (.@god_treasure1 < 420) getitem 2104,1; //Buckler_
+					else if (.@god_treasure1 < 630) getitem 2106,1; //Shield_
+					else if (.@god_treasure1 < 840) getitem 2108,1; //Mirror_Shield_
+					else getitem 2109,1; //Memorize_Book
+				}
+				else if (.@god_treasure < 201) {
+					     if (.@god_treasure1 < 48) getitem 2254,1; //Angelic_Chain
+					else if (.@god_treasure1 < 96) getitem 2210,1; //Hair_Band
+					else if (.@god_treasure1 < 150) getitem 2213,1; //Cat_Hairband
+					else if (.@god_treasure1 < 190) getitem 2255,1; //Satanic_Chain
+					else if (.@god_treasure1 < 238) getitem 2217,1; //Biretta_
+					else if (.@god_treasure1 < 290) getitem 2223,1; //Turban_
+					else if (.@god_treasure1 < 340) getitem 2227,1; //Cap_
+					else if (.@god_treasure1 < 348) getitem 2229,1; //Helm_
+					else if (.@god_treasure1 < 400) getitem 2231,1; //Gemmed_Sallet_
+					else if (.@god_treasure1 < 448) getitem 2233,1; //Circlet_
+					else if (.@god_treasure1 < 496) getitem 5053,1; //Spinx_Helm
+					else if (.@god_treasure1 < 544) getitem 5019,1; //Corsair
+					else if (.@god_treasure1 < 592) getitem 2245,1; //Sweet_Gents
+					else if (.@god_treasure1 < 640) getitem 2247,1; //Oldman's_Romance
+					else if (.@god_treasure1 < 688) getitem 2248,1; //Western_Grace
+					else if (.@god_treasure1 < 736) getitem 5166,1; //Spinx_Helm_
+					else if (.@god_treasure1 < 784) getitem 5158,1; //Holy_Bonnet_
+					else if (.@god_treasure1 < 832) getitem 2249,1; //Coronet
+					else if (.@god_treasure1 < 880) getitem 5157,1; //Viking_Helm_
+					else if (.@god_treasure1 < 940) getitem 2285,1; //Apple_Of_Archer
+					else getitem 5093,1; //Blue_Coif_
+				}
+				else if (.@god_treasure < 301) {
+					     if (.@god_treasure1 < 160) getitem 5014,1; //Fin_Helm
+					else if (.@god_treasure1 < 320) getitem 5005,1; //Gas_Mask
+					else if (.@god_treasure1 < 480) getitem 5054,1; //Assasin_Mask
+					else if (.@god_treasure1 < 540) getitem 2265,1; //Ganster_Mask
+					else if (.@god_treasure1 < 700) getitem 2266,1; //Iron_Cane
+					else if (.@god_treasure1 < 800) getitem 2260,1; //Mini_Glasses
+					else if (.@god_treasure1 < 900) getitem 5113,1; //Angry_Mouth
+					else {
+						// Pirate Dagger is iRO only, and requires extra files in client.
+						//getitem 5305,1 //Pirate_Dagger
+						getitem 2270,1; //Centimental_Leaf
+					}
 				}
-				else if (.@god_treasure1 < 920) {
-					getitem 2292,1; // Welding_Mask
+				else if (.@god_treasure < 401) {
+					     if (.@god_treasure1 < 70) getitem 2286,1; //Elven_Ears
+					else if (.@god_treasure1 < 140) getitem 5002,1; //Gemmed_Crown
+					else if (.@god_treasure1 < 210) getitem 5147,1; //Baseball_Cap
+					else if (.@god_treasure1 < 280) getitem 2217,1; //Biretta_
+					else if (.@god_treasure1 < 350) getitem 5120,1; //Fedora_
+					else if (.@god_treasure1 < 420) getitem 2261,1; //Prontera_Army_Cap
+					else if (.@god_treasure1 < 490) getitem 5162,1; //Bone_Helm_
+					else if (.@god_treasure1 < 560) getitem 5030,1; //Panda_Cap
+					else if (.@god_treasure1 < 630) getitem 5109,1; //Red_Bonnet
+					else if (.@god_treasure1 < 700) getitem 5084,1; //Lazy_Raccoon
+					else if (.@god_treasure1 < 770) getitem 5168,1; //Bongun_Hat_
+					else if (.@god_treasure1 < 840) getitem 2214,1; //Bunny_Band
+					else if (.@god_treasure1 < 900) getitem 2295,1; //Blinker
+					else if (.@god_treasure1 < 950) getitem 5167,1; //Munak_Turban_
+					else getitem 5018,1; //Feather_Bonnet
+				} else if (.@god_treasure < 501) {
+					     if (.@god_treasure1 < 85) getitem 2310,1; //Coat_
+					else if (.@god_treasure1 < 170) getitem 2311,1; //Mink_Coat
+					else if (.@god_treasure1 < 255) getitem 2313,1; //Padded_Armor_
+					else if (.@god_treasure1 < 340) getitem 2317,1; //Plate_Armor_
+					else if (.@god_treasure1 < 425) getitem 2319,1; //Glittering_Clothes
+					else if (.@god_treasure1 < 510) getitem 2320,1; //Formal_Suit
+					else if (.@god_treasure1 < 595) getitem 2322,1; //Silk_Robe_
+					else if (.@god_treasure1 < 680) getitem 2359,1; //Ninja_Suit_
+					else if (.@god_treasure1 < 765) getitem 2326,1; //Saint_Robe_
+					else if (.@god_treasure1 < 850) getitem 2342,1; //Full_Plate_Armor_
+					else if (.@god_treasure1 < 935) getitem 2331,1; //Tights_
+					else getitem 2336,1; //Thief_Clothes_
+				}
+				else if (.@god_treasure < 601) {
+					     if (.@god_treasure1 < 200) getitem 2422,1; //High_Fashion_Sandals
+					else if (.@god_treasure1 < 400) getitem 2404,1; //Shoes_
+					else if (.@god_treasure1 < 600) getitem 2406,1; //Boots_
+					else if (.@god_treasure1 < 800) getitem 2407,1; //Chrystal_Pumps
+					else getitem 2412,1; //Grave_
+				}
+				else if (.@god_treasure < 701) {
+					     if (.@god_treasure1 < 200) getitem 2513,1; //Celestial_Robe
+					else if (.@god_treasure1 < 400) getitem 2504,1; //Muffler_
+					else if (.@god_treasure1 < 600) getitem 2506,1; //Manteau_
+					else if (.@god_treasure1 < 800) getitem 2514,1; //Pauldron
+					else getitem 2508,1; //Ragamuffin_Cape
+				}
+				else if (.@god_treasure < 801) {
+					     if (.@god_treasure1 < 110) getitem 1122,1; //Ring_
+					else if (.@god_treasure1 < 220) getitem 2622,1; //Earring_
+					else if (.@god_treasure1 < 330) getitem 2623,1; //Necklace_
+					else if (.@god_treasure1 < 440) getitem 2624,1; //Glove_
+					else if (.@god_treasure1 < 550) getitem 2625,1; //Brooch_
+					else if (.@god_treasure1 < 660) getitem 2607,1; //Clip
+					else if (.@god_treasure1 < 770) getitem 2626,1; //Rosary_
+					else if (.@god_treasure1 < 880) getitem 2617,1; //Mitten_Of_Presbyter
+					else getitem 2671,1; //Thimble_Of_Archer_
 				}
 				else {
-					getitem 5006,1; // Machoman_Glasses
+					     if (.@god_treasure1 < 150) getitem 2281,1; //Phantom_Of_Opera
+					else if (.@god_treasure1 < 260) getitem 2297,1; //Goblini_Mask
+					else if (.@god_treasure1 < 370) getitem 5087,1; //Goblin_Mask_01
+					else if (.@god_treasure1 < 480) getitem 5088,1; //Goblin_Mask_02
+					else if (.@god_treasure1 < 590) getitem 5089,1; //Goblin_Mask_03
+					else if (.@god_treasure1 < 700) getitem 5090,1; //Goblin_Mask_04
+					else if (.@god_treasure1 < 810) getitem 5086,1; //Alarm_Mask
+					else if (.@god_treasure1 < 920) getitem 2292,1; //Welding_Mask
+					else getitem 5006,1; //Machoman_Glasses
 				}
 			}
 			next;
@@ -573,7 +506,7 @@ que_god01,98,98,4	script	Manager#G	69,{
 }
 
 que_god01,66,125,6	script	Researcher#G1	89,{
-	if ($God1 < 100) {
+	if ($God1 < $@god_check2) {
 		if (god_sl_1 == 2) {
 			set god_sl_1,11;
 		}
@@ -739,7 +672,7 @@ que_god01,66,125,6	script	Researcher#G1	89,{
 }
 
 que_god01,11,136,6	script	Researcher#G2	742,{
-	if ($God1 < 100) {
+	if ($God1 < $@god_check2) {
 		if (god_sl_1 == 2) {
 			set god_sl_1,21;
 		}
@@ -958,7 +891,7 @@ que_god01,11,136,6	script	Researcher#G2	742,{
 }
 
 que_god01,55,47,3	script	Researcher#G3	803,{
-	if (god_sl2 < 100) {
+	if ($God1 < $@god_check2) {
 		if (god_sl_1 == 2) {
 			set god_sl_1,31;
 		}
@@ -1224,7 +1157,7 @@ que_god01,55,47,3	script	Researcher#G3	803,{
 }
 
 que_god01,14,47,3	script	Researcher#G4	713,{
-	if ($God1 < 100) {
+	if ($God1 < $@god_check2) {
 		if (god_sl_1 == 2) {
 			set god_sl_1,41;
 		}
@@ -1330,7 +1263,7 @@ que_god01,14,47,3	script	Researcher#G4	713,{
 }
 
 que_god01,20,48,0	script	Slab#G	111,{
-	if ($God1 < 100) {
+	if ($God1 < $@god_check2) {
 		if ((god_sl_1 == 41) || (god_sl_1 == 12) || (god_sl_1 == 23) || (god_sl_1 == 34)) {
 			if ((god_sl_2 == 1) || (god_sl_2 == 2)) {
 				mes "....whgks ^ff00ffdirdnl^000000sjs wkrdjswhgks whdtnfb";
@@ -1476,7 +1409,7 @@ que_god01,20,48,0	script	Slab#G	111,{
 }
 
 payon,79,171,4	script	Friar#G5	95,{
-	if ($God1 < 100) {
+	if ($God1 < $@god_check2) {
 		if ((god_sl_1 == 21) || (god_sl_1 == 32) || (god_sl_1 == 43) || (god_sl_1 == 14)) {
 			if ((god_sl_2 == 1) || (god_sl_2 == 3)) {
 				mes "[Lania]";
diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt
index 3f81aee27..113104401 100644
--- a/npc/quests/skills/acolyte_skills.txt
+++ b/npc/quests/skills/acolyte_skills.txt
@@ -4,9 +4,9 @@
 //= kobra_k88
 //===== Current Version: =====================================
 //= 1.8
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Quest for skills: Holy Light
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Fixed a typo in job check. (Bugreport:1531) [L0ne_W0lf]
 //= 1.7 Updated to latest available official file. [Masao]
@@ -107,11 +107,11 @@ prt_church,173,23,4	script	Cleric	79,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
-//= v1.0a Now using functions found in "Global_Functions.txt"
-//= for class checks.
+//============================================================
+//= 1.0a Now using functions found in "Global_Functions.txt"
+//=     for class checks.
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Fixed an exploit [Lupus]
diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index b53c6cd21..678c2696b 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -1,14 +1,14 @@
 //===== Hercules Script ======================================
 //= Alchemist Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2
-//===== Description: ========================================= 
-//= [Aegis COnversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for item: Elemental_Create_Book
 //= Quest for skill: Bioethics
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.9 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 2.0 Rescripted (and re-added) Bio Ethics quest. [L0ne_W0lf]
 //= 2.1 Fixed a Resurrection -> Homunculus Resurrection. [L0ne_W0lf]
@@ -1203,7 +1203,7 @@ lhz_in01,224,140,3	script	Kellasus#qsk_al	57,{
 		mes "" + strcharinfo(0) + ".";
 		next;
 		set bioeth,13;
-		skill 238,1,0;
+		skill "AM_BIOETHICS",1,0;
 		mes "[Kellasus]";
 		mes "Ah...";
 		mes "" + strcharinfo(0) + ".";
@@ -2197,9 +2197,9 @@ lhz_in01,218,141,7	script	Alchemist#qsk_al	98,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt
index 763ffff06..63a465e25 100644
--- a/npc/quests/skills/archer_skills.txt
+++ b/npc/quests/skills/archer_skills.txt
@@ -4,12 +4,12 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.7
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Quest for skills: Arrow Crafting, Arrow Repel
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Updated to latest available official file.
-//= also fixed Item issue [bugreport:5607]. [Masao]
+//=     also fixed Item issue [bugreport:5607]. [Masao]
 //= 1.7 Fixed JobLevel requirements. [Euphy]
 //============================================================
 
@@ -80,7 +80,7 @@ moc_ruins,118,99,5	script	Roberto	88,{
 				mes "Isn't it hard to find arrows?";
 				mes "That's why I make my own.";
 				next;
-				menu "Eh, really?!",-;
+				select("Eh, really?!");
 				mes "[Roberto]";
 				mes "Yeah! I gather different items";
 				mes "and make arrows using them.";
@@ -88,7 +88,7 @@ moc_ruins,118,99,5	script	Roberto	88,{
 				mes "survive alone in this tough world.";
 				mes "If you'd like, I can teach you.";
 				next;
-				menu "That would be wonderful.",-;
+				select("That would be wonderful.");
 				mes "[Roberto]";
 				mes "But.. I can't do it for free.";
 				mes "Nothing is free in this world~";
@@ -264,14 +264,14 @@ OnTouch:
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
-//= v1.0 Roberto message text is based off RO npc.  Jason message
-//= text is custom from old version.
-//= All items are from official quests though.[kobra_k88]
-//= v1.0a Now using functions found in "Global_Functions.txt"
-//= for class checks.[kobra_k88]
+//============================================================
+//= 1.0 Roberto message text is based off RO npc.  Jason message
+//=     text is custom from old version.
+//=     All items are from official quests though.[kobra_k88]
+//= 1.0a Now using functions found in "Global_Functions.txt"
+//=     for class checks.[kobra_k88]
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Fixed exploits [Lupus]
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 4fddf6b12..568d0c369 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -1,13 +1,13 @@
 //===== Hercules Script ======================================
 //= Assassin Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Venom Knife, Sonic Acceleration
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
@@ -631,7 +631,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 				mes "the one who invented this";
 				mes "skill, is also... He's a man";
 				mes "amongst men, I must say.";
-				Emotion e_lv;
+				emotion e_lv;
 				next;
 				break;
 			case 2:
@@ -713,7 +713,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 			mes "Have you heard about";
 			mes "the latest news from";
 			mes "the Assassin Guild?";
-			Emotion e_heh;
+			emotion e_heh;
 			next;
 			select("News from the Assassin Guild?");
 			mes "[Assassin]";
@@ -757,9 +757,9 @@ OnTouch:
 				mes "^3355FFSomething inside";
 				mes "the coffin bit your";
 				mes "hand really hard!^000000";
-				sc_start SC_Poison,30000,0;
+				sc_start SC_POISON,30000,0;
 				sc_start SC_BLOODING,10000,0;
-				Emotion e_omg,1;
+				emotion e_omg,1;
 				close;
 			case 2:
 				mes "^3355FFYou try to peek";
@@ -774,7 +774,7 @@ OnTouch:
 				mes "is squirming inside the";
 				mes "coffin, but it's far too dark";
 				mes "to see anything else.^000000";
-				sc_start SC_Blind,30000,0;
+				sc_start SC_BLIND,30000,0;
 				next;
 				break;
 			case 3:
@@ -782,7 +782,7 @@ OnTouch:
 				mes "strength to move";
 				mes "something as heavy";
 				mes "as this coffin's lid...^000000";
-				sc_start SC_Curse,30000,0;
+				sc_start SC_CURSE,30000,0;
 				next;
 				break;
 			case 4:
@@ -829,9 +829,9 @@ OnTouch:
 					mes "^3355FFSomething inside";
 					mes "the coffin bit your";
 					mes "hand really hard!^000000";
-					sc_start SC_Poison,30000,0;
+					sc_start SC_POISON,30000,0;
 					sc_start SC_BLOODING,10000,0;
-					Emotion e_omg,1;
+					emotion e_omg,1;
 					close;
 				}
 				else {
@@ -857,7 +857,7 @@ OnTouch:
 				mes "is squirming inside the";
 				mes "coffin, but it's far too dark";
 				mes "to see anything else.^000000";
-				sc_start SC_Blind,30000,0;
+				sc_start SC_BLIND,30000,0;
 				next;
 				break;
 			case 3:
@@ -865,7 +865,7 @@ OnTouch:
 				mes "strength to move";
 				mes "something as heavy";
 				mes "as this coffin's lid...^000000";
-				sc_start SC_Curse,30000,0;
+				sc_start SC_CURSE,30000,0;
 				next;
 				break;
 			case 4:
@@ -901,7 +901,7 @@ OnTouch:
 				mes "^3355FFa yellow gas that clouds";
 				mes "your senses and briefly";
 				mes "knocks you unconscious.^000000";
-				sc_start SC_Sleep,30000,0;
+				sc_start SC_SLEEP,30000,0;
 				close;
 			}
 			mes "^3355FFa yellow gas. However, you";
@@ -936,7 +936,7 @@ OnTouch:
 				mes "^3355FFa yellow gas that clouds";
 				mes "your senses and briefly";
 				mes "knocks you unconscious.^000000";
-				sc_start SC_Sleep,30000,0;
+				sc_start SC_SLEEP,30000,0;
 				close;
 			}
 			mes "^3355FFa yellow gas. However, you";
@@ -944,13 +944,13 @@ OnTouch:
 			mes "all gas in your lungs in time";
 			mes "to escape its effects. Sadly,";
 			mes "all you found was broken glass.^000000";
-			Emotion e_omg,1;
+			emotion e_omg,1;
 		}
 		close;
 	}
 }
 
-moc_pryd04,85,96,0	script	��#crypt	-1,3,3,{
+moc_pryd04,85,96,0	script	¡¡#crypt	-1,3,3,{
 OnTouch:
 	if (ASSN_SK == 4) {
 		specialeffect EF_CONE;
@@ -969,7 +969,7 @@ OnTouch:
 				mes "^3355FFIt's too late!";
 				mes "Your body has just";
 				mes "been frozen solid.^000000";
-				sc_start SC_Freeze,10000,0;
+				sc_start SC_FREEZE,10000,0;
 				close;
 			}
 			mes "^3355FFYou quickly pick up";
@@ -984,9 +984,9 @@ OnTouch:
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index f09437058..d64281100 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -1,24 +1,24 @@
 //===== Hercules Script ======================================
 //= Bard Skill Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Official quest for the Bard skill "Pang Voice"
 //= Prerequisite: Geffen Bard Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
-//= 	Somehow eA engine doesn't let you keep learn't skill
+//=     Somehow eA engine doesn't let you keep learn't skill
 //= 1.2 Added to correct locations, correct NPC's, fixed [Reddozen]
-//= 	some of the items required and made them into real
-//= 	quests.
+//=     some of the items required and made them into real
+//=     quests.
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a Tixed an item ID typo. Thanks, 2Spiritual Kid
 //= 1.3b Split into different files [DracoRPG]
-//= 1.4	Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.4a Checks the proper variable now. (bard_q -> gef_bard_q) [L0ne_W0lf]
 //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.6 Added missing checkweights. [L0ne_W0lf]
@@ -27,7 +27,7 @@
 
 prontera,174,328,3	script	Young Man#bard_q1	89,3,3,{
 	if (BaseJob == Job_Bard) {
-		Emotion e_omg;
+		emotion e_omg;
 		mes "[Timid Young Man]";
 		mes "Eh? Wwwaaaah--!";
 		mes "Y-you're--it's-it's--";
@@ -372,7 +372,7 @@ prontera,174,328,3	script	Young Man#bard_q1	89,3,3,{
 
 OnTouch:
 	if (BaseJob == Job_Bard) {
-		Emotion e_omg;
+		emotion e_omg;
 	}
 	end;
 }
@@ -652,7 +652,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 			mes "[Riott]";
 			mes "Hmmrmpf!";
 			mes "Eh heh heh heh!";
-			Emotion e_gg;
+			emotion e_gg;
 			next;
 			mes "[" + strcharinfo(0) + "]";
 			mes "Um...";
@@ -837,7 +837,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 		mes "[Riott]";
 		mes "Hmmrmpf!";
 		mes "Eh heh heh heh!";
-		Emotion e_gg;
+		emotion e_gg;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Um...";
@@ -896,15 +896,15 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 	}
 
 OnTouch:
-	Emotion e_gg;
+	emotion e_gg;
 	end;
 }
 
 // Yhelle the Chicken
-//============================================================ 
+//============================================================
 niflheim,239,70,1	script	Yhelle#bard_chick1	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -936,8 +936,8 @@ OnTouch:
 }
 
 niflheim,185,205,3	script	Yhelle#bard_chick2	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -962,8 +962,8 @@ OnTouch:
 }
 
 niflheim,85,203,5	script	Yhelle#bard_chick3	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -988,8 +988,8 @@ OnTouch:
 }
 
 niflheim,149,81,7	script	Yhelle#bard_chick4	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -1014,8 +1014,8 @@ OnTouch:
 }
 
 niflheim,209,144,3	script	Yhelle#bard_chick5	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -1040,7 +1040,7 @@ OnTouch:
 }
 
 // Drunken Men
-//============================================================ 
+//============================================================
 morocc_in,178,73,3	script	Customer#bard_skill01	54,{
 	mes "[Little Bit Drunken Guy]";
 	mes "What do you think";
@@ -1162,7 +1162,7 @@ morocc_in,175,70,7	script	Customer#bard_skill02	50,{
 }
 
 // Bartender
-//============================================================ 
+//============================================================
 morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFHold it right there!";
@@ -1175,8 +1175,7 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 	next;
 	switch(select("Tropical Sograt:Vermilion on the Beach:Nothing, thanks.")) {
 	case 1:
-		set .@now_weight,maxWeight-Weight;
-		if (.@now_weight < 2000) {
+		if (MaxWeight - Weight < 2000) {
 			mes "[Bartender]";
 			mes "You sure you can carry";
 			mes "any more stuff with you?";
@@ -1203,13 +1202,12 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 		mes "mild, but if you're not";
 		mes "careful, you'll pass out";
 		mes "in no time flat. Take it easy.";
-		set zeny,zeny-1000;
+		set Zeny, Zeny-1000;
 		getitem 12112,1; //Tropical_Sograt
 		close;
 
 	case 2:
-		set .@now_weight,maxWeight-Weight;
-		if (.@now_weight < 2000) {
+		if (MaxWeight - Weight < 2000) {
 			mes "[Bartender]";
 			mes "You sure you can carry";
 			mes "any more stuff with you?";
@@ -1234,7 +1232,7 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 		mes "Be sure that you";
 		mes "enjoy your drinking";
 		mes "without going crazy.";
-		set zeny,zeny-1000;
+		set Zeny, Zeny-1000;
 		getitem 12113,1; //Vermilion_The_Beach
 		close;
 
@@ -1247,22 +1245,15 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 }
 
 // Function
-//============================================================ 
+//============================================================
 function	script	F_BardSkillYhelle	{
-	//set max_max_c,1201;
-	//if (max_max_c == 1) {
-	//	mes "^3355FFHold it right there!";
-	//	mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
 		close;
 	}
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt
index 26a69f91e..8764c3e01 100644
--- a/npc/quests/skills/blacksmith_skills.txt
+++ b/npc/quests/skills/blacksmith_skills.txt
@@ -1,13 +1,13 @@
 //===== Hercules Script ======================================
 //= Blacksmith Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Dubious Salesmanship, Greed
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //============================================================
 
@@ -184,7 +184,7 @@ geffen,178,72,3	script	Akkie#qsk_bs	726,{
 						delitem 999,1; //Steel
 						delitem 971,1; //Detrimindexta
 						delitem 613,1; //Iron_Hammer
-						set zeny,zeny-500;
+						set Zeny, Zeny-500;
 						set BLACK_SK,2;
 						close;
 					}
@@ -562,8 +562,7 @@ geffen,172,52,1	script	Goodman#qsk_bs	826,{
 				close;
 			}
 			else if (BLACK_SK2 == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 5000) {
+				if (MaxWeight - Weight < 5000) {
 					mes "[Goodman]";
 					mes "Back already, eh?";
 					mes "Alright, let me check";
@@ -650,20 +649,20 @@ geffen,172,52,1	script	Goodman#qsk_bs	826,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
-//= Somehow eA engine doesn't let you keep learn't skill V_V'
+//=     Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
-//= some of the items required and made them into real
-//= quests. [Reddozen] 
+//=     some of the items required and made them into real
+//=     quests. [Reddozen] 
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
 //= 1.3c Inverted the weight check for Greed [DracoRPG]
 //= 1.4 Updated to the official One [Samuray22]
 //= 1.5 replaced item "names" with item id. Fixed a bug with
-//=		item deletion [Lupus]
+//=     item deletion [Lupus]
 //============================================================
diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt
index 5608acc18..144ab44cf 100644
--- a/npc/quests/skills/crusader_skills.txt
+++ b/npc/quests/skills/crusader_skills.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Crusader Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Shrink
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //============================================================
 
@@ -426,7 +424,7 @@ gef_fild13,297,242,3	script	Soldier#277	751,{
 		}
 		else if (CRUS_SK == 5) {
 			mes "[Sloutii]";
-			if (upper == 1) {
+			if (Upper == 1) {
 				mes "Eeearrrgh--!";
 				mes "My l-legs! Everything";
 				mes "is starting to h-hurt!";
@@ -811,9 +809,9 @@ prt_church,87,127,3	script	Pastor#1011	755,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index 971c100ca..3c7efd345 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Dancer Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Charming Wink
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.4a Changed NPC location [Yommy]
 //= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
@@ -191,7 +189,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			next;
 			mes "^3355FFIt figures that she'd";
 			mes "keep your mirror.^000000";
-			Emotion e_ag,1;
+			emotion e_ag,1;
 			set DANCER_SK,3;
 			close;
 		}
@@ -203,7 +201,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			mes "Oh! It's you. So did my";
 			mes "sister in Prontera Church";
 			mes "teach you anything yet?";
-			Emotion e_go;
+			emotion e_go;
 			close;
 		}
 		else if (DANCER_SK == 7) {
@@ -266,7 +264,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			mes "Look at me, do it";
 			mes "like this. Un, deux, trois~";
 			mes "Now, let me see you try it.";
-			Emotion e_no1;
+			emotion e_no1;
 			next;
 			switch(select("Un deux trois~-:Un, doux trois~:Un, deux, trois~")) {
 			default:
@@ -286,7 +284,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			case 3:
 				mes "["+ strcharinfo(0) +"]";
 				mes "Un, deux, trois~";
-				Emotion e_no1,1;
+				emotion e_no1,1;
 				specialeffect2 EF_FLASHER;
 				next;
 				mes "[Canell]";
@@ -296,7 +294,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 				mes "of rhythm and naturalness";
 				mes "are absolutely essential to";
 				mes "this technique of enticement.";
-				Emotion e_kis;
+				emotion e_kis;
 				next;
 				mes "[Canell]";
 				mes "Now that you've mastered";
@@ -311,7 +309,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 				mes "have that drawback. Ho-ho~";
 				mes "Anyway, it's time for us to part now. I hope that you grow to";
 				mes "become a more glamorous and charming dancer in days to come.";
-				Emotion e_heh;
+				emotion e_heh;
 				next;
 				mes "^3355FFYou have finally learned";
 				mes "the Charming Wink skill.^000000";
@@ -329,7 +327,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			mes "ask me? Ah, you must";
 			mes "be mesmerized by my";
 			mes "beauty, aren't you?";
-			Emotion e_pif;
+			emotion e_pif;
 			next;
 			mes "[Canell]";
 			mes "Oh, to be so beautiful";
@@ -389,7 +387,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			mes "Hey there,";
 			mes "handsome~";
 			mes "^333333*Wink~*^000000";
-			Emotion e_kis;
+			emotion e_kis;
 			specialeffect2 EF_VALLENTINE2;
 			next;
 			mes "^3355FFStrangely enough,";
@@ -540,7 +538,7 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 				mes "I do it! Wink, j-just";
 				mes "like this, okay? Y' see?";
 				mes "^333333*Wiiiiiiiiiiiiiink*^000000";
-				Emotion e_no1;
+				emotion e_no1;
 				next;
 				mes "["+ strcharinfo(0) +"]";
 				mes "Wh-whoa...";
@@ -555,7 +553,7 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 				mes "*Urp* It'sh in the--";
 				mes "Bwahahahaahah!";
 				mes "It's all spinning!";
-				Emotion e_heh;
+				emotion e_heh;
 				next;
 				mes "^3355FFIn her drunken stupor,";
 				mes "Aelle pummels you with";
@@ -563,7 +561,7 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 				mes "maniacally to herself.^000000";
 				percentheal -10,0;
 				specialeffect2 EF_HIT2;
-				Emotion e_dots,1;
+				emotion e_dots,1;
 				delitem 970,1; //Alchol
 				delitem 512,1; //Apple
 				delitem 513,3; //Banana
@@ -644,7 +642,7 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 			mes "[Sober Aelle]";
 			mes "Ohhh...";
 			mes "H-headache...";
-			Emotion e_an;
+			emotion e_an;
 			next;
 			mes "[Aelle]";
 			mes "Oh, wow, look at you!";
@@ -681,14 +679,14 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 			mes "Oh crap, it's the pastor!";
 			mes "Shhh, if anybody asks you,";
 			mes "I wasn't doing anything!";
-			Emotion e_omg;
+			emotion e_omg;
 			next;
 			mes "[Aelle]";
 			mes "Thanks, hon...";
 			mes "I know you can";
 			mes "keep my contraband";
 			mes "our little secret. ^333333*Wink*^000000";
-			Emotion e_no1;
+			emotion e_no1;
 			close;
 		}
 	}
@@ -711,21 +709,21 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 		mes "Oh crap, it's the pastor!";
 		mes "Shhh, if anybody asks you,";
 		mes "I wasn't doing anything!";
-		Emotion e_omg;
+		emotion e_omg;
 		next;
 		mes "[Aelle]";
 		mes "Thanks, hon...";
 		mes "I know you can";
 		mes "keep my contraband";
 		mes "our little secret. ^333333*Wink*^000000";
-		Emotion e_no1;
+		emotion e_no1;
 		close;
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index e6f9f9d41..5178d622f 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -1,34 +1,29 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Hunter Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen, Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena Revision 3800+
-//===== Description: ========================================= 
-//= Temp quests for new skills for 2nd classes
-//===== Additional Comments: ================================= 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Quests for skills: Phantasmic Arrow
+//===== Additional Comments: =================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
-//= Somehow eA engine doesn't let you keep learn't skill V_V'
+//=     Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
-//= some of the items required and made them into real
-//= quests. [Reddozen] 
+//=     some of the items required and made them into real
+//=     quests. [Reddozen] 
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
 //= 1.3c Fixed some typos [IVBela]
 //= 1.3d Changed NPC Name to the official [Lupus]
-//= 1.4	Moved Arpesto from tu_archer and added his script. [Kisuka]
+//= 1.4 Moved Arpesto from tu_archer and added his script. [Kisuka]
 //============================================================
 
-
-//============================================================
-// HUNTER SKILL - PHANTASMIC ARROW
-//============================================================
 pay_arche,109,169,3	script	Arpesto	712,{
-	if (Class == Job_Hunter || Class == Job_Sniper) {
+	if (BaseJob == Job_Hunter) {
 		if (qskill_hunter == 100) {
 			if (getskilllv("HT_PHANTASMIC")) {
 				mes "[Arpesto]";
@@ -50,7 +45,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				mes "I don't know what";
 				mes "you're talking about!";
 				close;
-			}else{
+			} else {
 				mes "[Arpesto]";
 				mes "I recognize you";
 				mes "from somewhere,";
@@ -218,7 +213,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				set qskill_hunter,100;
 				skill "HT_PHANTASMIC",1,0;
 				close;
-			}else{
+			} else {
 				mes "[Arpesto]";
 				mes "Hurry up and bring";
 				mes "^3131FF5 Cursed Rubies^000000,";
@@ -241,7 +236,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				set qskill_hunter,100;
 				close;
 			}
-			if (JobLevel < 40) {
+			if (BaseJob == Job_Hunter && JobLevel < 40) {
 				mes "[Arpesto]";
 				mes "Did the master send you";
 				mes "to me? Hmm... You're still";
@@ -256,7 +251,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				mes "be able to grasp what I've been";
 				mes "teaching Hunters and Snipers.";
 				close;
-			}else{
+			} else {
 				mes "[Arpesto]";
 				mes "Has the master sent you?";
 				mes "Ah, you definitely have the";
@@ -359,7 +354,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				}
 			}
 		}
-	}else{
+	} else {
 		mes "[Arpesto]";
 		mes "The sky still looks clear, but recently the winds that have been blowing through the land seem to carry with them an air of misfortune.";
 		next;
diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt
index 83574900a..9d3358975 100644
--- a/npc/quests/skills/knight_skills.txt
+++ b/npc/quests/skills/knight_skills.txt
@@ -1,20 +1,18 @@
 //===== Hercules Script ======================================
 //= Knight Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Charge Attack
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //============================================================
 
 prt_in,85,99,3	script	Knight#kabuto	734,{
-	if (BaseJob == job_Knight) {
+	if (BaseJob == Job_Knight) {
 		if (KNGT_SK == 10) {
 			mes "[Essofeit]";
 			mes "Ah, it must be grand to";
@@ -513,9 +511,9 @@ prontera,66,358,5	script	Knight#gattack	733,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt
index 2f9d124fa..374330778 100644
--- a/npc/quests/skills/mage_skills.txt
+++ b/npc/quests/skills/mage_skills.txt
@@ -1,14 +1,12 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Mage Skill Quest
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
 //= 1.8
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Quest for skills: Energy Coat
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Fixed a typo in job check. (Bugreport:1531) [L0ne_W0lf]
 //= 1.7 Updated to latest available official file. [Masao]
@@ -156,11 +154,11 @@ geffen_in,151,119,4	script	Great Wizard	64,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
-//= v1.0a Now using functions found in "Global_Functions.txt"
-//= for class checks.[kobra_k88]
+//============================================================
+//= 1.0a Now using functions found in "Global_Functions.txt"
+//=     for class checks.[kobra_k88]
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Fixed exploit [Lupus]
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index 9fb596132..55bc11381 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Merchant Skills Quests
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
 //= 1.8
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Quests for skills: Crazy Uproar, Change Cart, Cart Revolution
 //===== Additional Comments: =================================
@@ -720,17 +718,17 @@ alberta,119,221,6	script	Charlron	107,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Fully working
-//= v1.1 Bug fixes
-//= v1.a Now using functions found in "Global_Functions.txt"
-//= for class checks.[kobra_k88]
+//= 1.1 Bug fixes
+//= 1.a Now using functions found in "Global_Functions.txt"
+//=     for class checks.[kobra_k88]
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Fixed exploits [Lupus]
 //= 1.4a Fixed some typos [IVBela] 1.4b  Gershaun -> Gershuan
-//= 	changed perm. variables to temp ones [Lupus]
+//=     changed perm. variables to temp ones [Lupus]
 //= 1.4b Added missing 1 Banana Juice requirement to Cart Revolution [DracoRPG]
 //============================================================
diff --git a/npc/quests/skills/monk_skills.txt b/npc/quests/skills/monk_skills.txt
index 46d0e6f77..920827f51 100644
--- a/npc/quests/skills/monk_skills.txt
+++ b/npc/quests/skills/monk_skills.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Monk Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Spiritual Bestowment, Excruciating Palm
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //============================================================
 
@@ -433,9 +431,9 @@ monk_test,316,69,5	script	Monk#qsk_mo	823,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt
index 17a670eed..a3028bc93 100644
--- a/npc/quests/skills/novice_skills.txt
+++ b/npc/quests/skills/novice_skills.txt
@@ -1,18 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Novice Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
-//= 1.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.8
+//===== Description: =========================================
 //= Quest for skills: First Aid, Trick Dead
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.7 Updated to latest available official file. [Masao]
-//============================================================ 
+//= 1.8 Added Baby support. [Zopokx]
+//============================================================
 
 prt_in,234,133,4	script	Nami	66,{
 	if ((Class == Job_Novice || Class == Job_Baby) && (JobLevel > 3 || BaseLevel > 11) && (skill_nov < 3)) {
@@ -468,13 +467,13 @@ prt_castle,175,146,4	script	Nursing Instructor	50,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Fully working
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Fixed a Zeny exploit, made more variables clear
 //= on finishing quests. [Lupus]
 //= 1.4 Fixed exploits [Lupus]
 //= 1.4a Fixed some typos [IVBela]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt
index 3b44e4de3..5cb0f7ba8 100644
--- a/npc/quests/skills/priest_skills.txt
+++ b/npc/quests/skills/priest_skills.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Priest Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Redempito
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
@@ -363,9 +361,9 @@ prt_church,111,112,1	script	Sister Linus	79,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt
index 8b804e0cd..6d9034627 100644
--- a/npc/quests/skills/rogue_skills.txt
+++ b/npc/quests/skills/rogue_skills.txt
@@ -1,21 +1,20 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Rogue Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
-//= 1.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.8
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: CLose Confine
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Bug fixes as pointed out by Brainstorm in bugreport:351 [L0ne_W0lf]
 //= 1.6a Fixed(?) antoher problem (NPCs not disabling) hopefully. [L0ne_W0lf]
 //= 1.6b Corrected a Typo error with "rouge". (bugreport:909) [Samuray22]
 //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 1.8 Some cleaning. [Euphy]
 //============================================================
 
 in_rogue,359,177,0	script	#killershow01	-1,{
@@ -85,80 +84,28 @@ OnTouch:
 		mes "yellow. If he intends to go";
 		mes "backward, it will be pale red.";
 		next;
-		while(1) {
-			if (.@lim_1 == 10) {
-				break;
+		setarray .@Effects[1],EF_CHANGECOLD,EF_CHANGEWIND,EF_CHANGEEARTH;
+		for(set .@lim_1,0; .@lim_1<10; set .@lim_1,.@lim_1+1) {
+			set .@move_1,rand(1,3);
+			specialeffect .@Effects[.@move_1];
+			if (select("Block him to the Left:Block him to the Right:Block his Retreat") == .@move_1) {
+				mes "^3355FFThe killer remains";
+				mes "unable to move and looks";
+				mes "incredibly confused! Right";
+				mes "now, you're using the Close";
+				mes "Confine skill perfectly!^000000";
+				specialeffect EF_POTION1;
+				specialeffect2 EF_POTION7;
 			}
 			else {
-				set .@lim_1,.@lim_1 + 1;
-				set .@move_1,rand(1,3);
-				if (.@move_1 == 1) {
-					specialeffect EF_CHANGECOLD;
-					if (select("Block him to the Left:Block him to the Right:Block his Retreat") == 1) {
-						mes "^3355FFThe killer remains";
-						mes "unable to move and looks";
-						mes "incredibly confused! Right";
-						mes "now, you're using the Close";
-						mes "Confine skill perfectly!^000000";
-						specialeffect EF_POTION1;
-						specialeffect2 EF_POTION7;
-						next;
-					}
-					else {
-						mes "^3355FFWait--!";
-						mes "For some reason,";
-						mes "you sense that's not";
-						mes "the direction the killer";
-						mes "is moving at this moment.";
-						mes "You naturally correct yourself.^000000";
-						next;
-					}
-				}
-				else if (.@move_1 == 2) {
-					specialeffect EF_CHANGEWIND;
-					if (select("Block him at the Left:Block him at the Right:Block him at the back") == 2) {
-						mes "^3355FFThe killer remains";
-						mes "unable to move and looks";
-						mes "incredibly confused! Right";
-						mes "now, you're using the Close";
-						mes "Confine skill perfectly!^000000";
-						specialeffect EF_POTION1;
-						specialeffect2 EF_POTION7;
-						next;
-					}
-					else {
-						mes "^3355FFWait--!";
-						mes "For some reason,";
-						mes "you sense that's not";
-						mes "the direction the killer";
-						mes "is moving at this moment.";
-						mes "You naturally correct yourself.^000000";
-						next;
-					}
-				}
-				else if (.@move_1 == 3) {
-					specialeffect EF_CHANGEEARTH;
-					if (select("Block him at the Left:Block him at the Right:Block him at the back") == 3) {
-						mes "^3355FFThe killer remains";
-						mes "unable to move and looks";
-						mes "incredibly confused! Right";
-						mes "now, you're using the Close";
-						mes "Confine skill perfectly!^000000";
-						specialeffect EF_POTION1;
-						specialeffect2 EF_POTION7;
-						next;
-					}
-					else {
-						mes "^3355FFWait--!";
-						mes "For some reason,";
-						mes "you sense that's not";
-						mes "the direction the killer";
-						mes "is moving at this moment.";
-						mes "You naturally correct yourself.^000000";
-						next;
-					}
-				}
+				mes "^3355FFWait--!";
+				mes "For some reason,";
+				mes "you sense that's not";
+				mes "the direction the killer";
+				mes "is moving at this moment.";
+				mes "You naturally correct yourself.^000000";
 			}
+			next;
 		}
 		mes "^3355FFYou successfully";
 		mes "retrieved the priceless";
@@ -1207,58 +1154,16 @@ OnDisable:
 prt_are01,149,162,0	script	Kienna#1st	700,1,1,{
 	end;
 OnTouch:
-	callfunc "F_Kienna","1st";
-	end;
-}
-
-prt_are01,136,150,0	script	Kienna#2nd	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","2nd";
-	end;
-}
-
-prt_are01,150,138,0	script	Kienna#3rd	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","3rd";
-	end;
-}
-
-prt_are01,163,147,0	script	Kienna#4th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","4th";
-	end;
-}
-
-prt_are01,134,140,0	script	Kienna#5th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","5th";
-	end;
-}
-
-prt_are01,161,140,0	script	Kienna#6th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","6th";
-	end;
-}
-
-prt_are01,161,160,0	script	Kienna#7th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","7th";
-	end;
-}
-
-prt_are01,138,159,0	script	Kienna#8th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","8th";
+	callfunc "F_Kienna",strnpcinfo(2);
 	end;
 }
+prt_are01,136,150,0	duplicate(Kienna#1st)	Kienna#2nd	700,1,1
+prt_are01,150,138,0	duplicate(Kienna#1st)	Kienna#3rd	700,1,1
+prt_are01,163,147,0	duplicate(Kienna#1st)	Kienna#4th	700,1,1
+prt_are01,134,140,0	duplicate(Kienna#1st)	Kienna#5th	700,1,1
+prt_are01,161,140,0	duplicate(Kienna#1st)	Kienna#6th	700,1,1
+prt_are01,161,160,0	duplicate(Kienna#1st)	Kienna#7th	700,1,1
+prt_are01,138,159,0	duplicate(Kienna#1st)	Kienna#8th	700,1,1
 
 function	script	F_Kienna	{
 	if (ROG_SK == 6) {
@@ -1272,71 +1177,24 @@ function	script	F_Kienna	{
 		mes "immobilizing me. Get ready~";
 		set ROG_SK,7;
 		next;
-		while(1) {
-			if (.@lim_1 == 10) {
-				break;
+		for(set .@lim_1,0; .@lim_1<10; set .@lim_1,.@lim_1+1) {
+			set .@move_1,rand(1,3);
+			if (select("Block her to the Left:Block her to the Right:Block her retreat") == .@move_1) {
+				mes "[Kienna]";
+				mes "Huh...?";
+				mes "You blocked me!";
+				mes "Very nice work~";
+				specialeffect EF_POTION1;
+				specialeffect2 EF_POTION7;
+				set .@suc_1,.@suc_1 + 1;
 			}
 			else {
-				set .@lim_1,.@lim_1 + 1;
-				set .@move_1,rand(1,3);
-				if (.@move_1 == 1) {
-					if (select("Block her to the Left:Block her to the Right:Block her retreat") == 1) {
-						mes "[Kienna]";
-						mes "Huh...?";
-						mes "You blocked me!";
-						mes "Very nice work~";
-						specialeffect 204; //EF_POTION1
-						specialeffect2 210; // EF_POTION7
-						set .@suc_1,.@suc_1 + 1;
-						next;
-					}
-					else {
-						mes "[Kienna]";
-						mes "Sorry, but I wasn't";
-						mes "moving in that direction.";
-						mes "Your block attempt failed...";
-						next;
-					}
-				}
-				else if (.@move_1 == 2) {
-					if (select("Block her to the Left:Block her to the Right:Block her retreat") == 2) {
-						mes "[Kienna]";
-						mes "Huh...?";
-						mes "You blocked me!";
-						mes "Very nice work~";
-						specialeffect 204; //EF_POTION1
-						specialeffect2 210; // EF_POTION7
-						set .@suc_1,.@suc_1 + 1;
-						next;
-					}
-					else {
-						mes "[Kienna]";
-						mes "Sorry, but I wasn't";
-						mes "moving in that direction.";
-						mes "Your block attempt failed...";
-						next;
-					}
-				}
-				else if (.@move_1 == 3) {
-					if (select("Block her to the Left:Block her to the Right:Block her retreat") == 3) {
-						mes "[Kienna]";
-						mes "Huh...?";
-						mes "You blocked me!";
-						mes "Very nice work~";
-						specialeffect 204; //EF_POTION1
-						specialeffect2 210; // EF_POTION7
-						set .@suc_1,.@suc_1 + 1;
-						next;
-					}
-					else {
-						mes "[Kienna]";
-						mes "Sorry, but I wasn't";
-						mes "moving in that direction.";
-						mes "Your block attempt failed...";
-						next;
-					}
-				}
+				mes "[Kienna]";
+				mes "Sorry, but I wasn't";
+				mes "moving in that direction.";
+				mes "Your block attempt failed...";
 			}
+			next;
 		}
 		mes "[Kienna]";
 		mes "Alright, we're done";
@@ -1495,9 +1353,9 @@ OnStartArena:
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt
index 1058bb6a8..c66978a85 100644
--- a/npc/quests/skills/sage_skills.txt
+++ b/npc/quests/skills/sage_skills.txt
@@ -1,670 +1,69 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Sage Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Create Converter, Elemental Change
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 standards. [5511]
+//= 1.5 Optimized. [Euphy]
 //============================================================
 
 yuno_in03,176,24,3	script	Mischna	755,{
-	if(BaseJob == Job_Sage) {
-		if(SAG_SK == 100) {
-			if(getskilllv("SA_ELEMENTFIRE") == 0 && getskilllv("SA_ELEMENTGROUND") == 0 && getskilllv("SA_ELEMENTWIND") == 0 && getskilllv("SA_ELEMENTWATER") == 0 && getskilllv("SA_CREATECON") == 0) {
-				mes "[Mishuna]";
-				mes "Ah, you must have";
-				mes "forgotten what I taught";
-				mes "you somehow. Perhaps";
-				mes "you lost your copy of the";
-				mes "skill scroll I gave you? No";
-				mes "matter, I'll help you remember.";
-				next;
-				mes "[Mishuna]";
-				mes "You'll be given the chance to";
-				mes "choose which kind of ^FF0000Elemental";
-				mes "Change^000000 skill that you want, even one that you didn't previously";
-				mes "learn, so long as you fulfill";
-				mes "the skill's requirements.";
-				next;
-				mes "[Mishuna]";
-				mes "Keep in mind that once";
-				mes "you learn your Elemental";
-				mes "Change skill, you won't be";
-				mes "able to change it. Now, which";
-				mes "skill would you like to learn?";
-				next;
-				while(1) {
-					switch(select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")) {
-					case 1:
-						if (getskilllv("SA_FLAMELAUNCHER") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Blaze^000000, the skill";
-							mes "required for ^FF0000Fire Elemental";
-							mes "Change^000000. You'll need to learn";
-							mes "Endow Blaze or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Fire";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Fire Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTFIRE",1,0;
-							skill "SA_CREATECON",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 2:
-						if (getskilllv("SA_SEISMICWEAPON") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Quake^000000, the skill";
-							mes "required for ^FF0000Earth Elemental";
-							mes "Change^000000. You'll need to learn";
-							mes "Endow Quake or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Earth";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Earth Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTGROUND",1,0;
-							skill "SA_CREATECON",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 3:
-						if (getskilllv("SA_LIGHTNINGLOADER") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Tornado^000000, the";
-							mes "skill required for ^FF0000Wind Elemental Change^000000. You must learn Endow";
-							mes "Tornado or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Wind";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Wind Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTWIND",1,0;
-							skill "SA_CREATECON",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 4:
-						if (getskilllv("SA_FROSTWEAPON") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Tsunami^000000, the";
-							mes "skill required for ^FF0000Water Elemental Change^000000. You must learn Endow";
-							mes "Tsunami or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Water";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Water Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTWATER",1,0;
-							skill "SA_CREATECON",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					}
-				}
-			}
-			else if(getskilllv("SA_ELEMENTFIRE") == 0 && getskilllv("SA_ELEMENTGROUND") == 0 && getskilllv("SA_ELEMENTWIND") == 0 && getskilllv("SA_ELEMENTWATER") == 0) {
-				mes "[Mishuna]";
-				mes "Ah, you must have";
-				mes "forgotten what I taught";
-				mes "you somehow. Perhaps";
-				mes "you lost your copy of the";
-				mes "skill scroll I gave you? No";
-				mes "matter, I'll help you remember.";
-				next;
-				mes "[Mishuna]";
-				mes "You'll be given the chance to";
-				mes "choose which kind of ^FF0000Elemental";
-				mes "Change^000000 skill that you want, even one that you didn't previously";
-				mes "learn, so long as you fulfill";
-				mes "the skill's requirements.";
-				next;
-				mes "[Mishuna]";
-				mes "Keep in mind that once";
-				mes "you learn your Elemental";
-				mes "Change skill, you won't be";
-				mes "able to change it. Now, which";
-				mes "skill would you like to learn?";
-				next;
-				while(1) {
-					switch(select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")) {
-					case 1:
-						if (getskilllv("SA_FLAMELAUNCHER") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Blaze^000000, the skill";
-							mes "required for ^FF0000Fire Elemental";
-							mes "Change^000000. You'll need to learn";
-							mes "Endow Blaze or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Fire";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Fire Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTFIRE",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 2:
-						if (getskilllv("SA_SEISMICWEAPON") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Quake^000000, the skill";
-							mes "required for ^FF0000Earth Elemental";
-							mes "Change^000000. You'll need to learn";
-							mes "Endow Quake or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Earth";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Earth Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTGROUND",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 3:
-						if (getskilllv("SA_LIGHTNINGLOADER") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Tornado^000000, the";
-							mes "skill required for ^FF0000Wind Elemental Change^000000. You must learn Endow";
-							mes "Tornado or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Wind";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Wind Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTWIND",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 4:
-						if (getskilllv("SA_FROSTWEAPON") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Tsunami^000000, the";
-							mes "skill required for ^FF0000Water Elemental Change^000000. You must learn Endow";
-							mes "Tsunami or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Water";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Water Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTWATER",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					}
-				}
-			}
-			else if(getskilllv("SA_CREATECON") == 0) {
-				mes "[Mishuna]";
-				mes "Ah, you must have";
-				mes "forgotten what I taught";
-				mes "you somehow. Perhaps";
-				mes "you lost your copy of the";
-				mes "skill scroll I gave you? No";
-				mes "matter, I'll help you remember.";
-				next;
-				mes "[Mishuna]";
-				mes "Alright, I'm going";
-				mes "to cast a spell that";
-				mes "will help you remember";
-				mes "the skills you forgot.";
-				mes "Don't move, and try to";
-				mes "stay as still as possible...";
-				next;
-				mes "[Mishuna]";
-				mes "%$#@!#$% Yap~~";
-				specialeffect2 EF_RUWACH;
-				next;
-				mes "[Mishuna]";
-				mes "Yap!";
-				specialeffect2 EF_BRANDISHSPEAR;
-				next;
-				mes "^3355FFYou successfully recalled";
-				mes "the Elemental Coverter";
-				mes "Creation skill and are";
-				mes "able to use it again.^000000";
-				skill "SA_CREATECON",1,0;
-				next;
-				mes "[Mishuna]";
-				mes "Ah, you've learned these";
-				mes "skills as quickly as I thought";
-				mes "you would. Very well then, ";
-				mes "I hope you adeptly use these";
-				mes "talents for the right purposes.";
-				mes "Farewell for now, "+strcharinfo(0)+".";
-				close;
-			}
-			else {
-				mes "[Mishuna]";
-				mes "If you have any Sage or";
-				mes "Scholar friends who haven't";
-				mes "learned the skills from Sir";
-				mes "Barmundt's scrolls, then";
-				mes "please refer them to me.";
-				next;
-				mes "[Mishuna]";
-				mes "I trust that you are";
-				mes "finding that these";
-				mes "element based skills";
-				mes "are very useful in battle.";
-				mes "Knowledge truly equates";
-				mes "to power in the long run...";
-				close;
-			}
-		}
-		else if(SAG_SK == 0) {
-			mes "[Mishuna]";
-			mes "Good day, I'm Mishuna, one";
-			mes "of the instructors here in the";
-			mes "Schweicherbil Magic Academy.";
-			mes "How may I be of service?";
-			next;
-			select("I seek new knowledge.");
-			mes "[Mishuna]";
-			mes "Ah, you must be "+strcharinfo(0)+".";
-			mes "I've looked forward to meeting";
-			mes "you. In the noble pursuit of";
-			mes "knowledge, might I suggest";
-			mes "reading the recently restored";
-			mes "scrolls of Sir Barmundt?";
-			next;
-			mes "[Mishuna]";
-			mes "Sir Barmundt's scrolls contain";
-			mes "knowledge about the 4 elements,";
-			mes "which are Fire, Water, Earth, and Wind. The knowledge of these";
-			mes "scrolls can be applied in the";
-			mes "use of 2 new Sage skills.";
-			next;
-			mes "[Mishuna]";
-			mes "The first is called ^FF0000Elemental";
-			mes "Change^000000, which enables you";
-			mes "to change a monster's attribute";
-			mes "according to the specific element^FFFFFF ^000000 of the Elemental Change skill";
-			mes "that you have learned.";
-			next;
-			mes "[Mishuna]";
-			mes "The second is called";
-			mes "Elemental Converter Creation,";
-			mes "which enables you to create";
-			mes "converter items that are required^FFFFFF ^000000 to use the Elemental Change skill.";
-			next;
-			mes "[Mishuna]";
-			mes "Although the knowledge of";
-			mes "these two skills has been";
-			mes "lost for years, we've finally";
-			mes "been able to recover most";
-			mes "of it. So, do you think you're";
-			mes "ready to learn these skills?";
-			next;
-			if(select("Maybe later.:Yes, I am.") == 1) {
-				mes "[Mishuna]";
-				mes "Ah, you must be busy right";
-				mes "now. No problem, just come";
-				mes "back when you think you're";
-				mes "ready to learn. Well then,";
-				mes "farewell and have a good day~";
-				close;
-			}
-			mes "[Mishuna]";
-			mes "Very well, then. First, you";
-			mes "must learn the Elemental";
-			mes "Coverter Creation skill, which";
-			mes "is essential to learning the";
-			mes "Elemental Change skill.";
-			next;
-			mes "[Mishuna]";
-			mes "Please bring the required";
-			mes "materials so that we can";
-			mes "construct a basic elemental";
-			mes "converter in order for you to";
-			mes "learn the skill. Let's see,";
-			mes "you will need to bring...";
-			next;
+	if(BaseJob != Job_Sage) {
+		mes "[Mishuna]";
+		mes "Good day, I'm Mishuna, one";
+		mes "of the instructors here in the";
+		mes "Schweicherbil Magic Academy.";
+		mes "By any chance, are you a Sage";
+		mes "or Scholar? Oh... You're not?";
+		next;
+		mes "[Mishuna]";
+		mes "Oh, that's too bad.";
+		mes "My apologies. But if you";
+		mes "happen to know any, or meet";
+		mes "any in your journeys, please";
+		mes "direct them to me if they haven't heard of the lessons I provide.";
+		next;
+		mes "[Mishuna]";
+		mes "I'm sorry to bother";
+		mes "you, and I thank you";
+		mes "for your time. Good";
+		mes "day to you, adventurer.";
+		close;
+	}
+	if(SAG_SK == 100) {
+		set .@Element, getskilllv("SA_ELEMENTFIRE") + getskilllv("SA_ELEMENTGROUND") + getskilllv("SA_ELEMENTWIND") + getskilllv("SA_ELEMENTWATER");
+		set .@Convert, getskilllv("SA_CREATECON");
+		if(.@Element && .@Convert) {
 			mes "[Mishuna]";
-			mes "^ff00007 Horns^000000,";
-			mes "^ff000012 Rainbow Shells^000000,";
-			mes "^ff000010 Snail's Shells^000000,";
-			mes "^ff00004 Blank Scrolls^000000 and";
-			mes "^ff000010 Scorpion Tails^000000.^000000";
+			mes "If you have any Sage or";
+			mes "Scholar friends who haven't";
+			mes "learned the skills from Sir";
+			mes "Barmundt's scrolls, then";
+			mes "please refer them to me.";
 			next;
 			mes "[Mishuna]";
-			mes "Alright, I shall be";
-			mes "nexting here for your";
-			mes "return. Remember that we";
-			mes "need these items to create";
-			mes "a converter so that you can^FFFFFF ^000000 learn the skill from my example...";
-			set SAG_SK,1;
+			mes "I trust that you are";
+			mes "finding that these";
+			mes "element based skills";
+			mes "are very useful in battle.";
+			mes "Knowledge truly equates";
+			mes "to power in the long run...";
 			close;
 		}
-		else if(SAG_SK == 1) {
-			if (countitem(904) < 10 || countitem(947) < 7 || countitem(1013) < 12 || countitem(946) < 10 || countitem(7433) < 4) {
-				mes "[Mishuna]";
-				mes "Hm, you still haven't";
-				mes "gathered all of the materials";
-				mes "required to create an elemental";
-				mes "coverter. Let me remind you";
-				mes "what to bring so that you";
-				mes "don't forget next time...";
-				next;
-				mes "[Mishuna]";
-				mes "^ff00007 Horns^000000,";
-				mes "^ff000012 Rainbow Shells^000000,";
-				mes "^ff000010 Snail's Shells^000000,";
-				mes "^ff00004 Blank Scrolls^000000 and";
-				mes "^ff000010 Scorpion Tails^000000.^000000";
-				next;
-				mes "[Mishuna]";
-				mes "Don't forget that we need";
-				mes "all of these items to create";
-				mes "a converter so that you can";
-				mes "learn the Elemental Converter";
-				mes "Creation skill by watching";
-				mes "me demonstrate it for you.";
-				close;
-			}
-			else {
-				mes "[Mishuna]";
-				mes "Great, you brought everything.";
-				mes "Now, let me explain the skill.";
-				mes "The skills you learn as a Sage";
-				mes "determine what kind of elemental converters that you can craft.";
-				next;
-				mes "[Mishuna]";
-				mes "The ^FF0000Endow Blaze^000000 skill enables";
-				mes "you to create Fire elemental";
-				mes "converters. The ^FF0000Endow Quake^000000";
-				mes "skill enables the creation";
-				mes "of Earth elemental converters.";
-				next;
-				mes "[Mishuna]";
-				mes "^FF0000Endow Tornado^000000 enables";
-				mes "the creation of Wind elemental";
-				mes "converters, and ^FF0000Endow Tsunami^000000";
-				mes "enables the creation of Water";
-				mes "elemental converters. That";
-				mes "all makes sense, right?";
-				next;
-				mes "[Mishuna]";
-				mes "Now, your elemental coverter";
-				mes "creation success rate depends";
-				mes "on the level of the Endow Blaze, Endow Quake, Endow Tornado,";
-				mes "or Endow Tsunami skills, and";
-				mes "your abilities.";
-				next;
-				mes "[Mishuna]";
-				mes "Now, please take this copy";
-				mes "of Barmundt's scroll, and use";
-				mes "it as a reference when you try";
-				mes "to craft elemental converters";
-				mes "when you use the Elemental";
-				mes "Converter Creation skill.";
-				next;
-				mes "^3355FFYou have learned the";
-				mes "Elemental Converter";
-				mes "Creation skill by reviewing";
-				mes "your copy of Barmundt's scroll.^000000";
-				specialeffect2 EF_ABSORBSPIRITS;
-				delitem 904,10; // Scorpion_Tail
-				delitem 947,7; // Horn
-				delitem 1013,12; // Rainbow_Shell
-				delitem 946,10; // Snail's_Shell
-				delitem 7433,4; // Blank_Scroll
-				set SAG_SK,2;
-				skill "SA_CREATECON",1,0;
-				next;
-				mes "[Mishuna]";
-				mes "Wow, "+strcharinfo(0)+"!";
-				mes "You learned that skill";
-				mes "really quickly! No wonder";
-				mes "people say that you're one";
-				mes "of the best Sages around!";
-				next;
-				mes "[Mishuna]";
-				mes "Now you're ready to";
-				mes "learn the other skill,";
-				mes "Elemental Change. Alright,";
-				mes "I need to prepare a few things";
-				mes "for this lesson, so we'll meet";
-				mes "and discuss this later, okay?";
-				close;
-			}
-		}
-		else if(SAG_SK == 2) {
-			if(getskilllv("SA_CREATECON") == 0) {
-				skill "SA_CREATECON",1,0;
-				mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
-				next;
-			}
+		mes "[Mishuna]";
+		mes "Ah, you must have";
+		mes "forgotten what I taught";
+		mes "you somehow. Perhaps";
+		mes "you lost your copy of the";
+		mes "skill scroll I gave you? No";
+		mes "matter, I'll help you remember.";
+		next;
+		if(.@Element == 0) {
 			mes "[Mishuna]";
 			mes "You'll be given the chance to";
 			mes "choose which kind of ^FF0000Elemental";
@@ -679,442 +78,411 @@ yuno_in03,176,24,3	script	Mischna	755,{
 			mes "able to change it. Now, which";
 			mes "skill would you like to learn?";
 			next;
+			setarray .@ReqSkill[0],280,283,282,281;
+			setarray .@ReqSkill$[0],"Blaze","Quake","Tornado","Tsunami";
+			setarray .@Skill[0],1018,1017,1019,1008;
+			setarray .@Skill$[0],"Fire","Earth","Wind","Water";
 			while(1) {
-				switch(select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")) {
-				case 1:
-					if(getskilllv("SA_FLAMELAUNCHER") == 0) {
-						mes "[Mishuna]";
-						mes "I'm sorry, but you have not";
-						mes "learned ^FF0000Endow Blaze^000000, the skill";
-						mes "required for the Fire Elemental Change skill. Please learn Endow";
-						mes "Blaze or select another Elemental Change skill for me to teach you.";
-						next;
-					}
-					else {
-						mes "[Mishuna]";
-						mes "Very well, then. Please";
-						mes "bring the following items";
-						mes "so that you can learn the";
-						mes "Fire Elemental Change skill.";
-						next;
-						mes "[Mishuna]";
-						mes "^FF000020 Red Bloods^000000,";
-						mes "^FF00001 Payon Solution^000000 and";
-						mes "^FF00001 Morroc Solution^000000. Please";
-						mes "return to me once you have";
-						mes "all the materials ready.";
-						set SAG_SK,10;
-						close;
-					}
-					break;
-				case 2:
-					if(getskilllv("SA_SEISMICWEAPON") == 0) {
-						mes "[Mishuna]";
-						mes "I'm sorry, but you have not";
-						mes "learned ^FF0000Endow Quake^000000, the skill";
-						mes "required for the Earth Elemental Change skill. Please learn Endow";
-						mes "Quake or select another Elemental Change skill for me to teach you.";
-						next;
-					}
-					else {
-						mes "[Mishuna]";
-						mes "Very well, then. Please";
-						mes "bring the following items";
-						mes "so that you can learn the";
-						mes "Earth Elemental Change skill.";
-						next;
-						mes "[Mishuna]";
-						mes "^ff000020 Green Lives^000000,";
-						mes "^ff00001 Payon Solution^000000 and";
-						mes "^ff00001 Morroc Solution^000000. Please";
-						mes "return to me once you have";
-						mes "all the materials ready.";
-						set SAG_SK,20;
-						close;
-					}
-					break;
-				case 3:
-					if(getskilllv("SA_LIGHTNINGLOADER") == 0) {
-						mes "[Mishuna]";
-						mes "I'm sorry, but you have not learned ^FF0000Endow Tornado^000000, the skill";
-						mes "required for the Wind Elemental Change skill. Please learn Endow";
-						mes "Tornado or pick another Elemental Change skill for me to teach you.";
-						next;
-					}
-					else {
-						mes "[Mishuna]";
-						mes "Very well, then. Please";
-						mes "bring the following items";
-						mes "so that you can learn the";
-						mes "Wind Elemental Change skill.";
-						next;
-						mes "[Mishuna]";
-						mes "^ff000020 Winds of Verdure^000000,";
-						mes "^ff00001 Payon Solution^000000 and";
-						mes "^ff00001 Morroc Solution^000000. Please";
-						mes "return to me once you have";
-						mes "all the materials ready.";
-						set SAG_SK,30;
-						close;
-					}
-					break;
-				case 4:
-					if(getskilllv("SA_FROSTWEAPON") == 0) {
-						mes "[Mishuna]";
-						mes "I'm sorry, but you have not learned ^FF0000Endow Tsunami^000000, the skill";
-						mes "required for the Water Elemental Change skill. Please learn Endow";
-						mes "Tsunami or pick another Elemental Change skill for me to teach you.";
-						next;
-					}
-					else {
-						mes "[Mishuna]";
-						mes "Very well, then. Please";
-						mes "bring the following items";
-						mes "so that you can learn the";
-						mes "Water Elemental Change skill.";
-						next;
-						mes "[Mishuna]";
-						mes "^ff000020 Crystal Blues^000000,";
-						mes "^ff00001 Payon Solution^000000 and";
-						mes "^ff00001 Morroc Solution^000000. Please";
-						mes "return to me once you have";
-						mes "all the materials ready.";
-						set SAG_SK,40;
-						close;
-					}
+				set .@i, select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")-1;
+				if(getskilllv(.@ReqSkill[.@i]) == 0) {
+					mes "[Mishuna]";
+					mes "I'm sorry, but you haven't";
+					mes "learned ^FF0000Endow "+.@ReqSkill$[.@i]+"^000000, the skill";
+					mes "required for ^FF0000"+.@Skill$[.@i]+" Elemental";
+					mes "Change^000000. You'll need to learn";
+					mes "Endow "+.@ReqSkill$[.@i]+" or select another";
+					mes "Elemental Change skill.";
+					next;
+				}
+				else {
+					mes "[Mishuna]";
+					mes "Very well, I shall";
+					mes "teach you the ^FF0000"+.@Skill$[.@i];
+					mes "Elemental Change^000000 skill";
+					mes "and the ^FF0000Elemental Converter";
+					mes "Creation skill^000000. Please remain";
+					mes "still while I chant this spell.";
+					next;
+					mes "[Mishuna]";
+					mes "%$#@!#$% Yap~~";
+					specialeffect2 EF_RUWACH;
+					next;
+					mes "[Mishuna]";
+					mes "Yap!";
+					specialeffect2 EF_BRANDISHSPEAR;
+					next;
+					mes "^3355FFYou've successfully";
+					mes "learned the "+.@Skill$[.@i]+" Elemental";
+					mes "Change skill and the Elemental";
+					mes "Converter Creation skill.^000000";
+					skill .@Skill[.@i],1,0;
+					if(.@Convert == 0)
+						skill "SA_CREATECON",1,0;
+					next;
 					break;
 				}
 			}
 		}
-		else if(SAG_SK == 10) {
-			if(getskilllv("SA_CREATECON") == 0) {
-				skill "SA_CREATECON",1,0;
-				mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
-				next;
-			}
-			if (countitem(990) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
-				mes "[Mishuna]";
-				mes "Are you having trouble";
-				mes "gathering all the required";
-				mes "items? Just in case, let me";
-				mes "remind you of what you need";
-				mes "to bring me to learn the Fire";
-				mes "Elemental Change skill.";
-				next;
-				mes "[Mishuna]";
-				mes "^ff000020 Red Bloods^000000,";
-				mes "^ff00001 Payon Solution^000000 and";
-				mes "^ff00001 Morroc Solution^000000. Please";
-				mes "don't forget and have the";
-				mes "materials ready for the next";
-				mes "time you see me, alright?";
-				close;
-			}
-			mes "[Mishuna]";
-			mes "Ah, you're back. I can now";
-			mes "finally teach you about the";
-			mes "Fire Elemental Change skill.";
-			mes "This skill has the chance to";
-			mes "permanently change a targeted";
-			mes "monster's attribute to ^FF0000Fire^000000.";
-			next;
+		else if(.@Convert == 0) {
 			mes "[Mishuna]";
-			mes "Remember that you must";
-			mes "use an elemental converter to";
-			mes "cast this skill, and that it has^FFFFFF ^000000a success rate, similarly to the";
-			mes "Elemental Converter Creation";
-			mes "skill. So be aware of that.";
+			mes "Alright, I'm going";
+			mes "to cast a spell that";
+			mes "will help you remember";
+			mes "the skills you forgot.";
+			mes "Don't move, and try to";
+			mes "stay as still as possible...";
 			next;
 			mes "[Mishuna]";
-			mes "Now, "+strcharinfo(0)+",";
-			mes "I'm going to cast a spell";
-			mes "that will help you memorize";
-			mes "the Fire Elemental Change";
-			mes "skill. Try to stay still...";
-			next;
-			mes "^3355FFMishuna begins to chant";
-			mes "a strange incantation as";
-			mes "a soft blue glow surrounds";
-			mes "his body and slowly grows";
-			mes "brighter and more intense.^000000";
+			mes "%$#@!#$% Yap~~";
 			specialeffect2 EF_RUWACH;
 			next;
 			mes "[Mishuna]";
-			mes "@#$%^~ Yap!";
+			mes "Yap!";
 			specialeffect2 EF_BRANDISHSPEAR;
-			delitem 990,20; // Boody Red
-			delitem 1089,1; // Payon Potion
-			delitem 1088,1; // Morocc Potion
-			set SAG_SK,100;
-			skill "SA_ELEMENTFIRE",1,0;
 			next;
+			mes "^3355FFYou successfully recalled";
+			mes "the Elemental Coverter";
+			mes "Creation skill and are";
+			mes "able to use it again.^000000";
+			skill "SA_CREATECON",1,0;
+			next;
+		}
+		mes "[Mishuna]";
+		mes "Ah, you've learned these";
+		mes "skills as quickly as I thought";
+		mes "you would. Very well then,";
+		mes "I hope you adeptly use these";
+		mes "talents for the right purposes.";
+		mes "Farewell for now, "+strcharinfo(0)+".";
+		close;
+	}
+	else if(SAG_SK == 0) {
+		mes "[Mishuna]";
+		mes "Good day, I'm Mishuna, one";
+		mes "of the instructors here in the";
+		mes "Schweicherbil Magic Academy.";
+		mes "How may I be of service?";
+		next;
+		select("I seek new knowledge.");
+		mes "[Mishuna]";
+		mes "Ah, you must be "+strcharinfo(0)+".";
+		mes "I've looked forward to meeting";
+		mes "you. In the noble pursuit of";
+		mes "knowledge, might I suggest";
+		mes "reading the recently restored";
+		mes "scrolls of Sir Barmundt?";
+		next;
+		mes "[Mishuna]";
+		mes "Sir Barmundt's scrolls contain";
+		mes "knowledge about the 4 elements,";
+		mes "which are Fire, Water, Earth, and Wind. The knowledge of these";
+		mes "scrolls can be applied in the";
+		mes "use of 2 new Sage skills.";
+		next;
+		mes "[Mishuna]";
+		mes "The first is called ^FF0000Elemental";
+		mes "Change^000000, which enables you";
+		mes "to change a monster's attribute";
+		mes "according to the specific element^FFFFFF ^000000 of the Elemental Change skill";
+		mes "that you have learned.";
+		next;
+		mes "[Mishuna]";
+		mes "The second is called";
+		mes "Elemental Converter Creation,";
+		mes "which enables you to create";
+		mes "converter items that are required^FFFFFF ^000000 to use the Elemental Change skill.";
+		next;
+		mes "[Mishuna]";
+		mes "Although the knowledge of";
+		mes "these two skills has been";
+		mes "lost for years, we've finally";
+		mes "been able to recover most";
+		mes "of it. So, do you think you're";
+		mes "ready to learn these skills?";
+		next;
+		if(select("Maybe later.:Yes, I am.") == 1) {
 			mes "[Mishuna]";
-			mes ""+strcharinfo(0)+"...";
-			mes "I'm happy to say that you've";
-			mes "successfully memorized the";
-			mes "Fire Elemental Change skill.";
-			mes "I hope that it serves you well";
-			mes "in battle. Farewell for now~";
+			mes "Ah, you must be busy right";
+			mes "now. No problem, just come";
+			mes "back when you think you're";
+			mes "ready to learn. Well then,";
+			mes "farewell and have a good day~";
 			close;
 		}
-		else if(SAG_SK == 20) {
-			if(getskilllv("SA_CREATECON") == 0) {
-				skill "SA_CREATECON",1,0;
-				mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
-				next;
-			}
-			if (countitem(993) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
-				mes "[Mishuna]";
-				mes "Are you having trouble";
-				mes "gathering all the required";
-				mes "items? Just in case, let me";
-				mes "remind you of what you need";
-				mes "to bring me to learn the Earth";
-				mes "Elemental Change skill.";
-				next;
-				mes "[Mishuna]";
-				mes "^ff000020 Green Lives^000000,";
-				mes "^ff00001 Payon Solution^000000 and";
-				mes "^ff00001 Morroc Solution^000000. Please";
-				mes "don't forget and have the";
-				mes "materials ready for the next";
-				mes "time you see me, alright?";
-				close;
-			}
-			mes "[Mishuna]";
-			mes "Ah, you're back. I can now";
-			mes "finally teach you about the";
-			mes "Earth Elemental Change skill.";
-			mes "This skill has the chance to";
-			mes "permanently change a targeted";
-			mes "monster's attribute to Earth.";
-			next;
-			mes "[Mishuna]";
-			mes "Remember that you must";
-			mes "use an elemental converter to";
-			mes "cast this skill, and that it has^FFFFFF ^000000 a success rate, similarly to the";
-			mes "Elemental Converter Creation";
-			mes "skill. So be aware of that.";
-			next;
+		mes "[Mishuna]";
+		mes "Very well, then. First, you";
+		mes "must learn the Elemental";
+		mes "Coverter Creation skill, which";
+		mes "is essential to learning the";
+		mes "Elemental Change skill.";
+		next;
+		mes "[Mishuna]";
+		mes "Please bring the required";
+		mes "materials so that we can";
+		mes "construct a basic elemental";
+		mes "converter in order for you to";
+		mes "learn the skill. Let's see,";
+		mes "you will need to bring...";
+		next;
+		mes "[Mishuna]";
+		mes "^ff00007 Horns^000000,";
+		mes "^ff000012 Rainbow Shells^000000,";
+		mes "^ff000010 Snail's Shells^000000,";
+		mes "^ff00004 Blank Scrolls^000000 and";
+		mes "^ff000010 Scorpion Tails^000000.^000000";
+		next;
+		mes "[Mishuna]";
+		mes "Alright, I shall be";
+		mes "nexting here for your";
+		mes "return. Remember that we";
+		mes "need these items to create";
+		mes "a converter so that you can^FFFFFF ^000000 learn the skill from my example...";
+		set SAG_SK,1;
+		close;
+	}
+	else if(SAG_SK == 1) {
+		if (countitem(904) < 10 || countitem(947) < 7 || countitem(1013) < 12 || countitem(946) < 10 || countitem(7433) < 4) {
 			mes "[Mishuna]";
-			mes "Now, "+strcharinfo(0)+",";
-			mes "I'm going to cast a spell";
-			mes "that will help you memorize";
-			mes "the Earth Elemental Change";
-			mes "skill. Try to stay still...";
-			next;
-			mes "^3355FFMishuna begins to chant";
-			mes "a strange incantation as";
-			mes "a soft blue glow surrounds";
-			mes "his body and slowly grows";
-			mes "brighter and more intense.^000000";
-			specialeffect2 EF_RUWACH;
+			mes "Hm, you still haven't";
+			mes "gathered all of the materials";
+			mes "required to create an elemental";
+			mes "coverter. Let me remind you";
+			mes "what to bring so that you";
+			mes "don't forget next time...";
 			next;
 			mes "[Mishuna]";
-			mes "@#$%^~ Yap!";
-			specialeffect2 EF_BRANDISHSPEAR;
-			delitem 993,20; // Yellow Live
-			delitem 1089,1; // Payon Potion
-			delitem 1088,1; // Morocc Potion
-			set SAG_SK,100;
-			skill "SA_ELEMENTGROUND",1,0;
+			mes "^ff00007 Horns^000000,";
+			mes "^ff000012 Rainbow Shells^000000,";
+			mes "^ff000010 Snail's Shells^000000,";
+			mes "^ff00004 Blank Scrolls^000000 and";
+			mes "^ff000010 Scorpion Tails^000000.^000000";
 			next;
 			mes "[Mishuna]";
-			mes ""+strcharinfo(0)+"...";
-			mes "I'm happy to say that you've";
-			mes "successfully memorized the";
-			mes "Earth Elemental Change skill.";
-			mes "I hope that it serves you well";
-			mes "in battle. Farewell for now~";
+			mes "Don't forget that we need";
+			mes "all of these items to create";
+			mes "a converter so that you can";
+			mes "learn the Elemental Converter";
+			mes "Creation skill by watching";
+			mes "me demonstrate it for you.";
 			close;
 		}
-		else if(SAG_SK == 30) {
-			if(getskilllv("SA_CREATECON") == 0) {
-				skill "SA_CREATECON",1,0;
-				mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
-				next;
-			}
-			if (countitem(992) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
-				mes "[Mishuna]";
-				mes "Are you having trouble";
-				mes "gathering all the required";
-				mes "items? Just in case, let me";
-				mes "remind you of what you need";
-				mes "to bring me to learn the Wind";
-				mes "Elemental Change skill.";
-				next;
-				mes "[Mishuna]";
-				mes "^ff000020 Winds of Verdure^000000,";
-				mes "^ff00001 Payon Solution^000000 and";
-				mes "^ff00001 Morroc Solution^000000. Please";
-				mes "don't forget and have the";
-				mes "materials ready for the next";
-				mes "time you see me, alright?";
-				close;
-			}
-			mes "[Mishuna]";
-			mes "Ah, you're back. I can now";
-			mes "finally teach you about the";
-			mes "Wind Elemental Change skill.";
-			mes "This skill has the chance to";
-			mes "permanently change a targeted";
-			mes "monster's attribute to Wind.";
-			next;
-			mes "[Mishuna]";
-			mes "Remember that you must";
-			mes "use an elemental converter to";
-			mes "cast this skill, and that it has^FFFFFF ^000000 a success rate, similarly to the";
-			mes "Elemental Converter Creation";
-			mes "skill. So be aware of that.";
-			next;
-			mes "[Mishuna]";
-			mes "Now, "+strcharinfo(0)+",";
-			mes "I'm going to cast a spell";
-			mes "that will help you memorize";
-			mes "the Wind Elemental Change";
-			mes "skill. Try to stay still...";
-			next;
-			mes "^3355FFMishuna begins to chant";
-			mes "a strange incantation as";
-			mes "a soft blue glow surrounds";
-			mes "his body and slowly grows";
-			mes "brighter and more intense.^000000";
-			specialeffect2 EF_RUWACH;
-			next;
-			mes "[Mishuna]";
-			mes "@#$%^~ Yap!";
-			specialeffect2 EF_BRANDISHSPEAR;
-			delitem 992,20; // Wind Of Verdure
-			delitem 1089,1; // Payon Potion
-			delitem 1088,1; // Morocc Potion
-			set SAG_SK,100;
-			skill "SA_ELEMENTWIND",1,0;
-			next;
+		else {
 			mes "[Mishuna]";
-			mes ""+strcharinfo(0)+"...";
-			mes "I'm happy to say that you've";
-			mes "successfully memorized the";
-			mes "Wind Elemental Change skill.";
-			mes "I hope that it serves you well";
-			mes "in battle. Farewell for now~";
+			mes "Great, you brought everything.";
+			mes "Now, let me explain the skill.";
+			mes "The skills you learn as a Sage";
+			mes "determine what kind of elemental converters that you can craft.";
+			next;
+			mes "[Mishuna]";
+			mes "The ^FF0000Endow Blaze^000000 skill enables";
+			mes "you to create Fire elemental";
+			mes "converters. The ^FF0000Endow Quake^000000";
+			mes "skill enables the creation";
+			mes "of Earth elemental converters.";
+			next;
+			mes "[Mishuna]";
+			mes "^FF0000Endow Tornado^000000 enables";
+			mes "the creation of Wind elemental";
+			mes "converters, and ^FF0000Endow Tsunami^000000";
+			mes "enables the creation of Water";
+			mes "elemental converters. That";
+			mes "all makes sense, right?";
+			next;
+			mes "[Mishuna]";
+			mes "Now, your elemental coverter";
+			mes "creation success rate depends";
+			mes "on the level of the Endow Blaze, Endow Quake, Endow Tornado,";
+			mes "or Endow Tsunami skills, and";
+			mes "your abilities.";
+			next;
+			mes "[Mishuna]";
+			mes "Now, please take this copy";
+			mes "of Barmundt's scroll, and use";
+			mes "it as a reference when you try";
+			mes "to craft elemental converters";
+			mes "when you use the Elemental";
+			mes "Converter Creation skill.";
+			next;
+			mes "^3355FFYou have learned the";
+			mes "Elemental Converter";
+			mes "Creation skill by reviewing";
+			mes "your copy of Barmundt's scroll.^000000";
+			specialeffect2 EF_ABSORBSPIRITS;
+			delitem 904,10; // Scorpion_Tail
+			delitem 947,7; // Horn
+			delitem 1013,12; // Rainbow_Shell
+			delitem 946,10; // Snail's_Shell
+			delitem 7433,4; // Blank_Scroll
+			set SAG_SK,2;
+			skill "SA_CREATECON",1,0;
+			next;
+			mes "[Mishuna]";
+			mes "Wow, "+strcharinfo(0)+"!";
+			mes "You learned that skill";
+			mes "really quickly! No wonder";
+			mes "people say that you're one";
+			mes "of the best Sages around!";
+			next;
+			mes "[Mishuna]";
+			mes "Now you're ready to";
+			mes "learn the other skill,";
+			mes "Elemental Change. Alright,";
+			mes "I need to prepare a few things";
+			mes "for this lesson, so we'll meet";
+			mes "and discuss this later, okay?";
 			close;
 		}
-		else if(SAG_SK == 40) {
-			if(getskilllv("SA_CREATECON") == 0) {
-				skill "SA_CREATECON",1,0;
-				mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
+	}
+	else if(SAG_SK == 2) {
+		if(getskilllv("SA_CREATECON") == 0) {
+			skill "SA_CREATECON",1,0;
+			mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
+			next;
+		}
+		mes "[Mishuna]";
+		mes "You'll be given the chance to";
+		mes "choose which kind of ^FF0000Elemental";
+		mes "Change^000000 skill that you want, even one that you didn't previously";
+		mes "learn, so long as you fulfill";
+		mes "the skill's requirements.";
+		next;
+		mes "[Mishuna]";
+		mes "Keep in mind that once";
+		mes "you learn your Elemental";
+		mes "Change skill, you won't be";
+		mes "able to change it. Now, which";
+		mes "skill would you like to learn?";
+		next;
+		setarray .@ReqSkill[0],280,283,282,281;
+		setarray .@ReqSkill$[0],"Blaze","Quake","Tornado","Tsunami";
+		setarray .@ReqItem$[0],"Red Bloods","Green Lives","Wind of Verdure","Crystal Blues";
+		setarray .@Skill$[0],"Fire","Earth","Wind","Water";
+		while(1) {
+			set .@i, select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")-1;
+			if(getskilllv(.@ReqSkill[.@i]) == 0) {
+				mes "[Mishuna]";
+				mes "I'm sorry, but you have not";
+				mes "learned ^FF0000Endow "+.@ReqSkill$[.@i]+"^000000, the skill";
+				mes "required for the "+.@Skill$[.@i]+" Elemental Change skill. Please learn Endow";
+				mes .@ReqSkill$[.@i]+" or select another Elemental Change skill for me to teach you.";
 				next;
 			}
-			if (countitem(991) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
+			else {
 				mes "[Mishuna]";
-				mes "Are you having trouble";
-				mes "gathering all the required";
-				mes "items? Just in case, let me";
-				mes "remind you of what you need";
-				mes "to bring me to learn the Water";
-				mes "Elemental Change skill.";
+				mes "Very well, then. Please";
+				mes "bring the following items";
+				mes "so that you can learn the";
+				mes .@Skill$[.@i]+" Elemental Change skill.";
 				next;
 				mes "[Mishuna]";
-				mes "^ff000020 Crystal Blues^000000,";
-				mes "^ff00001 Payon Solution^000000 and";
-				mes "^ff00001 Morroc Solution^000000. Please";
-				mes "don't forget and have the";
-				mes "materials ready for the next";
-				mes "time you see me, alright?";
+				mes "^FF000020 "+.@ReqItem$[.@i]+"^000000,";
+				mes "^FF00001 Payon Solution^000000 and";
+				mes "^FF00001 Morroc Solution^000000. Please";
+				mes "return to me once you have";
+				mes "all the materials ready.";
+				set SAG_SK, 10 * (.@i+1); //10,20,30,40
 				close;
 			}
-			mes "[Mishuna]";
-			mes "Ah, you're back. I can now";
-			mes "finally teach you about the";
-			mes "Water Elemental Change skill.";
-			mes "This skill has the chance to";
-			mes "permanently change a targeted";
-			mes "monster's attribute to Water.";
-			next;
-			mes "[Mishuna]";
-			mes "Remember that you must";
-			mes "use an elemental converter to";
-			mes "cast this skill, and that it has^FFFFFF ^000000 a success rate, similarly to the";
-			mes "Elemental Converter Creation";
-			mes "skill. So be aware of that.";
-			next;
-			mes "[Mishuna]";
-			mes "Now, "+strcharinfo(0)+",";
-			mes "I'm going to cast a spell";
-			mes "that will help you memorize";
-			mes "the Water Elemental Change";
-			mes "skill. Try to stay still...";
-			next;
-			mes "^3355FFMishuna begins to chant";
-			mes "a strange incantation as";
-			mes "a soft blue glow surrounds";
-			mes "his body and slowly grows";
-			mes "brighter and more intense.^000000";
-			specialeffect2 EF_RUWACH;
-			next;
-			mes "[Mishuna]";
-			mes "@#$%^~ Yap!";
-			specialeffect2 EF_BRANDISHSPEAR;
-			delitem 991,20; // Crystal Blue
-			delitem 1089,1; // Payon Potion
-			delitem 1088,1; // Morocc Potion
-			set SAG_SK,100;
-			skill "SA_ELEMENTWATER",1,0;
+		}
+	}
+	else if(SAG_SK == 10 || SAG_SK == 20 || SAG_SK == 30 || SAG_SK == 40) {
+		if(getskilllv("SA_CREATECON") == 0) {
+			skill "SA_CREATECON",1,0;
+			mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
 			next;
-			mes "[Mishuna]";
-			mes ""+strcharinfo(0)+"...";
-			mes "I'm happy to say that you've";
-			mes "successfully memorized the";
-			mes "Water Elemental Change skill.";
-			mes "I hope that it serves you well";
-			mes "in battle. Farewell for now~";
-			close;
 		}
-		else {
-			mes "[Mishuna]";
-			mes "If you have any Sage or";
-			mes "Scholar friends who haven't";
-			mes "learned the skills from Sir";
-			mes "Barmundt's scrolls, then";
-			mes "please refer them to me.";
+		set .@i, (SAG_SK/10) - 1;
+		setarray .@ReqItem[0],990,993,992,991;
+		setarray .@ReqItem$[0],"Red Bloods","Green Lives","Wind of Verdure","Crystal Blues";
+		setarray .@Skill[0],1018,1017,1019,1008;
+		setarray .@Skill$[0],"Fire","Earth","Wind","Water";
+		if (countitem(.@ReqItem[.@i]) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
+			mes "[Mishuna]";
+			mes "Are you having trouble";
+			mes "gathering all the required";
+			mes "items? Just in case, let me";
+			mes "remind you of what you need";
+			mes "to bring me to learn the "+.@Skill$[.@i];
+			mes "Elemental Change skill.";
 			next;
 			mes "[Mishuna]";
-			mes "I trust that you are";
-			mes "finding that these";
-			mes "element based skills";
-			mes "are very useful in battle.";
-			mes "Knowledge truly equates";
-			mes "to power in the long run...";
+			mes "^ff000020 "+.@ReqItem$[.@i]+"^000000,";
+			mes "^ff00001 Payon Solution^000000 and";
+			mes "^ff00001 Morroc Solution^000000. Please";
+			mes "don't forget and have the";
+			mes "materials ready for the next";
+			mes "time you see me, alright?";
 			close;
 		}
-	}
-	else {
 		mes "[Mishuna]";
-		mes "Good day, I'm Mishuna, one";
-		mes "of the instructors here in the";
-		mes "Schweicherbil Magic Academy.";
-		mes "By any chance, are you a Sage";
-		mes "or Scholar? Oh... You're not?";
+		mes "Ah, you're back. I can now";
+		mes "finally teach you about the";
+		mes .@Skill$[.@i]+" Elemental Change skill.";
+		mes "This skill has the chance to";
+		mes "permanently change a targeted";
+		mes "monster's attribute to "+.@Skill$[.@i]+".";
 		next;
 		mes "[Mishuna]";
-		mes "Oh, that's too bad.";
-		mes "My apologies. But if you";
-		mes "happen to know any, or meet";
-		mes "any in your journeys, please";
-		mes "direct them to me if they haven't heard of the lessons I provide.";
+		mes "Remember that you must";
+		mes "use an elemental converter to";
+		mes "cast this skill, and that it has a success rate, similarly to the";
+		mes "Elemental Converter Creation";
+		mes "skill. So be aware of that.";
 		next;
 		mes "[Mishuna]";
-		mes "I'm sorry to bother";
-		mes "you, and I thank you";
-		mes "for your time. Good";
-		mes "day to you, adventurer.";
+		mes "Now, "+strcharinfo(0)+",";
+		mes "I'm going to cast a spell";
+		mes "that will help you memorize";
+		mes "the "+.@Skill$[.@i]+" Elemental Change";
+		mes "skill. Try to stay still...";
+		next;
+		mes "^3355FFMishuna begins to chant";
+		mes "a strange incantation as";
+		mes "a soft blue glow surrounds";
+		mes "his body and slowly grows";
+		mes "brighter and more intense.^000000";
+		specialeffect2 EF_RUWACH;
+		next;
+		mes "[Mishuna]";
+		mes "@#$%^~ Yap!";
+		specialeffect2 EF_BRANDISHSPEAR;
+		delitem .@ReqItem[.@i],20;
+		delitem 1089,1; // Payon Potion
+		delitem 1088,1; // Morocc Potion
+		set SAG_SK,100;
+		skill .@Skill[.@i],1,0;
+		next;
+		mes "[Mishuna]";
+		mes strcharinfo(0)+"...";
+		mes "I'm happy to say that you've";
+		mes "successfully memorized the";
+		mes .@Skill$[.@i]+" Elemental Change skill.";
+		mes "I hope that it serves you well";
+		mes "in battle. Farewell for now~";
+		close;
+	}
+	else {
+		mes "[Mishuna]";
+		mes "If you have any Sage or";
+		mes "Scholar friends who haven't";
+		mes "learned the skills from Sir";
+		mes "Barmundt's scrolls, then";
+		mes "please refer them to me.";
+		next;
+		mes "[Mishuna]";
+		mes "I trust that you are";
+		mes "finding that these";
+		mes "element based skills";
+		mes "are very useful in battle.";
+		mes "Knowledge truly equates";
+		mes "to power in the long run...";
 		close;
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index bf4fd021d..7441d5caf 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -1,11 +1,9 @@
-//===== Hercules Script =======================================
+//===== Hercules Script ======================================
 //= Swordsman Skills Quests
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
-//= 1.9
-//===== Compatible With: =====================================
-//= Hercules GIT
+//= 1.8
 //===== Description: =========================================
 //= Quests for skills: Fatal Blow, Mobile HP Recovery,
 //  Auto-Berserk
@@ -13,9 +11,142 @@
 //= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.7 Updated to latest available official file. [Masao]
 //= 1.8 Fixed JobLevel requirements. [Euphy]
-//= 1.9 Removed Knight De Thomas. [Streusel]
 //============================================================
 
+izlude_in,175,130,2	script	Knight De Thomas	98,4,4,{
+	if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) {
+		mes "[De Thomas]";
+		mes "Oh, no! You must have been hurt! Are you ok?";
+		mes "You must have fought hard to get such serious injuries..";
+		mes "Being a swordsman must come with a lot of responsibility and sacrifice.";
+		next;
+		mes "[De Thomas]";
+		if (Sex == 0) {
+			mes "For these swordsmen and knights, there is a wonderful skill.";
+		}
+		else {
+			mes "For these swordswomen and knights, there is a wonderful skill young lady.";
+		}
+		mes "I present to you - HP Recovery While Moving!";
+		mes "Body moving is a splendid skill";
+		mes "that allows you to regain strength(HP)";
+		mes "while you are moving!";
+		next;
+		mes "[De Thomas]";
+		mes "It is currently under development";
+		mes "so it may not recover that much,";
+		mes "but it will help a little.";
+		mes "What do you think? Would you like to learn this skill?";
+		next;
+		switch (select("What a nice skill! I want to learn it!:No, thank you.")) {
+		case 1:
+			mes "[De Thomas]";
+			mes "Very well. I will tell you what you need to learn this skill.";
+			mes "First, your job level must be higher than ^00880035^000000.";
+			mes "You will also need ^008800200 empty bottles^000000.";
+			mes "Why? Because it is proof that you fought fiercely to have used that many potions.";
+			next;
+			mes "[De Thomas]";
+			mes "Also, the armor you used in battle.";
+			mes "This is also proof of an experienced fighter.";
+			mes "For the armor... your armor is perfect!";
+			mes "Bring your armor!";
+			mes "Last but not least... bring me one ^008800Moth Wing^000000.";
+			next;
+			select("Eh? You need that, too?");
+			mes "[De Thomas]";
+			mes "Not really.. I don't really NEED it.";
+			mes "It's just that my niece has gotten a bug hunting as a holiday task during the summer vacation.";
+			mes "Of course! It would be much easier for me to get it myself.";
+			mes "but I must work here all the time so I don't exactly have the time to go out and get it.";
+			next;
+			mes "[De Thomas]";
+			mes "Don't you think it is pitiful that I have to stay in once place everyday, not being able to go outside?";
+			mes "Please, find me one...*sniffsniff*";
+			mes "If you don't...";
+			set sm_movingrecovery_x,1;
+			mes "You won't get anything! Muahahaha.";
+			close;
+		case 2:
+			mes "[De Thomas]";
+			mes "...";
+			close;
+		}
+	}
+	else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x > 1)) {
+		mes "[De Thomas]";
+		mes "Oh, it's you?";
+		mes "Long time no see!";
+		mes "You seem healthier than before.";
+		mes "Hahahaha!";
+		mes "Take care! See you again!";
+		close;
+	}
+	else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x == 1)) {
+		mes "[De Thomas]";
+		mes "Welcome back...";
+		mes "are you ready to learn Body Movin'?";
+		next;
+		switch (select("Yes.:No, I'm not ready yet.")) {
+		case 1:
+			if ((JobLevel > 34 || (BaseJob == Job_Knight || BaseJob == Job_Crusader)) && (countitem(713) > 199) && (countitem(1058) > 0)) {
+				mes "[De Thomas]";
+				mes "Let's see.....";
+				next;
+				mes "[De Thomas]";
+				mes "Ok! I shall now teach you...";
+				mes "...The Body Movin' skill!";
+				next;
+				delitem 713,200; //Empty_Bottle
+				delitem 1058,1; //Wing_Of_Moth
+				skill "SM_MOVINGRECOVERY",1,0;
+				set sm_movingrecovery_x,2;
+				mes "[De Thomas]";
+				mes "There you go!";
+				mes "Try it yourself.";
+				mes "But don't overdo it.";
+				next;
+				mes "[De Thomas]";
+				mes "Oh yeah, I won't be needing your";
+				mes "armor so you can keep it.";
+				mes "Good luck now!";
+				close;
+			}
+			else if (JobLevel < 35 && (BaseJob != Job_Knight && BaseJob != Job_Crusader)) {
+				mes "[De Thomas]";
+				mes "Wait a second, your Job level isn't above ^00880035^000000!";
+				mes "Come back when it is.";
+				close;
+			}
+			else if ((countitem(713) < 200) || (countitem(1058) < 1)) {
+				mes "[De Thomas]";
+				mes "You do not have all the items I asked for.";
+				next;
+				mes "[De Thomas]";
+				mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
+				close;
+			}
+			mes "[De Thomas]";
+			mes "You do not have all the items I asked for.";
+			next;
+			mes "[De Thomas]";
+			mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
+			close;
+		case 2:
+			mes "[De Thomas]";
+			mes "Is that so?";
+			mes "Then come when you are prepared.";
+			close;
+		}
+	}
+	mes "[De Thomas]";
+	mes "My name is De Thomas Carlos.";
+	mes "Knight of Prontera's 3rd Calvary.";
+	mes "I have a certain duty these days.";
+	mes "Ehem! Need I say more.";
+	close;
+}
+
 prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
 
 	if ((BaseClass == Job_Swordman) && (JobLevel >= 25 || (BaseJob == Job_Knight || BaseJob == Job_Crusader))) {
@@ -75,7 +206,7 @@ prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
 		mes "[Leon]";
 		mes "Wow, seeing your arm, you must enjoy using bash?";
 		next;
-		menu "Eh, I.. just...",-;
+		select("Eh, I... just...");
 		mes "[Leon]";
 		if (Sex == 0) {
 			mes "No need to be surprised.";
@@ -340,16 +471,16 @@ prt_in,94,57,3	script	Juan	85,4,4,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Fully working
 //= 1.0a Now using functions found in "Global_Functions.txt"
-//= for class checks.
+//=     for class checks.
 //= 1.1 Added missing delitem [Lupus]
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Updated the NPC to allow subclasses of swordsman to learn the skills, [MasterOfMuppets]
-//=	1.5 Fixed exploits [Lupus]
+//= 1.5 Fixed exploits [Lupus]
 //= 1.5a Fixed some typos [IVBela]
 //============================================================
diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt
index 7af4feb42..329209c57 100644
--- a/npc/quests/skills/thief_skills.txt
+++ b/npc/quests/skills/thief_skills.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Thief Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.8
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Quests for skills: Sand Attack, Back Slide, Find Stone, 
 //= Stone Fling.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Fixed a Exploit for Assassins and Rogues. (bugreport:2332) [Samuray22]
 //= 1.7 Updated to latest available official file. [Masao]
 //= 1.8 Fixed JobLevel requirement for Assassins and Rogues. [Joseph]
-//============================================================ 
+//============================================================
 
 moc_prydb1,154,128,4	script	Alcouskou	118,{
 	if (BaseClass == Job_Thief) {
@@ -500,18 +498,18 @@ payon,91,77,3	script	Bag Seller	99,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
-//= v1.0 Fully working
-//= v1.1 Changed Sand Attack requirements from 5 Grit to 5 Fine Grit and a
-//= Leather Bag of Infinity.  These are the official RO requirements
-//= Added npc RuRumuni, maker of Leather Bag of Infinity. [kobra_k88]
-//= v1.1a Now using functions found in "Global_Functions.txt" for
-//= class checks.[kobra_k88]
+//============================================================
+//= 1.0 Fully working
+//= 1.1 Changed Sand Attack requirements from 5 Grit to 5 Fine Grit and a
+//=     Leather Bag of Infinity.  These are the official RO requirements
+//=     Added npc RuRumuni, maker of Leather Bag of Infinity. [kobra_k88]
+//= 1.1a Now using functions found in "Global_Functions.txt" for
+//=     class checks.[kobra_k88]
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Fixed exploit [Lupus]
 //= 1.4a Fixed some typos [IVBela]
 //= 1.4b changed perm. variables to temp ones [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt
index 1d7093a03..663c6e01e 100644
--- a/npc/quests/skills/wizard_skills.txt
+++ b/npc/quests/skills/wizard_skills.txt
@@ -4,10 +4,8 @@
 //= Lupus, Reddozen
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Quests for skills: Sight Blaster
 //===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
@@ -434,9 +432,9 @@ prt_in,82,98,3	script	Simon Mayace#q_wiz	46,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index b9a251d6c..881f3405f 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Thanatos Tower Quest
 //===== By: ==================================================
 //= Muad_Dib
 //===== Current Version: =====================================
 //= 1.0a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Episode 13.1 Thanatos Tower quest.
@@ -2312,4 +2310,4 @@ OnTouch:
 	}
 	mes "A mysterious power is blocking my path.";
 	close;
-}
+}
\ No newline at end of file
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 03a52023f..8c67f9595 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -1,17 +1,15 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= The Sign Quest
-//===== By: ================================================== 
-//= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
-//===== Current Version: ===================================== 
-//= 3.8
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== By: ==================================================
+//= SinSloth, MasterOfMuppets, Kargha
+//===== Current Version: =====================================
+//= 3.9
+//===== Description: =========================================
 //= [Official Conversion]
 //= Quest for opening the doors to Geffenia.
 //= This script uses sign_01.bmp - sign_04.bmp, these will be
 //= found in the language of your client.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 3.0 Rewritten based on most recent Aegis script. [L0ne_W0lf]
 //=     Due to the incompatabity of the old script with this
 //=     version, variables will attmept to be translated to the
@@ -26,11 +24,11 @@
 //= 3.6 Corrected the Level Requirements for 'Standby Room' [tr0n]
 //= 3.7 Massive cleaning/optimization (more can still be done). [Euphy]
 //= 3.8 Corrected an invalid map name. [Joseph]
-//============================================================ 
+//= 3.9 Updated RE/Pre-RE EXP. [Euphy]
+//============================================================
 
-//============================================================ 
 // The Sign (Part 1)
-//============================================================ 
+//============================================================
 -	script	Sign::TheSign	111,{
 	callfunc "F_UpdateSignVars";
 	cutin "sign_01",4;
@@ -695,7 +693,7 @@ prt_in,227,45,0	script	Archeologist#sign	804,{
 			mes "You may have had your doubts,";
 			mes "but I'm happy enough to confirm that the Sign really exists. Thanks again, and I hope you stop by and chat from time to time.";
 			set sign_q,142;
-			getexp 200000,0;
+			getexp (checkre(3))?200000:2000000,0;
 		}
 		else {
 			mes "Have you visited";
@@ -728,7 +726,7 @@ prt_in,227,45,0	script	Archeologist#sign	804,{
 		}
 		delitem 7178,1; //Star's_Sob
 		set sign_q,202;
-		getexp 10000,0;
+		getexp (checkre(3))?10000:100000,0;
 		getitem 617,1; //Old_Violet_Box
 	}
 	else if (sign_q > 201) {
@@ -1496,11 +1494,19 @@ morocc_in,115,154,5	script	Rogue#sign	810,{
 			mes "you gave Ganaan tell me";
 			mes "you're not a total dumbass.";
 			mes "Now you're supposed to go see Daewoon in Payon. And don't forget to show him this Star thingee.";
-			if (BaseLevel < 60) getexp 300,0;
-			else if (BaseLevel < 70) getexp 750,0;
-			else if (BaseLevel < 80) getexp 1000,0;
-			else if (BaseLevel < 90) getexp 1300,0;
-			else if (BaseLevel < 150) getexp 1800,0;
+			if (checkre(3)) {
+				if (BaseLevel < 60) getexp 300,0;
+				else if (BaseLevel < 70) getexp 750,0;
+				else if (BaseLevel < 80) getexp 1000,0;
+				else if (BaseLevel < 90) getexp 1300,0;
+				else getexp 1800,0;
+			} else {
+				if (BaseLevel < 60) getexp 3000,0;
+				else if (BaseLevel < 70) getexp 7500,0;
+				else if (BaseLevel < 80) getexp 10000,0;
+				else if (BaseLevel < 90) getexp 13000,0;
+				else getexp 18000,0;
+			}
 			set sign_q,14;
 			getitem 7177,1; //Part_Of_Star's_Sob
 			close;
@@ -2358,11 +2364,19 @@ payon_in03,11,31,4	script	Daewoon#sign	808,{
 			if (.@pay_point > 29) {
 				set sign_q,15;
 				getitem 7177,1; //Part_Of_Star's_Sob
-				if (BaseLevel < 60) getexp 300,0;
-				else if (BaseLevel < 70) getexp 700,0;
-				else if (BaseLevel < 80) getexp 1000,0;
-				else if (BaseLevel < 90) getexp 1300,0;
-				else if (BaseLevel < 150) getexp 1800,0;
+				if (checkre(3)) {
+					if (BaseLevel < 60) getexp 300,0;
+					else if (BaseLevel < 70) getexp 750,0;
+					else if (BaseLevel < 80) getexp 1000,0;
+					else if (BaseLevel < 90) getexp 1300,0;
+					else getexp 1800,0;
+				} else {
+					if (BaseLevel < 60) getexp 3000,0;
+					else if (BaseLevel < 70) getexp 7500,0;
+					else if (BaseLevel < 80) getexp 10000,0;
+					else if (BaseLevel < 90) getexp 13000,0;
+					else getexp 18000,0;
+				}
 				emotion e_heh;
 				mes "[Daewoon]";
 				mes "Well, I must say that I've";
@@ -2394,11 +2408,19 @@ payon_in03,11,31,4	script	Daewoon#sign	808,{
 			else if ((.@pay_point > 26) && (.@pay_point < 30)) {
 				set sign_q,15;
 				getitem 7177,1; //Part_Of_Star's_Sob
-				if (BaseLevel < 60) getexp 300,0;
-				else if (BaseLevel < 70) getexp 700,0;
-				else if (BaseLevel < 80) getexp 1000,0;
-				else if (BaseLevel < 90) getexp 1300,0;
-				else if (BaseLevel < 150) getexp 1800,0;
+				if (checkre(3)) {
+					if (BaseLevel < 60) getexp 300,0;
+					else if (BaseLevel < 70) getexp 750,0;
+					else if (BaseLevel < 80) getexp 1000,0;
+					else if (BaseLevel < 90) getexp 1300,0;
+					else getexp 1800,0;
+				} else {
+					if (BaseLevel < 60) getexp 3000,0;
+					else if (BaseLevel < 70) getexp 7500,0;
+					else if (BaseLevel < 80) getexp 10000,0;
+					else if (BaseLevel < 90) getexp 13000,0;
+					else getexp 18000,0;
+				}
 				mes "[Daewoon]";
 				mes "You know, after talking with";
 				mes "you for a while, I now feel fairly comfortable with leaving you this piece of the Sobbing Starlight. Somehow, I think you're strong enough to get all the pieces.";
@@ -3068,11 +3090,13 @@ OnTouch:
 	end;
 }
 
-//prt_maze02,25,161,0	script	#music	-1,7,7,{
-//OnTouch:
-//	soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1;
-//	end;
-//}
+/* Currently broken.
+prt_maze02,25,161,0	script	#music	-1,7,7,{
+OnTouch:
+	soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1;
+	end;
+}
+*/
 
 prt_maze02,132,132,0	script	#skill	-1,{
 OnEnable:
@@ -4414,7 +4438,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 		else {
 			mes "me. It also looks like you got zeny to spare! I think I'll help myself and borrow some of your cash!";
 			mes "^FF0000Yoink!^000000";
-			set zeny,zeny-10000;
+			set Zeny, Zeny-10000;
 			specialeffect EF_COIN;
 			close;
 		}
@@ -4496,7 +4520,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 				mes "to me tomorrow night and";
 				mes "we'll start your test...";
 				set sign_q,27;
-				set zeny,zeny-30000;
+				set Zeny, Zeny-30000;
 			}
 			close;
 		case 2:
@@ -4616,11 +4640,19 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 				if (countitem(750)) delitem 750,1; //Baphomet_Doll
 				if (countitem(751)) delitem 751,1; //Osiris_Doll
 				set sign_q,30;
-				if (BaseLevel < 60) getexp 300,0;
-				else if (BaseLevel < 70) getexp 500,0;
-				else if (BaseLevel < 80) getexp 800,0;
-				else if (BaseLevel < 90) getexp 1000,0;
-				else if (BaseLevel < 150) getexp 1300,0;
+				if (checkre(3)) {
+					if (BaseLevel < 60) getexp 300,0;
+					else if (BaseLevel < 70) getexp 500,0;
+					else if (BaseLevel < 80) getexp 800,0;
+					else if (BaseLevel < 90) getexp 1000,0;
+					else getexp 1300,0;
+				} else {
+					if (BaseLevel < 60) getexp 3000,0;
+					else if (BaseLevel < 70) getexp 5000,0;
+					else if (BaseLevel < 80) getexp 8000,0;
+					else if (BaseLevel < 90) getexp 10000,0;
+					else getexp 13000,0;
+				}
 				next;
 				warp "cmd_in01",33,29;
 				end;
@@ -4699,11 +4731,19 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 			mes "um, ''Bakerlan'' in Alberta.";
 			set sign_q,35;
 			getitem 7177,1; //Part_Of_Star's_Sob
-			if (BaseLevel < 60) getexp 300,0;
-			else if (BaseLevel < 70) getexp 700,0;
-			else if (BaseLevel < 80) getexp 1900,0;
-			else if (BaseLevel < 90) getexp 1200,0;
-			else if (BaseLevel < 150) getexp 1700,0;
+			if (checkre(3)) {
+				if (BaseLevel < 60) getexp 300,0;
+				else if (BaseLevel < 70) getexp 700,0;
+				else if (BaseLevel < 80) getexp 1900,0;
+				else if (BaseLevel < 90) getexp 1200,0;
+				else getexp 1700,0;
+			} else {
+				if (BaseLevel < 60) getexp 3000,0;
+				else if (BaseLevel < 70) getexp 7000,0;
+				else if (BaseLevel < 80) getexp 19000,0;
+				else if (BaseLevel < 90) getexp 12000,0;
+				else getexp 17000,0;
+			}
 			next;
 			mes "[Dearles]";
 			mes "Well, that's it.";
@@ -4728,12 +4768,20 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 			mes "um, ''Bakerlan'' in Alberta.";
 			set sign_q,35;
 			getitem 7177,1; //Part_Of_Star's_Sob
-			set zeny,zeny+20000;
-			if (BaseLevel < 60) getexp 300,0;
-			else if (BaseLevel < 70) getexp 700,0;
-			else if (BaseLevel < 80) getexp 1000,0;
-			else if (BaseLevel < 90) getexp 1400,0;
-			else if (BaseLevel < 150) getexp 1900,0;
+			set Zeny, Zeny+20000;
+			if (checkre(3)) {
+				if (BaseLevel < 60) getexp 300,0;
+				else if (BaseLevel < 70) getexp 700,0;
+				else if (BaseLevel < 80) getexp 1000,0;
+				else if (BaseLevel < 90) getexp 1400,0;
+				else getexp 1900,0;
+			} else {
+				if (BaseLevel < 60) getexp 3000,0;
+				else if (BaseLevel < 70) getexp 7000,0;
+				else if (BaseLevel < 80) getexp 10000,0;
+				else if (BaseLevel < 90) getexp 14000,0;
+				else getexp 19000,0;
+			}
 			next;
 			mes "[Dearles]";
 			mes "Well, that's it.";
@@ -4765,7 +4813,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 			mes "me. It also looks like you got zeny to spare! I think I'll help myself and borrow some of your cash!";
 			mes "^FF0000Yoink!^000000";
 			mes "Giggle giggle..";
-			set zeny,zeny-10000;
+			set Zeny, Zeny-10000;
 			close;
 		}
 	}
@@ -4778,7 +4826,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 			mes "cash. You know, for old";
 			mes "time's sake. ^FF0000Yoink!^000000";
 			emotion e_gg;
-			set zeny,zeny-10000;
+			set Zeny, Zeny-10000;
 		}
 		else {
 			mes "I got nothin' for you and";
@@ -4969,14 +5017,14 @@ OnInit:
 	end;
 
 OnStartArena:
-	donpcevent "s_dance_timer::Onbutton_off";
+	donpcevent "s_dance_timer::OnButton_Off";
 	donpcevent "Examiner#sd::OnDisable";
 	warpwaitingpc "cmd_in01",16,15,1;
 	donpcevent "s_dance_timer::OnEnable";
 	disablewaitingroomevent;
 	end;
 
-Onreset:
+OnReset:
 	enablewaitingroomevent;
 	end;
 }
@@ -4990,7 +5038,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-Onbutton_off:
+OnButton_Off:
 	callsub OnDisableAll;
 	end;
 
@@ -5008,90 +5056,90 @@ OnTimer2000:
 
 OnTimer4000:
 	mapannounce "cmd_in01"," UP LEFT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#up::Onup";
+	donpcevent "s_dance#up::OnUp";
 	donpcevent "s_dance#up::OnEnable";
 	end;
 
 OnTimer6000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#down::Onup";
+	donpcevent "s_dance#down::OnUp";
 	donpcevent "s_dance#down::OnEnable";
 	end;
 
 OnTimer8000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer11000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#down::Onup";
+	donpcevent "s_dance#down::OnUp";
 	donpcevent "s_dance#down::OnEnable";
 	end;
 
 OnTimer13000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP RIGHT & UP LEFT & STAY CENTER",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer18000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & DOWN RIGHT & DOWN LEFT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer21000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN RIGHT & CENTER & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#down::Onup";
+	donpcevent "s_dance#down::OnUp";
 	donpcevent "s_dance#down::OnEnable";
 	end;
 
 OnTimer24000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP LEFT & UP RIGHT & DOWN RIGHT & CENTER",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer30000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP RIGHT & UP LEFT & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer34000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," UP RIGHT & DOWN RIGHT & UP RIGHT & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#right::Onup";
+	donpcevent "s_dance#right::OnUp";
 	donpcevent "s_dance#right::OnEnable";
 	end;
 
 OnTimer38000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," UP LEFT & UP RIGHT & CENTER & UP RIGHT & DOWN LEFT & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#up::Onup";
+	donpcevent "s_dance#up::OnUp";
 	donpcevent "s_dance#up::OnEnable";
 	end;
 
 OnTimer44000:
 	stopnpctimer;
-	donpcevent "s_dance#up::Onreset";
-	donpcevent "s_dance#down::Onreset";
-	donpcevent "s_dance#left::Onreset";
-	donpcevent "s_dance#right::Onreset";
-	donpcevent "s_dance#cen::Onreset";
+	donpcevent "s_dance#up::OnReset";
+	donpcevent "s_dance#down::OnReset";
+	donpcevent "s_dance#left::OnReset";
+	donpcevent "s_dance#right::OnReset";
+	donpcevent "s_dance#cen::OnReset";
 	mapannounce "cmd_in01","Well done.",bc_map,"0xFFFF00";
 	enablenpc "Examiner#sd";
-	donpcevent "Standby Room#sign::Onreset";
+	donpcevent "Standby Room#sign::OnReset";
 	end;
 }
 
@@ -5110,41 +5158,41 @@ OnDisable:
 	disablenpc "s_dance#up";
 	end;
 
-Onup:
+OnUp:
 	set .s_up,.s_up + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_up,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_up.wav",1;
 	if (.s_up == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 5) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
@@ -5166,62 +5214,62 @@ OnDisable:
 	disablenpc "s_dance#down";
 	end;
 
-Onup:
+OnUp:
 	set .s_down,.s_down + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_down,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_down.wav",1;
 	if (.s_down == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 2) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#left::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#left::OnUp";
 		donpcevent "s_dance#left::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 5) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 6) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 7) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 8) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 9) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 10) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	end;
@@ -5243,53 +5291,53 @@ OnDisable:
 	disablenpc "s_dance#left";
 	end;
 
-Onup:
+OnUp:
 	set .s_left,.s_left + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_left,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_left.wav",1;
 	if (.s_left == 1) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 4) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 5) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#up::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#up::OnUp";
 		donpcevent "s_dance#up::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 6) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent  "s_dance#right::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 7) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
@@ -5311,59 +5359,59 @@ OnDisable:
 	disablenpc "s_dance#right";
 	end;
 
-Onup:
+OnUp:
 	set .s_right,.s_right + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_right,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_right.wav",1;
 	if (.s_right == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#up::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#up::OnUp";
 		donpcevent "s_dance#up::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#up::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#up::OnUp";
 		donpcevent "s_dance#up::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 5) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 6) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 7) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 8) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#left::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#left::OnUp";
 		donpcevent "s_dance#left::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
@@ -5385,33 +5433,33 @@ OnDisable:
 	disablenpc "s_dance#cen";
 	end;
 	
-Onup:
+OnUp:
 	set .s_center,.s_center + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_center,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_center.wav",1;
 	if (.s_center == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#cen::OnDisable";
 	}
 	else if (.s_center == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#cen::OnDisable";
 	}
 	else if (.s_center == 3) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#cen::OnDisable";
 	}
 	else if (.s_center == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#cen::OnDisable";
 	}
@@ -5443,7 +5491,7 @@ OnTouch:
 	donpcevent "Examiner#sd::OnDisable";
 	end;
 
-Onup:
+OnUp:
 	set .s_check,.s_check + 1;
 	end;
 
@@ -5592,11 +5640,19 @@ alberta_in,125,101,5	script	Wealthy-looking Merchant	807,{
 		mes "He will tell you what you need to do next.";
 		set sign_q,53;
 		getitem 7177,1; //Part_Of_Star's_Sob
-		if (BaseLevel < 60) getexp 500,0;
-		else if (BaseLevel < 70) getexp 800,0;
-		else if (BaseLevel < 80) getexp 1100,0;
-		else if (BaseLevel < 90) getexp 1500,0;
-		else if (BaseLevel < 150) getexp 2000,0;
+		if (checkre(3)) {
+			if (BaseLevel < 60) getexp 500,0;
+			else if (BaseLevel < 70) getexp 800,0;
+			else if (BaseLevel < 80) getexp 1100,0;
+			else if (BaseLevel < 90) getexp 1500,0;
+			else getexp 2000,0;
+		} else {
+			if (BaseLevel < 60) getexp 5000,0;
+			else if (BaseLevel < 70) getexp 8000,0;
+			else if (BaseLevel < 80) getexp 11000,0;
+			else if (BaseLevel < 90) getexp 15000,0;
+			else getexp 20000,0;
+		}
 		close;
 	}
 	else if (sign_q == 97) {
@@ -6283,7 +6339,7 @@ alde_alche,169,162,7	script	Alchemist#sign	749,{
 						mes "just one bottle, but this";
 						mes "stuff is extremely potent!";
 						next;
-						set zeny,zeny-10000;
+						set Zeny, Zeny-10000;
 						delitem 526,10; //Royal_Jelly
 						delitem 518,20; //Honey
 						delitem 948,30; //Bear's_Foot
@@ -6798,11 +6854,19 @@ yuno,330,100,4	script	Knight#ss	734,{
 				delitem2 7049,1,1,0,0,.@sign1,.@sign2,.@sign3,.@sign4;
 				set sign_q,39;
 				getitem 7181,1; //Receipt_01
-				if (BaseLevel < 60) getexp 100,0;
-				else if (BaseLevel < 70) getexp 200,0;
-				else if (BaseLevel < 80) getexp 400,0;
-				else if (BaseLevel < 90) getexp 700,0;
-				else if (BaseLevel < 150) getexp 1100,0;
+				if (checkre(3)) {
+					if (BaseLevel < 60) getexp 100,0;
+					else if (BaseLevel < 70) getexp 200,0;
+					else if (BaseLevel < 80) getexp 400,0;
+					else if (BaseLevel < 90) getexp 700,0;
+					else getexp 1100,0;
+				} else {
+					if (BaseLevel < 60) getexp 1000,0;
+					else if (BaseLevel < 70) getexp 2000,0;
+					else if (BaseLevel < 80) getexp 4000,0;
+					else if (BaseLevel < 90) getexp 7000,0;
+					else getexp 11000,0;
+				}
 				close;
 			}
 		}
@@ -6847,10 +6911,8 @@ yuno,330,100,4	script	Knight#ss	734,{
 	}
 }
 
-//============================================================ 
 // The Sign (Part 2)
-//============================================================ 
-
+//============================================================
 geffen_in,159,48,5	script	Lonely-looking Woman	711,{
 	callfunc "F_UpdateSignVars";
 	mes "[Brenda Howard]";
@@ -7108,7 +7170,7 @@ mjo_dun02,88,295,4	script	Flaming Spirit Man	85,{
 				mes "If it weren't for your help,";
 				mes "I'd be in big trouble. I really appreciate you stepping in and volunteering your materials like this.";
 				delitem 1002,1; //Iron_Ore
-				getexp 1,0;
+				getexp 10,0;
 				close;
 			case 2:
 				mes "[Engel]";
@@ -8183,15 +8245,27 @@ himinn,48,86,5	script	Valkyrie#sign	811,{
 		mes "one of the hearts there...";
 		set sign_q,82;
 		percentheal 100,100;
-		if (BaseLevel < 56) getexp 900,0;
-		else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 1200,0;
-		else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 2000,0;
-		else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 3500,0;
-		else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 7000,0;
-		else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 12000,0;
-		else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 16000,0;
-		else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 21000,0;
-		else if (BaseLevel > 90) getexp 35000,0;
+		if (checkre(3)) {
+			if (BaseLevel < 56) getexp 900,0;
+			else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 1200,0;
+			else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 2000,0;
+			else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 3500,0;
+			else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 7000,0;
+			else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 12000,0;
+			else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 16000,0;
+			else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 21000,0;
+			else getexp 35000,0;
+		} else {
+			if (BaseLevel < 56) getexp 9000,0;
+			else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 12000,0;
+			else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 20000,0;
+			else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 35000,0;
+			else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 70000,0;
+			else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 120000,0;
+			else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 160000,0;
+			else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 210000,0;
+			else getexp 350000,0;
+		}
 		close2;
 		warp "geffen",120,100;
 		end;
@@ -8295,10 +8369,8 @@ himinn,48,86,5	script	Valkyrie#sign	811,{
 	}
 }
 
-//============================================================ 
 // The Sign (Part 3)
-//============================================================ 
-
+//============================================================
 que_sign01,196,39,4	script	Serin#dummy	90,{
 	end;
 
@@ -8311,7 +8383,7 @@ OnEnable:
 	enablenpc "Serin#dummy";
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	end;
 
@@ -8379,7 +8451,7 @@ que_sign01,196,39,4	script	Serin#serin	90,{
 		delitem 7305,1; //Authority_Of_Nine_World
 		set sign_q,133;
 		donpcevent "Serin#dummy::OnEnable";
-		donpcevent "Serin#dummy::Onstart";
+		donpcevent "Serin#dummy::OnStart";
 		donpcevent "Serin#serin::OnDisable";
 		close;
 	}
@@ -8463,7 +8535,7 @@ que_sign01,196,39,4	script	Serin#serin	90,{
 				mes "ask the Dark Lord to spare";
 				mes "you. Thank you so much...";
 				set sign_q,200;
-				getexp 20000,0;
+				getexp (checkre(3))?20000:200000,0;
 				set $@sign_w2,0;
 				donpcevent "Dark Lord#serin::OnDisable";
 				close2;
@@ -8734,7 +8806,7 @@ que_sign01,197,195,4	script	Serin#witch	90,{
 				mes "ask the Dark Lord to spare";
 				mes "you. Thank you so much...";
 				set sign_q,200;
-				getexp 20000,0;
+				getexp (checkre(3))?20000:200000,0;
 				set $@sign_w1,0;
 				close2;
 				warp "umbala,",132,203;
@@ -9480,7 +9552,7 @@ niflheim,313,70,4	script	Pleasant-Featured Lady#s	90,{
 				mes "the faint smile on her lips tell you that her memories of you";
 				mes "will always remain in her heart.^000000";
 				delitem 2643,1; //Serin's_Gold_Ring_
-				getexp 50000,0;
+				getexp (checkre(3))?50000:500000,0;
 				close;
 			case 2:
 				emotion e_sob;
@@ -10242,7 +10314,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 				mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason, "+strcharinfo(0)+"...";
 				delitem 7313,5; //Seal_Of_Witch
 				set sign_q,129;
-				getexp 50000,0;
+				getexp (checkre(3))?50000:500000,0;
 				close;
 			}
 		}
@@ -10271,7 +10343,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 				mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason...";
 				delitem 7313,5; //Seal_Of_Witch
 				set sign_q,130;
-				getexp 30000,0;
+				getexp (checkre(3))?30000:300000,0;
 				close;
 			}
 		}
@@ -10297,7 +10369,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 		mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason...";
 		if (countitem(2643) == 1) set sign_q,129;
 		else set sign_q,130;
-		getexp 30000,0;
+		getexp (checkre(3))?30000:300000,0;
 		close;
 	}
 	else if (sign_q == 200) {
@@ -10327,7 +10399,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 		if (countitem(2642) > 0) delitem 2642,1; //Serin's_Gold_Ring
 		if (countitem(7308) > 0) delitem 7308,1; //Witch's_Potion
 		set sign_q,201;
-		getexp 20000,0;
+		getexp (checkre(3))?20000:200000,0;
 		close;
 	}
 	else if (sign_q > 200) {
@@ -11298,7 +11370,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 						mes "Heh heh!";
 						close;
 					}
-					set zeny,zeny-40000;
+					set Zeny, Zeny-40000;
 					close;
 				case 2:
 					mes "[Laichin]";
@@ -11317,7 +11389,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 						mes "crawling back when";
 						mes "you can't figure out";
 						mes "where the soul pieces are!";
-						set zeny,zeny-40000;
+						set Zeny, Zeny-40000;
 						if (.@select_s == 1) set sign_q,97;
 						else if (.@select_s == 2) set sign_q,98;
 						else if (.@select_s == 3) set sign_q,99;
@@ -11353,7 +11425,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 							mes "than the borders of the map.";
 							mes "For very small, you gotta";
 							mes "look near the center. Got it?";
-							set zeny,zeny-60000;
+							set Zeny, Zeny-60000;
 							if (.@select_s == 1) set sign_q,101;
 							else if (.@select_s == 2) set sign_q,102;
 							else if (.@select_s == 3) set sign_q,103;
@@ -11392,7 +11464,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 		next;
 		switch(select("Pay him.:Don't pay him.")) {
 		case 1:
-			if (Zeny < 60000) {
+			if (Zeny < 20000) {
 				mes "[Laichin]";
 				mes "What is this?";
 				mes "You tryin to welch";
@@ -11414,7 +11486,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 				mes "than the borders of the map.";
 				mes "For very small, you gotta";
 				mes "look near the center. Got it?";
-				set zeny,zeny-20000;
+				set Zeny, Zeny-20000;
 				if (sign_q == 97) set sign_q,101;
 				else if (sign_q == 98) set sign_q,102;
 				else if (sign_q == 99) set sign_q,103;
@@ -12230,7 +12302,7 @@ geffen,119,48,0	script	Fountain#s	111,{
 
 que_sign01,196,44,0	script	Starter#serin	-1,32,32,{
 OnTouch:
-	donpcevent "Timer#serin::Onstart";
+	donpcevent "Timer#serin::OnStart";
 	disablenpc "Starter#serin";
 	end;
 
@@ -12255,7 +12327,7 @@ OnEnable:
 }
 
 que_sign01,1,0,0	script	Timer#serin	-1,{
-Onstart:
+OnStart:
 	initnpctimer;
 	end;
 
@@ -12270,7 +12342,7 @@ OnTimer620000:
 	donpcevent "Serin#serin::OnEnable";
 	donpcevent "Dark Lord#serin::OnDisable";
 	donpcevent "Serin#dummy::OnDisable";
-	donpcevent "CallMonster#serin::Onreset";
+	donpcevent "CallMonster#serin::OnReset";
 	stopnpctimer;
 	end;
 }
@@ -12285,13 +12357,13 @@ OnMyMobDead:
 		donpcevent "Serin#serin::OnEnable";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "que_sign01","CallMonster#serin::OnMyMobDead";
 }
 
 que_sign01,197,195,0	script	Starter#witch	-1,32,32,{
 OnTouch:
-	donpcevent "Timer#witch::Onstart";
+	donpcevent "Timer#witch::OnStart";
 	disablenpc "Starter#witch";
 	end;
 
@@ -12301,7 +12373,7 @@ OnEnable:
 }
 
 que_sign01,1,1,0	script	Timer#witch	-1,{
-Onstart:
+OnStart:
 	initnpctimer;
 	end;
 
@@ -12312,7 +12384,7 @@ OnTimer600000:
 OnTimer620000:
 	donpcevent "Starter#witch::OnEnable";
 	donpcevent "Warp#witch::OnDisable";
-	donpcevent "CallMonster#witch::Onreset";
+	donpcevent "CallMonster#witch::OnReset";
 	donpcevent "Serin#witch::OnEnable";
 	set $@sign_w1,0;
 	stopnpctimer;
@@ -12354,7 +12426,7 @@ OnMyMobDead:
 	}
 	end;
 
-Onreset:
+OnReset:
 	killmonster "que_sign01","CallMonster#witch::OnMyMobDead";
 	end;
 }
@@ -12564,9 +12636,9 @@ function	script	F_UpdateSignVars	{
 	return;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 First version, beware of potential nasty bugs :x [MasterOfMuppets]
 //= 1.1 Finalized for stable, might still contain bugs though. [MasterOfMuppets]
 //= 1.1a moved #aldesignwarp to fix enless warp [Lupus]
@@ -12599,3 +12671,4 @@ function	script	F_UpdateSignVars	{
 //= 2.8 Fixed some bugs with itemids and leftover questitems [Fish0r]
 //= 2.9 Made a delitem causing script to fault use countitem when deleting. [L0ne_W0lf]
 //= 2.9a Added a check for Sign_Branch8A before attempting to run a delitem on items not needed based on Path taken. [Paradox924X]
+//============================================================