Update to last rAthena npc.

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

20 files changed, 816 insertions, 1493 deletions

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'