Update to last rAthena npc.

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

33 files changed, 526 insertions, 557 deletions

diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index 4b768a58a..a34a8252a 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -1,32 +1,30 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Gunslinger Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= erKURITA, RockmanEXE, Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Gunslinger Job Change Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Made the NPC [erKURITA]
 //= 1.5 Couple fixes to the npc, aswell as adding the missing
-//=	  3 green herbs. [erKURITA]
+//=     3 green herbs. [erKURITA]
 //= 1.6 job number->const, commonized variable name,
-//= 	optimized [Lupus]
+//=     optimized [Lupus]
 //= 1.7 Now uses only ONE variable GUNS_Q [Lupus]
 //= 1.7a Grammar fixes, few spelling fixes, etc [CBMaster]
 //= 1.7b Parenthesis fixes [KarLaeda]
 //= 1.8 Fixed the reward you can get [Playtester]
 //= 1.9 Removed some 'clever' script constructs [ultramage]
 //= 2.0 Updated to official version - Thanks to Omega for
-//= his first try [SinSloth] 1.10b - removed .GATs [Lupus]
+//=     his first try [SinSloth] 1.10b - removed .GATs [Lupus]
 //= 2.1 Wise Bull Horn now deletes all items. Thanks to yyCC. [L0ne_W0lf]
 //= 2.1a Corrected a Typo error ";;". [Samuray22]
 //= 2.1b Corrected some typos errors. (bugreport:1549) [Samuray22]
 //= 2.1c Fixed some missing/messed up item checks. (bugreport:2693) [Kisuka]
 //= 2.2 Updated to match AEGIS script and Added Quest Log commands. [Kisuka]
-//============================================================ 
+//============================================================
 
 que_ng,152,167,3	script	Master Miller	901,{
 	if (Upper == 2) {
@@ -92,7 +90,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			setquest 6020;
 			close;
 		}
-		else if(GUNS_Q == 1) {
+		else if (GUNS_Q == 1) {
 			mes "[Master Miller]";
 			mes "Take that letter of";
 			mes "introduction I've written";
@@ -102,7 +100,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "Gunslinger material.";
 			close;
 		}
-		else if(GUNS_Q == 2) {
+		else if (GUNS_Q == 2) {
 			mes "[Master Miller]";
 			mes "Hmm... Wise Bull Horn";
 			mes "asked you to collect the";
@@ -111,7 +109,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "part of his qualification test.";
 			close;
 		}
-		else if(GUNS_Q == 3) {
+		else if (GUNS_Q == 3) {
 			mes "[Master Miller]";
 			mes "Wise Bull Horn asked";
 			mes "you to bring him some";
@@ -120,7 +118,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "for favors. Good luck, friend.";
 			close;
 		}
-		else if(GUNS_Q == 4) {
+		else if (GUNS_Q == 4) {
 			mes "[Master Miller]";
 			mes "I expect to hear good";
 			mes "news from you soon. You";
@@ -128,8 +126,8 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "you'll become a Gunslinger.";
 			close;
 		}
-		else if(GUNS_Q == 5) {
-			if (Skillpoint != 0) {
+		else if (GUNS_Q == 5) {
+			if (SkillPoint != 0) {
 				mes "[Master Miller]";
 				mes "Hey, you have leftover";
 				mes "Skill Points. You better";
@@ -184,13 +182,13 @@ que_ng,152,167,3	script	Master Miller	901,{
 			set GUNS_Q,6;
 			completequest 6024;
 			if (rand(1,2) == 1) {
-				getitem 13100,1;	// Six_Shooter
-			}else{
-				getitem 13150,1;	// Branch
+				getitem 13100,1; // Six_Shooter
+			} else {
+				getitem 13150,1; // Branch
 			}
 			close;
 		}
-	}else{
+	} else {
 		if (Class == Job_Gunslinger) {
 			mes "[Master Miller]";
 			mes "Oh! Long time, no see,";
@@ -200,7 +198,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "Take care of it, and it'll take";
 			mes "care of you. Remember it.";
 			close;
-		}else{
+		} else {
 			mes "[Master Miller]";
 			mes "If you don't have";
 			mes "any business with me,";
@@ -266,7 +264,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		changequest 6020,6021;
 		close;
 	}
-	else if(GUNS_Q == 2) {
+	else if (GUNS_Q == 2) {
 		if (countitem(912) < 3 || countitem(914) < 3 || countitem(1019) < 1 || countitem(935) < 10 || countitem(511) < 3 || countitem(1013) < 3) {
 			mes "[Wise Bull Horn]";
 			mes "I can make a voucher that";
@@ -293,12 +291,12 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 			mes "a Gunslinger.";
 			close;
 		}
-		delitem 912,3;	// Zargon
-		delitem 914,3;	// Fluff
-		delitem 1019,1;	// Wooden_Block
-		delitem 935,10;	// Shell
-		delitem 511,3;	// Green_Herb
-		delitem 1013,3;	// Colorful_Shell
+		delitem 912,3; // Zargon
+		delitem 914,3; // Fluff
+		delitem 1019,1; // Wooden_Block
+		delitem 935,10; // Shell
+		delitem 511,3; // Green_Herb
+		delitem 1013,3; // Colorful_Shell
 		set GUNS_Q,3;
 		changequest 6021,6022;
 		mes "[Wise Bull Horn]";
@@ -310,7 +308,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		mes "I should be finished with it.";
 		close;
 	}
-	else if(GUNS_Q == 3) {
+	else if (GUNS_Q == 3) {
 		mes "[Wise Bull Horn]";
 		mes "Oh, you've arrived just";
 		mes "in time. It's been a while";
@@ -350,7 +348,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		changequest 6022,6023;
 		close;
 	}
-	else if(GUNS_Q == 4) {
+	else if (GUNS_Q == 4) {
 		if (countitem(519) < 1) {
 			mes "[Wise Bull Horn]";
 			mes "I'm an old man that will";
@@ -360,7 +358,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 			mes "a cold glass of Milk, please?";
 			close;
 		}
-		delitem 519,1;	// Milk
+		delitem 519,1; // Milk
 		set GUNS_Q,5;
 		changequest 6023,6024;
 		mes "[Wise Bull Horn]";
@@ -390,7 +388,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		mes "Yippee Yippee Yai Yocaiyay~";
 		close;
 	}
-	else if(GUNS_Q == 5) {
+	else if (GUNS_Q == 5) {
 		mes "[Wise Bull Horn]";
 		mes "Please take this voucher";
 		mes "to Miller, the Black Fox, with";
@@ -406,7 +404,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		mes "Yippee Yippee Yai Yocaiyay~";
 		close;
 	}
-	else if(GUNS_Q == 6) {
+	else if (GUNS_Q == 6) {
 		mes "[Wise Bull Horn]";
 		mes "AAh, long time no see.";
 		mes "I hope that you become";
diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt
index dcd9a851a..d74ed85d6 100644
--- a/npc/jobs/1-1e/ninja.txt
+++ b/npc/jobs/1-1e/ninja.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Ninja Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Legionaire, Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Ninja Job Change Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Optimized, updated, checked [Lupus]
 //= 1.2 Added Akagi [Playtester]
 //= 1.3 Updated dialogs to official ones and optimized [SinSloth]
 //= 1.4 Fixed a minor bug [SinSloth]
 //= 1.5 Updated to match AEGIS script and Added Quest Log commands. [Kisuka]
 //= 1.6 Fixed AEGIS amatsu warp typo. [Kisuka]
-//============================================================ 
+//============================================================
 
 alberta,30,65,3	script	Akagi	730,{
 	if (Class == Job_Novice) {
@@ -53,7 +51,7 @@ alberta,30,65,3	script	Akagi	730,{
 					warp "amatsu",178,176;
 					end;
 			}
-		}else{
+		} else {
 			mes "[Akagi]";
 			mes "Hm? I cannot be";
 			mes "of any service to";
@@ -61,7 +59,7 @@ alberta,30,65,3	script	Akagi	730,{
 			mes "a little stronger...";
 			close;
 		}
-	}else{
+	} else {
 		mes "[Akagi]";
 		mes "Hmm...";
 		mes "You and I...";
@@ -192,7 +190,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			setquest 6015;
 			close;
 		}
-		else if(NINJ_Q == 1) {
+		else if (NINJ_Q == 1) {
 			mes "[Cougar]";
 			mes "Even if this task";
 			mes "isn't that urgent,";
@@ -201,7 +199,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "my letter to Wildcat Joe.";
 			close;
 		}
-		else if(NINJ_Q == 2) {
+		else if (NINJ_Q == 2) {
 			mes "[Cougar]";
 			mes "Did you deliver that";
 			mes "letter to Wildcat Joe?";
@@ -211,7 +209,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "if you can needle him for it.";
 			close;
 		}
-		else if(NINJ_Q == 3) {
+		else if (NINJ_Q == 3) {
 			mes "[Cougar]";
 			mes "Ah, you've returned.";
 			mes "So did Wildcat Joe send";
@@ -259,7 +257,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			changequest 6017,6018;
 			close;
 		}
-		else if(NINJ_Q == 4) {
+		else if (NINJ_Q == 4) {
 			if (countitem(7053) < 5 || countitem(1010) < 1) {
 				mes "[Cougar]";
 				mes "Hurry and bring";
@@ -270,7 +268,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 				mes "against Wildcat Joe!";
 				close;
 			}
-			if (Skillpoint != 0) {
+			if (SkillPoint != 0) {
 				mes "[Cougar]";
 				mes "Whoa, whoa...";
 				mes "You still have some";
@@ -350,7 +348,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "the respect of any Ninja~";
 			close;
 		}
-	}else{
+	} else {
 		if (Class == Job_Ninja) {
 			mes "[Cougar]";
 			mes "How have you been?";
@@ -360,7 +358,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "can do that, you'll get";
 			mes "the respect of any Ninja~";
 			close;
-		}else{
+		} else {
 			mes "[Cougar]";
 			mes "What...?";
 			mes "How were you able";
@@ -436,7 +434,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		changequest 6015,6016;
 		close;
 	}
-	else if(NINJ_Q == 2) {
+	else if (NINJ_Q == 2) {
 		if (countitem(7053) < 5 || countitem(1010) < 1) {
 			mes "[Suspicious Man]";
 			mes "Please bring";
@@ -532,7 +530,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		warp "amatsu",113,127;
 		end;
 	}
-	else if(NINJ_Q == 3) {
+	else if (NINJ_Q == 3) {
 		mes "[Red Leopard Joe]";
 		mes "Eh? I'm not sure what";
 		mes "happened, but it seems";
@@ -555,7 +553,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		warp "amatsu",113,127;
 		end;
 	}
-	else if(NINJ_Q == 4) {
+	else if (NINJ_Q == 4) {
 		mes "[Red Leopard Joe]";
 		mes "Cougar asked you to";
 		mes "gather some materials";
@@ -565,7 +563,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		mes "to beat him in a fair fight~";
 		close;
 	}
-	else if(NINJ_Q == 5 && Class == Job_Ninja) {
+	else if (NINJ_Q == 5 && Class == Job_Ninja) {
 		mes "[Red Leopard Joe]";
 		mes "Oh, you're a Ninja~";
 		mes "I hope you continue to";
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 6d748530f..dffae4639 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Taekwon Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Tsuyuki & Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena/Freya
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Official iRO TaeKwon Job Change Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Replaced previous TK Job Quest with this one [Tsuyuki]
 //= 1.1 Rewrote to the Aegis Standars. [Samuray22]
 //= 1.2 Fixed position the npc is facing. [Kisuka]
 //= 1.3 Added Quest Log commands. [Kisuka]
 //= 1.4 Removed use of 'goto', and fixed some indentation. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 payon,157,141,5	script	Phoenix#TKJobChange	753,{
 	if(Upper == 2) {
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index 126db3baf..b0550c12f 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -1,33 +1,33 @@
 //===== Hercules Script ======================================
 //= Assassin Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
-//= 3.5
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 3.6
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Assassin class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Used some dialogue from the aegis Assassin script translated By: Pgro Team (OwNaGe)
-//= Also converted the booby traps from the aegis script.[kobra_k88]
+//=     Also converted the booby traps from the aegis script.[kobra_k88]
 //= 1.1 Made adjustments to ontouch npcs to work with the new "ontouch" functionality.
-//= Fixed some duplicate npc names.  Added missing waitingroom triggers.
-//= Fixed warp in "TimerSin", was supposed to be an areawarp.
-//= For some reason sometimes the "Nameless One" would have message windows
-//= without controls.  Changed the doevent that triggers him to an
-//= addtimer and that seemed make the prob. go away[kobra_k88]
+//=     Fixed some duplicate npc names.  Added missing waitingroom triggers.
+//=     Fixed warp in "TimerSin", was supposed to be an areawarp.
+//=     For some reason sometimes the "Nameless One" would have message windows
+//=     without controls.  Changed the doevent that triggers him to an
+//=     addtimer and that seemed make the prob. go away[kobra_k88]
 //= 1.2 Fixed WRONG skillpoint check! [Lupus]
 //= 1.2b Fixed missing commands and typos [Lupus]
 //= 1.3 Baby class Support added [Lupus]
 //= 1.5 Fixed possible EXP abuse [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Removed Duplicates [Silent]
 //= 2.2 Merged back JFunc. Fixed missing dialogue [Lupus]
 //= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I 
-//= was still able to bypass it) [Toms]
+//=     was still able to bypass it) [Toms]
 //= 2.4 Fixed skipping of Nameless NPC [Lupus]
 //= 2.5 Fixed a Rogue exploit [Lupus]
 //= 2.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
@@ -46,7 +46,8 @@
 //= 3.3 Added Quest Log commands. [Kisuka]
 //= 3.4 Removed the need for use of 'goto.' [L0ne_W0lf]
 //= 3.5 Fixed the waitingroom where player can enter the Test Area without passing the written exam. Now player will not be warp inside the Test Area when did not passed the written exam instead the player will be warp back to the written exam entrance [JayPee]
-//============================================================ 
+//= 3.6 Fixed broken event calls. [Euphy]
+//============================================================
 
 in_moc_16,19,33,1	script	Guildsman#asn	55,{
 	if (Upper == 1) {
@@ -253,9 +254,9 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 					mes "you to the office.";
 					close2;
 					set ASSIN_Q,0;
-					if(checkquest(8000) != -1) {
+					if (checkquest(8000) != -1) {
 						changequest 8000,8001;
-					}else{
+					} else {
 						setquest 8001;
 					}
 					warp "in_moc_16",19,76;
@@ -292,7 +293,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 in_moc_16,25,90,1	script	Guildsman#ASN2	730,2,2,{
 	mes "[Assassin 'Khai']";
 	mes "Umm?!";
-	Emotion e_gasp;
+	emotion e_gasp;
 	next;
 	mes "[Assassin 'Khai']";
 	mes "Come closer. I prefer to talk to people face to face. It really irritates me if I have to raise my voice, just so you can hear me.";
@@ -380,7 +381,7 @@ OnTouch:
 			close;
 		case 2:
 			mes "[Assassin 'Khai']";
-			if (sex) {
+			if (Sex) {
 				mes "Huh. You must have a lot of self confidence to be a Thief nowadays.";
 				next;
 				mes "[Assassin 'Khai']";
@@ -1105,12 +1106,10 @@ OnInit:
 OnStartArena:
 	warpwaitingpc "in_moc_16", 66, 151;
 	attachrid($@warpwaitingpc[0]);
-	if(ASSIN_Q2<5)
-	{
+	if (ASSIN_Q2 < 5) {
 		warpchar "in_moc_16",20,145,getcharid(0);
 		end;
 	}
-	
 	donpcevent "Beholder#ASNTEST::OnEnable";
 	donpcevent "Keeper of the Door#ASN::OnDisable";
 	set getvariableofnpc(.DisableTraps,"Beholder#ASNTEST"),0;
@@ -1607,7 +1606,7 @@ OnTouch:
 	else {
 		mapannounce "in_moc_16",strcharinfo(0)+" has entered 'Guildmaster's room.'",bc_map;
 		savepoint "in_moc_16",181,183;
-		donpcevent "Guildmaster#ASN2::OnDisable";
+		donpcevent "Guildmaster#ASN1::OnCast";
 		warp "in_moc_16",167,113;
 		end;
 	}
@@ -1629,7 +1628,7 @@ OnTouch:
 	mes "at the end of maze.";
 	close;
 
-OnDisable:
+OnCast:
 	mapannounce "in_moc_16","...Next volunteer, please come in.",bc_map;
 	end;
 }
@@ -1882,7 +1881,7 @@ OnTouch:
 				mes "Haha, the needs of the body are sometimes hard to ignore. It's best to accept that part of human nature.";
 				next;
 				mes "[Guildmaster]";
-				if (sex )
+				if (Sex)
 					mes "But you must never reveal to her the Assassin side of your life. No matter what it takes.";
 				else
 					mes "But you must never reveal to him the Assassin side of your life, no matter what it takes.";
@@ -1996,7 +1995,7 @@ OnTouch:
 		mes "'Beholder,' what";
 		mes "is your opinion?";
 		next;
-		donpcevent "[Huey]::OnDisable";
+		disablenpc "[Huey]";
 		mes "[Beholder]";
 		mes "Well, I don't like the course score. But, somehow the whole test was passed. I'm okay with this person.";
 		next;
@@ -2240,58 +2239,17 @@ OnTouch:
 	close;
 }
 
-in_moc_16,156,87,1	script	[Huey]	55,{
-	end;
-
-OnInit:
-	disablenpc "[Huey]";
-	end;
-}
-
-in_moc_16,156,85,1	script	[Khai]	730,{
-	end;
-
-OnInit:
-	disablenpc "[Khai]";
-	end;
-}
-
-in_moc_16,156,83,1	script	[The Anonymous One]	106,{
-	end;
-
-OnInit:
-	disablenpc "[The Anonymous One]";
-	end;
-}
-
-in_moc_16,156,81,2	script	[Barcardi]	725,{
-	end;
-
-OnInit:
-	disablenpc "[Barcardi]";
-	end;
-}
-
-in_moc_16,156,79,1	script	[Beholder]	118,{
-	end;
-
-OnInit:
-	disablenpc "[Beholder]";
-	end;
-}
-
-in_moc_16,156,77,1	script	[Thomas]	118,{
-	end;
-
-OnInit:
-	disablenpc "[Thomas]";
-	end;
-}
-
-in_moc_16,156,75,1	script	[Gayle Maroubitz]	55,{
+-	script	#moc_assin_dup	-1,{
 	end;
 
 OnInit:
-	disablenpc "[Gayle Maroubitz]";
+	disablenpc strnpcinfo(0);
 	end;
 }
+in_moc_16,156,87,1	duplicate(#moc_assin_dup)	[Huey]	55
+in_moc_16,156,85,1	duplicate(#moc_assin_dup)	[Khai]	730
+in_moc_16,156,83,1	duplicate(#moc_assin_dup)	[The Anonymous One]	106
+in_moc_16,156,81,2	duplicate(#moc_assin_dup)	[Barcardi]	725
+in_moc_16,156,79,1	duplicate(#moc_assin_dup)	[Beholder]	118
+in_moc_16,156,77,1	duplicate(#moc_assin_dup)	[Thomas]	118
+in_moc_16,156,75,1	duplicate(#moc_assin_dup)	[Gayle Maroubitz]	55
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index ba60ca5b4..f58158be3 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -14,13 +14,13 @@
 //===== Additional Comments: =================================
 //= Changed some npc names to the iRO names. Changed some variable
 //= names and labels. Edited some text.[kobra_k88]
-//= Removed "if(JobLevel > 48) goto higher". It was a left over line.
+//= Removed "if (JobLevel > 48) goto higher". It was a left over line.
 //= Thx to "Decker".[kobra_k88]
 //= Fixed some typos, thanks to Riotblade [celest]
 //= 1.3-1.5 Added Baby Class support [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 1.7 item quantity/ids typos fix
 //= 1.8 Moved the Quest to Einbroch [Poki#3]
 //= 2.0 Changed numbers to constants. [Vicious]
@@ -72,7 +72,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 	mes "and tools is truly a form of art!";
 	next;
 	if (BaseClass == Job_Novice) {
-		if (sex == 0) {
+		if (Sex == 0) {
 			mes "[Altiregen]";
 			mes "Oh~";
 			mes "what a very";
@@ -248,7 +248,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 		else if (BSMITH_Q == 17 && countitem(1005) > 0 && JobLevel > 39) {
 			mes "[Altiregen]";
 			mes "Excellent, I can tell by the twinkle in your eye that you were successful. I can now bestow upon you the gift of the smithing, the art of the Blacksmith.";
-			if(checkquest(2015) != -1) {
+			if (checkquest(2015) != -1) {
 				changequest 2015,2016;
 			}
 			next;
@@ -483,9 +483,9 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				mes "Let's see...your score is..." + .@black_q + " points.";
 				if (.@black_q == 100) {
 					set BSMITH_Q,3;
-					if(checkquest(2001) != -1) {
+					if (checkquest(2001) != -1) {
 						changequest 2001,2002;
-					}else{
+					} else {
 						changequest 2000,2002;
 					}
 					mes "Oh ho ho~";
@@ -500,7 +500,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 					close;
 				}
 				set BSMITH_Q,2;
-				if(checkquest(2001) == -1) {
+				if (checkquest(2001) == -1) {
 					changequest 2000,2001;
 				}
 				mes ".............";
@@ -653,7 +653,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				case 9:
 					mes "Okay, now take this to ^8E6B23Baisulist^000000 in Geffen of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
 					getitem 1610,1; //Arc_Wand
-					if(checkquest(2003) != -1) {
+					if (checkquest(2003) != -1) {
 						changequest 2003,2008;
 					}
 					next;
@@ -678,7 +678,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				case 10:
 					mes "Okay, now take this to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
 					getitem 1219,1; //Gladius
-					if(checkquest(2004) != -1) {
+					if (checkquest(2004) != -1) {
 						changequest 2004,2009;
 					}
 					next;
@@ -700,10 +700,10 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 					mes "Anyway, take this";
 					mes "to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom,";
 					break;
-				Case 11:
+				case 11:
 					mes "Okay, now take this to ^8E6B23Krongast^000000 in Lighthalzen. Simply deliver it and bring me the receipt.";
 					getitem 1119,1; //Tsurugi
-					if(checkquest(2005) != -1) {
+					if (checkquest(2005) != -1) {
 						changequest 2005,2010;
 					}
 					next;
@@ -729,7 +729,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				case 12:
 					mes "Okay, now take this to ^8E6B23Talpiz^000000 in Payon of Rune-Midgarts Kingdom. Simply deliver this and bring me the receipt.";
 					getitem 1713,1; //Arbalest
-					if(checkquest(2006) != -1) {
+					if (checkquest(2006) != -1) {
 						changequest 2006,2011;
 					}
 					next;
@@ -753,7 +753,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				case 13:
 					mes "Okay, now take this to ^8E6B23Bismarc^000000 in Hugel. Simply deliver this and bring back the receipt.";
 					getitem 1122,1; //Ring_Pommel_Saber
-					if(checkquest(2007) != -1) {
+					if (checkquest(2007) != -1) {
 						changequest 2007,2012;
 					}
 					next;
@@ -850,16 +850,16 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				if (countitem(1073) > 0) {
 					set BSMITH_Q,15;
 					delitem 1073,1; //Merchant_Voucher_1
-					if(checkquest(2008) != -1) {
+					if (checkquest(2008) != -1) {
 						changequest 2008,2013;
 					}
-					else if(checkquest(2009) != -1) {
+					else if (checkquest(2009) != -1) {
 						changequest 2009,2013;
 					}
-					else if(checkquest(2010) != -1) {
+					else if (checkquest(2010) != -1) {
 						changequest 2010,2013;
 					}
-					else if(checkquest(2011) != -1) {
+					else if (checkquest(2011) != -1) {
 						changequest 2011,2013;
 					}
 					else {
@@ -1616,7 +1616,7 @@ geffen_in,109,170,3	script	Blacksmith Guildsman#gef	726,{
 			mes "Excuse me, but you do not have enough money.";
 			close;
 		}
-		set zeny,zeny-600;
+		set Zeny, Zeny-600;
 		warp "izlude",94,103;
 		end;
 	case 3:
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 2777e0a43..326ef5fbb 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -1,17 +1,15 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Hunter Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= EREMES THE CANIVALIZER (Aegis)Translated by yoshiki (Aegis)
 //= Converted by kobra_k88
 //= Further bugfixed and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Hunter class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 0.5 Fully working.
 //= 0.6 Changed global variable names to unique ones.
 //= 0.7 - 0.8 Updates for rAthena +Knight2,Crusader2 fix
@@ -22,8 +20,8 @@
 //= 1.3 Added Baby Class support [Lupus]
 //= 1.5 Fixed possible EXP abuse [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 1.6a Infinite Arrows exploit fix (thanx to Lorky, that
 //= reported the bug) [Lupus]
 //= 1.7 Moved the Job QUest to Hugel [Poki#3]
@@ -46,19 +44,19 @@
 //= 3.0a Corrected a Typo error ";;". [Samuray22]
 //= 3.1 Now uses enable and disable waitingroomevent. [L0ne_W0lf]
 //= 3.2 Fixes a bug where the timer was stopped causing the [L0ne_W0lf]
-//=	test to freeze. (bugreport:1099)
+//=     test to freeze. (bugreport:1099)
 //= 3.3 Added missing next. [L0ne_W0lf]
 //= 3.4 Corrected some Issues with the Waiting Room. (bugreport:1890) [Samuray22]
-//=	-Deleted a Unnecesary Next; on Hunter Guildsman#hnt. (bugreports:1665,2239,2179)
+//=     Deleted a Unnecesary Next; on Hunter Guildsman#hnt. (bugreports:1665,2239,2179)
 //= 3.5 Added Quest Log commands. [Kisuka]
 //= 3.6 Removed the need for use of 'goto.' [L0ne_W0lf]
 //= 3.7 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info).
-//============================================================ 
+//============================================================
 
 // Notices in the old Hunter Guild.
-//============================================================ 
+//============================================================
 in_hunter,99,99,4	script	Hunter Info#hnt::HntNotice	727,{
-	mes "============ Notice ============";
+	mes "============Notice ============";
 	mes "We would like to inform that the Hunter Job Change Location";
 	mes "has been moved to ^ff0000Hugel^000000 in the Schwaltzvalt Republic.";
 	next;
@@ -77,7 +75,7 @@ in_hunter,99,99,4	script	Hunter Info#hnt::HntNotice	727,{
 pay_fild10,148,252,3	duplicate(HntNotice)	Job Change Location#hu	857
 
 // Actual Job quest start
-//============================================================ 
+//============================================================
 hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 	if (Upper == 1) {
 		mes "[Hunter Sherin]";
@@ -125,7 +123,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 		mes "Oh, a person who serves God! Nice to meet you. There aren't many people like you that visit this place~ Hehe.";
 		close;
 	}
-	else if (Baseclass == Job_Merchant) {
+	else if (BaseClass == Job_Merchant) {
 		mes "[Hunter Guildsman]";
 		mes "Oh...";
 		mes "How's your business coming along?";
@@ -182,7 +180,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 			mes "[Hunter Sherin]";
 			mes "Tada~ Congratulations!";
 			mes "You look great as a Hunter!!";
-			set .@joblvl,joblevel;
+			set .@joblvl, JobLevel;
 			completequest 4013;
 			callfunc "Job_Change",Job_Hunter;
 			callfunc "F_ClearJobVar";		// clears all job variables for the current player
@@ -438,7 +436,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 			mes "Just give the item to the Demon Hunter, the guy who's all the way to the left in this area~";
 			next;
 			mes "[Hunter Sherin]";
-			if (sex)
+			if (Sex)
 				mes "If you decide to become a Hunter, promise to come visit me. I want to see you as a Hunter. You would look great!!";
 			else
 				mes "If you decide to become a Hunter, come and visit me, okay? You're pretty, but... You'd be even prettier as a Hunter. Hehe~";
@@ -517,7 +515,7 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
 		case 5: setarray .@items[0], 935,9, 955,9, 508,9, 7; changequest 4001,4006; break;
 		//Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot
 		case 6: setarray .@items[0], 913,3, 938,1, 948,1, 8; changequest 4001,4007; break;
-		//Porcupine_Spike, Yoyo_Tailm Acorn
+		//Porcupine_Spike, Yoyo_Tail, Acorn
 		case 7: setarray .@items[0], 1027,2, 942,1, 1026,1, 9; changequest 4001,4008; break;
 		}
 		if (.@selection == 1) {
@@ -538,7 +536,7 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
 		switch(HNTR_Q) {
 		//Insect_Feeler/Claw_Of_Desert_Wolf, Wooden_Block, White_Herb
 		case 3: setarray .@items[0], (.@i?928:7030),5, 1019,5, 509,3, 10; break;
-		//Bill_Of_Birds, Skel_Bonem Green_Herb
+		//Bill_Of_Birds, Skel_Bone, Green_Herb
 		case 4: setarray .@items[0], 925,3, 932,5, 511,3, 10; break;
 		//Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb
 		case 5: setarray .@items[0], (.@i?1013:937),3, 919,3, 507,5, 10; break;
@@ -548,7 +546,7 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
 		case 7: setarray .@items[0], 935,9, 955,9, 508,9, 11; break;
 		//Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot
 		case 8: setarray .@items[0], 913,3, 938,1, 948,1, 11; break;
-		//Porcupine_Spike, Yoyo_Tailm Acorn
+		//Porcupine_Spike, Yoyo_Tail, Acorn
 		case 9: setarray .@items[0], 1027,2, 942,1, 1026,1, 11; break;
 		}
 		mes "[Demon Hunter]";
@@ -1265,7 +1263,7 @@ OnTouch:
 }
 
 // Hunter Job test traps.
-//============================================================ 
+//============================================================
 job_hunte,52,140,0	script	1-1::HntTrap	-1,0,1,{
 OnTouch:
 	switch(rand(200)) {
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index f3b31c0a0..cde608454 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -1,17 +1,15 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Knight Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= PGRO TEAM (Aegis).
 //= Converted by kobra_k88
 //= Further bugfixed and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Knight class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Fully working.  Please comment out any pre-existing warps for the
 //= test rooms in any other files so that the ones specified here can work.
 //= 1.1 Fixed a major bug.  Now using the initnpctimer command,
@@ -30,7 +28,7 @@
 //= 2.3 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf]
 //= 2.4 Minor fixes to timer#knt. [L0ne_W0lf]
 //= 2.5 Fixes a small bug with making claymores. [L0ne_W0lf]
-//=	Corrected usages of killmonster and killmonsterall.
+//=     Corrected usages of killmonster and killmonsterall.
 //= 2.6 Corrected an improper areawarp destination. [L0ne_W0lf]
 //= 2.7 Deleted unused variables. [Samuray22]
 //= 2.7a Corrected a Typo error ";;". [Samuray22]
@@ -40,7 +38,7 @@
 //= 3.1 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info).
 //= 3.2 More Renewal updates and some optimization. [Euphy]
 //= 3.3 Fixed missing changequest. [Joseph]
-//============================================================ 
+//============================================================
 
 prt_in,88,101,4	script	Chivalry Captain#knt	56,{
 	mes "[Captain Herman]";
@@ -373,7 +371,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	56,{
 		mes "to Amy's opinion.";
 		next;
 		mes "[Lady Amy]";
-		if (sex) {
+		if (Sex) {
 			mes "Mmm~ He's so polite!";
 			mes "He'll grow to be a wonderful Knight. And he's got such cute widdle cheeeeks~ Hee hee!";
 		}
@@ -392,7 +390,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	56,{
 		mes "your mind.";
 		next;
 		mes "[Sir Edmond]";
-		if (sex) {
+		if (Sex) {
 			mes "He seems a little rough, but something bright shines within him. With polish and refinement, his true value will shine forth";
 			mes "as the sun.";
 		}
@@ -694,7 +692,7 @@ prt_in,71,91,0	script	Sir Siracuse#knt	65,{
 			mes "If you catch any of the new guys acting in a way unbecoming of a Knight, scold them for me please?";
 			close;
 		}
-		else if (Baseclass == Job_Novice) {
+		else if (BaseClass == Job_Novice) {
 			mes "Oh?";
 			mes "What is a Novice";
 			mes "doing here?";
@@ -2028,8 +2026,7 @@ prt_in,87,92,4	script	Sir Gray#knt	119,{
 				mes "1 ^3355FFSteel^000000 because of the Claymore's characteristics. If you like, I can create one for you. For the honor of the Prontera Chivalry!";
 				close;
 			case 2:
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 1800) {
+				if (MaxWeight - Weight < 1800) {
 					mes "[Sir Gray]";
 					mes "Oh no...";
 					mes "It seems that you are carrying too many things. You don't have enough space for a heavy Claymore in your inventory.";
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index c05b140aa..cca2860a0 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -1,22 +1,22 @@
 //===== Hercules Script ======================================
 //= Priest Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Translated By: Pgro Team (OwNaGe)(Aegis)
 //= Converted by: kobra_k88.
 //= Further bugfixed and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.6
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Priest class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working.  Changed the way Priests enter the test room to help Acos.
 //= Must use this with the included Acolyte quest to work properely.
 //= 1.3 Added Baby Class support, fixed 3 wrong constants bugs [Lupus]
 //= 1.5 Fixed possible EXP abuse [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Merged JFunc [Lupus]
 //= 2.1a Fixed typo [KarLaeda]
@@ -47,7 +47,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		if (BaseJob == Job_Priest) {
 			mes "[Bishop Paul]";
 			mes "Ah...";
-			if (sex)
+			if (Sex)
 				mes "It is good to see you again, Brother " + strcharinfo(0) + ". Once again, God's grace has caused our paths to cross.";
 			else
 				mes "It is good to see you once again, Sister " + strcharinfo(0) + ". The grace of God has brought you once more before me.";
@@ -114,7 +114,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		else if (BaseClass == Job_Novice) {
 			mes "[Bishop Paul]";
 			mes "May God be";
-			if (sex)
+			if (Sex)
 				mes "with you, brother.";
 			else
 				mes "with you, sister.";
@@ -147,7 +147,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		else {
 			mes "[Bishop Paul]";
 			mes "May God be";
-			if (sex)
+			if (Sex)
 				mes "with you, brother.";
 			else
 				mes "with you, sister.";
@@ -202,7 +202,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 	if (PRIEST_Q == 0) {
 		mes "[Bishop Paul]";
 		mes "May God bless";
-		if (sex)
+		if (Sex)
 			mes "you, Brother.";
 		else
 			mes "you, Sister.";
@@ -242,7 +242,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 				set PRIEST_Q,1;
 				setquest 8009;
 					mes "[Bishop Paul]";
-				if (sex)
+				if (Sex)
 					mes "Now I will explain the Three Trials of Priesthood. These tribulations will bring you much suffering, but I hope you can complete them, Brother " + strcharinfo(0) + ".";
 				else
 					mes "Now I will explain the Three Trials of Priesthood. These tribulations will bring you much suffering, but I hope you can complete them, Sister " + strcharinfo(0) + ".";
@@ -327,7 +327,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 			mes "Thank you for asking.";
 			next;
 			mes "[Bishop Paul]";
-			if (sex)
+			if (Sex)
 				mes "I hope you will continue to go on your mission as God's servant, brother.";
 			else
 				mes "I hope you will continue to go on your mission as God's servant, sister.";
@@ -499,7 +499,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "[Bishop Paul]";
 		mes "God, grant your power to your servant standing before you.";
 		changequest 8015,8016;
-		if (sex)
+		if (Sex)
 			mes "Let him send your message throughout the ends of the earth.";
 		else
 			mes "Let her send your message throughout the ends of the earth.";
@@ -575,7 +575,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		close;
 	}
 	if (PRIEST_Q == 0) {
-		if (sex)
+		if (Sex)
 			mes "May God bless you, brother.";
 		else
 			mes "May God bless you, sister.";
@@ -656,7 +656,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		mes "Welcome. You demonstrated great effort to accomplish your first trial. Now, speak to Bishop Paul so that you can begin your next trial on your path to Priesthood.";
 		next;
 		mes "[Sister Cecilia]";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +"...";
 		else
 			mes "Sister "+ strcharinfo(0) +"...";
@@ -702,14 +702,14 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		}
 		next;
 		mes "[Sister Cecilia]";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +"...";
 		else
 			mes "Sister "+ strcharinfo(0) +"...";
 		mes "We will now begin your formal oath for the Priesthood. Make yourself comfortable, and just answer with your heart.";
 		next;
 		mes "[Sister Cecilia]";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +",";
 		else
 			mes "Sister "+ strcharinfo(0) +",";
@@ -800,7 +800,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 			close;
 		}
 		mes "[Sister Cecilia]";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +"...";
 		else
 			mes "Sister "+ strcharinfo(0) +"...";
@@ -846,7 +846,7 @@ job_prist,24,187,4	script	Peter S. Alberto	110,{
 	mes "[Father Peter]";
 	if (BaseJob == Job_Priest) {
 		mes "Welcome!";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +"!";
 		else
 			mes "Sister "+ strcharinfo(0) +"!";
@@ -1034,7 +1034,7 @@ job_prist,23,187,1	script	Peter S. Alberto#2	110,{
 	mes "[Father Peter]";
 	if (BaseJob == Job_Priest) {
 		mes "Welcome!";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +"!";
 		else
 			mes "Sister "+ strcharinfo(0) +"!";
@@ -1370,7 +1370,7 @@ OnTouch:
 		mes "[Deviruchi]";
 		mes "But how about this...? Now, isn't this an attractive sight? A nice, shiny new card. Mint condition. Not too many people have this you know. But I happen to have soooo many, my pockets hurt.";
 		next;
-		cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",4;
+		cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",4; // Mistress Card
 		mes "[Deviruchi]";
 		mes "Isn't it everyone's dream to have one of these? Think about it, being a Priest can only bring you suffering...";
 		next;
@@ -1380,7 +1380,7 @@ OnTouch:
 			mes "This card can";
 			mes "can be yours...";
 			next;
-			cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",255;
+			cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",255; // Mistress Card
 			mes "[Deviruchi]";
 			mes "Theoretically!";
 			mes "BWAHAHAHAHAHAHAHA!";
@@ -1389,7 +1389,7 @@ OnTouch:
 			warp "mjolnir_05",200,200;
 			end;
 		}
-		cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",255;
+		cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",255; // Mistress Card
 		mes "[Deviruchi]";
 		mes "Did...";
 		mes "Did you just tell";
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index 6598a0cc2..549ebcc95 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -1,16 +1,14 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Wizard Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= (Aegis) Translated by yoshiki, converted by kobra_k88
 //= Further bugfixed and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Wizard class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 2.5 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf]
 //= 2.5a More bugfixes care of Barron-Monster. [L0ne_W0lf]
@@ -18,7 +16,7 @@
 //= 2.5c Bug fixes. Cleaned up some NPCs slightly. [L0ne_W0lf]
 //= 2.6 Fixed Water Room not warping on time-up. [L0ne_W0lf]
 //= 2.7 Now uses enable and disable waitingroomevent. [L0ne_W0lf]
-//= 	Other minor fixes to various NPCs.
+//=     Other minor fixes to various NPCs.
 //= 2.7a Added end; :D (bugreport:2038) [Yommy]
 //= 2.8 Fixed donpcevent to doevent. (bugreport:2311) [SoulBlaker]
 //= 2.9 Reverted the change of donpcevent to doevent. [L0ne_W0lf]
@@ -27,7 +25,7 @@
 //= 3.1 Removed the need for use of 'goto.' [L0ne_W0lf]
 //= 3.2 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info).
 //= 3.3 Fixed waitingroom bug. [Euphy]
-//============================================================ 
+//============================================================
 
 gef_tower,111,37,4	script	Wizard Guildsman	70,{
 	if (Upper == 1) {
@@ -47,7 +45,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 			mes "Now, excuse me.";
 			next;
 			mes "[Catherine]";
-			if (sex)
+			if (Sex)
 				mes "Well, If you intended to ask me on a date... I appreciate it...hohoho.";
 			else
 				mes "Well, if you fix me up with a cute guy... I'd appreciate it...hohoho!.";
@@ -375,7 +373,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "You...*sigh*...I didn't think you would do such a dishonorable thing.";
 		next;
 		mes "[Catherine]";
-		if (sex) {
+		if (Sex) {
 			mes "Granted you're a mage, but how could a guy be so weak?!";
 			mes "Well, at least your alive still. Go back and try harder this time. ~tehehehe";
 		}
@@ -457,7 +455,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 			next;
 			mes "[Raulel]";
 			mes "Don't live dishonestly, or impolitely, or else one day you'll be caught in a spell you can't control, and BOOM, your dead!";
-			if (sex == 1) {
+			if (Sex) {
 				mes "If you don't want that to happen, then learn how to use spells properly!";
 				next;
 				mes "[Raulel]";
@@ -1962,9 +1960,9 @@ gef_tower,107,36,4	script	White Dog#wiz	81,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 Now using the initnpctimer command, donpcevent,
 //= and new waitingroom event commands.  No more addtimer spamming.
 //= No longer have to talk to the npc to take the test.  Just enter the chat room.
diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt
index a1f12d64b..ff15ab302 100644
--- a/npc/jobs/2-1a/AssassinCross.txt
+++ b/npc/jobs/2-1a/AssassinCross.txt
@@ -3,15 +3,15 @@
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,44,58,5	script	Assassin Cross#Valkyrie	725,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt
index ae96a122e..9c6109dba 100644
--- a/npc/jobs/2-1a/HighPriest.txt
+++ b/npc/jobs/2-1a/HighPriest.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,44,42,5	script	High Priest#Valkyrie	60,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt
index 58f1bfce8..6a152a5cb 100644
--- a/npc/jobs/2-1a/HighWizard.txt
+++ b/npc/jobs/2-1a/HighWizard.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
 	if (ADVJOB == 0 ||  Upper != 1) {
diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt
index ba998483e..f1254c08a 100644
--- a/npc/jobs/2-1a/LordKnight.txt
+++ b/npc/jobs/2-1a/LordKnight.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,44,39,5	script	Lord Knight#Valkyrie	56,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt
index cf5f4881e..de9b8e44e 100644
--- a/npc/jobs/2-1a/Sniper.txt
+++ b/npc/jobs/2-1a/Sniper.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,44,55,5	script	Sniper#Valkyrie	727,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt
index 42ac6164b..174fb2582 100644
--- a/npc/jobs/2-1a/WhiteSmith.txt
+++ b/npc/jobs/2-1a/WhiteSmith.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,44,50,5	script	MasterSmith#Valkyrie	731,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt
index 778aa09c9..d5797edd3 100644
--- a/npc/jobs/2-1e/StarGladiator.txt
+++ b/npc/jobs/2-1e/StarGladiator.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Star Gladiator Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Celestria, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Star Gladiator class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Updated to the Aegis Standards. [Samuray22]
 //= 1.1a Corrected a minor error respect to the header. [Samuray22]
 //= 1.1b Corrected NPC name length warning. [L0ne_W0lf]
 //= 1.1c Changed item names to item IDs. [Samuray22]
 //= 1.2 Another round of updates to the script. [L0ne_W0lf]
-//=	Removes the use of labels, and correcets other errors.
+//=     Removes the use of labels, and correcets other errors.
 //= 1.3 Added Quest Log commands. [Kisuka]
 //============================================================
 
@@ -1636,11 +1634,11 @@ job_star,161,33,0	script	Cheehee#job_star	77,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= A temp Star Gladiator Job Changer based on the kRO quest.
 //= Quest info from RagnaInfo.
 //= Sprites from kRO screenshots, bar two which I just had to guess at.
 //= 1.0 Optimized, updated [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index dd568b9ef..e0ea187ea 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -2,20 +2,20 @@
 //= Alchemist Job Quest
 //===== By: ==================================================
 //= nestor_zulueta (Fusion), converted by Darkchild
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Alchemist classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
+//=     No longer uses function "F_BlockHigh"
 //= 2.6 Corrected a bug in advanced class checking. [L0ne_W0lf]
 //= 2.7 Added missing checkweights. [L0ne_W0lf]
 //= 2.8 Fixed minor typo in test section. [L0ne_W0lf]
 //= 2.9 Added Quest Log commands. [Kisuka]
 //= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 	mes "[Parmy Gianino]";
@@ -175,7 +175,7 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 					mes "Come back to me when you have 50,000 Zeny, otherwise we can't process your application.";
 					close;
 				}
-				set zeny,zeny-50000;
+				set Zeny, Zeny-50000;
 				mes "[Parmy Gianino]";
 				mes "Let's see.";
 				mes "" + strcharinfo(0);
@@ -440,7 +440,7 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 				mes "Wait...";
 				mes "Maybe I've";
 				mes "misjudged you.";
-				if (sex == 1) {
+				if (Sex) {
 					mes "You might be a pretty boy,";
 					mes "but I can tell you're smart";
 					mes "from your eyes.";
@@ -1888,8 +1888,7 @@ alde_alche,145,19,1	script	Chief Researcher#am	57,{
 		}
 	}
 	else if (ALCH_Q == 22) {
-		set .@now_weight,MaxWeight-Weight;
-		if (.@now_weight < 1370) {
+		if (MaxWeight - Weight < 1370) {
 			mes "[Nicholas Flamel]";
 			mes "Whoa...";
 			mes "You're carrying too much stuff! First, put some of your things in Kafra Storage.";
@@ -1978,23 +1977,24 @@ alde_alche,145,19,1	script	Chief Researcher#am	57,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
-//= v1.0 Working.
-//= npc/quests/counteragent_mixture.txt Also Needed
-//= npc/quests/quests_yuno.txt Also Needed [Darkchild]
-//= v1.1 Fixed some minor bugs.  Optimized some lines. Re-organized the script a bit. 
-//= Giving Parmry NPC, Hammer and Old Book now waves the 50000 fee. (based of mRO website)
-//= Having a joblvl of 50 allows you to skip Rasputin's test. (based of mRO website) [kobra_k88]
+//============================================================
+//= 1.0 Working.
+//=     npc/quests/counteragent_mixture.txt Also Needed
+//=     npc/quests/quests_yuno.txt Also Needed [Darkchild]
+//= 1.1 Fixed some minor bugs.  Optimized some lines. Re-organized the script a bit. 
+//=     Giving Parmry NPC, Hammer and Old Book now waves the 50000 fee. (based of mRO website)
+//=     Having a joblvl of 50 allows you to skip Rasputin's test. (based of mRO website) [kobra_k88]
 //= 1.2 fixed a few typos (have to hunt more) [Lupus]
 //= 1.3 Added Baby Class Support [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 1.6a fixed some wrong answers, thanks to zlider for info [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.2 Got rid of 'al_morgen' var. Now uses (MISC_QUEST & 4) [Lupus]
 //= 2.3 Optimized, changed job numbers to constants. Fixed some spelling [Lupus]
 //= 2.4 Added alternative prizes according to JobLevel [Lupus]
 //= 2.4a Fixed 2 wrong answers in Rasputin's test [Lupus]
+//============================================================
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 77a81374f..3b7c5d509 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -2,9 +2,9 @@
 //= Bard Job Quest
 //===== By: ==================================================
 //= Muad_Dib(The Prometheus Project), Lupus, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.6
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Bard class
 //===== Additional Comments: =================================
@@ -80,7 +80,7 @@ comodo,226,123,5	script	Wandering Bard	741,{
 			mes "Always full of happy moments~";
 			next;
 			mes "[Lalo]";
-			if (sex) {
+			if (Sex) {
 				mes "Forget about your worries~";
 				mes "And enjoy everything~";
 			}
@@ -94,7 +94,7 @@ comodo,226,123,5	script	Wandering Bard	741,{
 	else if(BARD_Q == 0) {
 		cutin "job_bard_aiolo01",2;
 		mes "[Lalo]";
-		if (sex) mes "Hi! Delightful Archer.";
+		if (Sex) mes "Hi! Delightful Archer.";
 		else mes "Hello! Beautiful Archer Lady.";
 		mes "How can a wanderer like me help you?";
 		next;
@@ -935,9 +935,9 @@ S_ChangeJob:
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 07/06/05 : Added 1st Version. [Muad_Dib]
 //= Converted to rAthena format by Dr.Evil
 //= Info about gifts and other info --> http://www.ragnainfo.net/forums/viewtopic.php?t=51467&start=0 
@@ -946,5 +946,6 @@ S_ChangeJob:
 //= 1.2 Fixed wrong item ID, added missing commands [Lupus]
 //= 1.3 Updated flower sub-quest according to official [Lupus]
 //= 1.4 Changed priority for the gifts. Now you can win the 1st
-//= prize, too. Added Izidor flower [Lupus]
+//=     prize, too. Added Izidor flower [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
+//============================================================
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 3fa61960f..e11a45382 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -1,16 +1,14 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Crusader Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Made by: Black Dragon
 //= Converted by: Shin
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Crusader classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.2 Updated All NPCs to the officials one [Samuray22]
 //=     -Based on the ASB 4.0 Package.
 //=-Maybe need be checked the monsters in the test 2 and 4.
@@ -34,8 +32,8 @@
 //= 3.3 Removed the need for use of 'goto.' [L0ne_W0lf]
 //============================================================
 
-
-//=============== Senior Crusader: 1st Collect Items Test============================
+// Senior Crusader: 1st Collect Items Test
+//============================================================
 prt_castle,45,169,5	script	Senior Crusader	752,{
 	mes "[Michael Halig]";
 	if (Upper == 1) { //the baby classes were totally blocked... due to missing == 1
@@ -127,7 +125,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 					mes "Train yourself more as a Swordsman and wait for your calling. I understand your intent, but as of now, you cannot join us.";
 					close;
 				} 
-				if (Skillpoint) {
+				if (SkillPoint) {
 					mes "[Michael Halig]";
 					mes "You haven't finished learning everything as a Swordsman. Use all of your remaining skill points, and then return to me.";
 					close;
@@ -207,7 +205,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 			close;
 		}
 		mes "[Michael Halig]";
-		if (sex) mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
+		if (Sex) mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
 		else mes "As a woman of the sword, you must train diligently and constantly. Prepare yourself, for no one knows when the Holy War may be coming.";
 		close;
 	}
@@ -216,25 +214,25 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		next;
 		switch(CRUS_Q) {
 		case 1:
-			set @item1, 957;
-			set @item2, 959;
-			set @item3, 1099;
-			set @item4, 901;
+			set .@item1, 957;
+			set .@item2, 959;
+			set .@item3, 1099;
+			set .@item4, 901;
 			break;
-		Case 2:
-			set @item1, 932;
-			set @item2, 1043;
-			set @item3, 1098;
-			set @item4, 1094;
+		case 2:
+			set .@item1, 932;
+			set .@item2, 1043;
+			set .@item3, 1098;
+			set .@item4, 1094;
 			break;
-		Case 3:
-			set @item1, 958;
-			set @item2, 930;
-			set @item3, 1041;
-			set @item4, 1062;
+		case 3:
+			set .@item1, 958;
+			set .@item2, 930;
+			set .@item3, 1041;
+			set .@item4, 1062;
 			break;
 		}
-		if (countitem(@item1) > 9 && countitem(@item2) > 9 && countitem(@item3) > 9 && countitem(@item4) > 9) {
+		if (countitem(.@item1) > 9 && countitem(.@item2) > 9 && countitem(.@item3) > 9 && countitem(.@item4) > 9) {
 			mes "[Michael Halig]";
 			mes "Ah, well done.";
 			mes "I must acknowledge your efforts and determination. You may now proceed to take the next test.";
@@ -242,10 +240,10 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 			mes "[Michael Halig]";
 			mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
 			next;
-			delitem @item1, 10;
-			delitem @item2, 10;
-			delitem @item3, 10;
-			delitem @item4, 10;
+			delitem .@item1, 10;
+			delitem .@item2, 10;
+			delitem .@item3, 10;
+			delitem .@item4, 10;
 			set CRUS_Q, 4;
 			if(checkquest(3006) != -1) {
 				changequest 3006,3009;
@@ -264,10 +262,10 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		mes "Ah, you still have not completed the task I have given to you. Bring me the following items, and prove your will to become a Crusader to me...";
 		next;
 		mes "[Michael Halig]";
-		mes "10 ^3355FF"+getitemname(@item1)+"^000000";
-		mes "10 ^3355FF"+getitemname(@item2)+"^000000";
-		mes "10 ^3355FF"+getitemname(@item3)+"^000000";
-		mes "10 ^3355FF"+getitemname(@item4)+"^000000";
+		mes "10 ^3355FF"+getitemname(.@item1)+"^000000";
+		mes "10 ^3355FF"+getitemname(.@item2)+"^000000";
+		mes "10 ^3355FF"+getitemname(.@item3)+"^000000";
+		mes "10 ^3355FF"+getitemname(.@item4)+"^000000";
 		next;
 		mes "[Michael Halig]";
 		mes "If you put forth the effort, you'll be able to accomplish this task. May Odin protect you on your journeys.";
@@ -295,7 +293,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		mes "[Michael Halig]";
 		mes "Now you are";
 		mes "one of us!";
-		if (sex) mes "...Brother.";
+		if (Sex) mes "...Brother.";
 		else mes "...Comrade.";
 		next;
 		if(.@JobLevel != 50) getitem 504, 6;
@@ -314,7 +312,8 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 	close;
 }
 
-//===================== Suffering Man: 2nd Endurance Test ===============================================
+// Suffering Man: 2nd Endurance Test
+//============================================================
 prt_castle,164,32,1	script	Man in Anguish	733,{
 	mes "[Murnak Mijoul]";
 	if(BaseJob != Job_Swordman) {
@@ -346,7 +345,7 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 	else if(CRUS_Q == 4) {
 		mes "What is it...?";
 		mes "Do you have business";
-		if (sex) mes "with me, man of the sword?";
+		if (Sex) mes "with me, man of the sword?";
 		else mes "with me, woman of the sword?";
 		next;
 		if (select("I'd like to take the Crusader test.:Nothing.") == 1) {
@@ -447,7 +446,8 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 	close;
 }
 
-//===================== Gabriel Valentine: 3rd Knowledge Test =================================
+// Gabriel Valentine: 3rd Knowledge Test
+//============================================================
 prt_church,95,127,3	script	Crusader	745,{
 	mes "[Gabriel Valentine]";
 	if(BaseJob != Job_Swordman) {
@@ -795,7 +795,8 @@ prt_church,95,127,3	script	Crusader	745,{
 	close;
 }
 
-//===================== Crusader: 4th Purification Test =====================================================
+// Crusader: 4th Purification Test
+//============================================================
 prt_castle,35,151,5	script	Patron Knight	751,{
 	mes "[Bliant Piyord]";
 	mes "Welcome.";
@@ -970,8 +971,12 @@ prt_castle,35,151,5	script	Patron Knight	751,{
 
 
 
-//=== Actual tests ========================================
-//=== Endurance Test ======================================
+// Actual tests
+//============================================================
+
+//----------------------------------------------------------------------------
+// Endurance Test
+//----------------------------------------------------------------------------
 job_cru,1,1,1	script	Summoner#cr1	-1,{
 OnTimer300000:
 	donpcevent "Summoner#cr1::OnReset";
@@ -1205,7 +1210,9 @@ OnTouch:
 	end;
 }
 
-//=== Purification Test ===================================
+//----------------------------------------------------------------------------
+// Purification Test
+//----------------------------------------------------------------------------
 job_cru,24,187,4	script	Patron Knight#2	751,{
 	mes "[Bliant Piyord]";
 	mes "Welcome.";
@@ -1458,9 +1465,9 @@ OnStop:
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Need optimalization and fixing
 //= thanks to Komurka, KiLLaLeN, Lupus (fixing error)
 //= just a temp Job Quest
@@ -1478,4 +1485,5 @@ OnStop:
 //=     Hand of God allow to skip item gathering [DracoRPG]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Fixed endless loop, wrong condition check [Lupus]
-//=	also changed all job numbers to constants, fixed logic
+//=     also changed all job numbers to constants, fixed logic
+//============================================================
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index b52d808fd..88157d40b 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -1,18 +1,16 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Dancer Job Quest
 //===== By: ==================================================
 //= Kalen - Original jAthena
 //= Fredzilla - Converted, Lupus
-//===== Current Version: ===================================== 
-//= 3.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 3.7a
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Dancer classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 3.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
+//=     No longer uses function "F_BlockHigh"
 //= 3.2a Deleted unused variables. [Samuray22]
 //= 3.3 Updated waiting room. (Removes global var) [L0ne_W0lf]
 //= 3.4 Fixed bad variables, bugreport:1685 [Brainstorm]
@@ -20,6 +18,7 @@
 //= 3.6 Applied Correction bug with for loop. [L0ne_W0lf]
 //= 3.6a Fixed a little Exploit to bug the quest with a timeout. (bugreport:2252) [Samuray22]
 //= 3.7 Added Quest Log commands. [Kisuka]
+//= 3.7a Fixed a label execution. [Euphy]
 //============================================================
 
 comodo,180,153,4	script	Sonotora#1	90,{
@@ -132,7 +131,7 @@ job_duncer,43,93,4	script	Aile#da	724,{
 		cutin "",255;
 		end;
 	}
-	if (DANC_Q == 0 && sex == 0 && BaseJob == Job_Archer) {
+	if (DANC_Q == 0 && Sex == 0 && BaseJob == Job_Archer) {
 		cutin "job_dancer_eir01",2;
 		mes "[Aile]";
 		mes "Welcome~!";
@@ -208,7 +207,7 @@ job_duncer,43,93,4	script	Aile#da	724,{
 		cutin "",255;
 		end;
 	}
-	else if (sex == 1) {
+	else if (Sex == 1) {
 		cutin "job_dancer_eir03",2;
 		mes "[Aile]";
 		mes "Welco--Mmm?";
@@ -317,7 +316,7 @@ job_duncer,43,93,4	script	Aile#da	724,{
 			mes "tuition fee.";
 			next;
 			cutin "job_dancer_eir01",2;
-			set zeny,zeny-10000;
+			set Zeny, Zeny-10000;
 			mes "[Aile]";
 			mes "Next, go to ^CD6889Bijou^000000, who is in charge of the interviewing process. She will have a couple of things she'll need to ask you.";
 			set DANC_Q,5;
@@ -893,7 +892,7 @@ job_duncer,95,93,4	script	Bijou#da	101,{
 } 
 
 // Waiting Room
-//============================================================ 
+//============================================================
 job_duncer,32,154,1	script	Waiting Room#dance	66,{
 	end;
 
@@ -935,7 +934,7 @@ job_duncer,32,154,1	script	Waiting Room#click	66,{
 }
 
 // Dance Timer
-//============================================================ 
+//============================================================
 job_duncer,69,105,0	script	Bijou#dance_timer	-1,{
 OnEnable:
 	initnpctimer;
@@ -1288,7 +1287,7 @@ OnEnable:
 }
 
 // Dance Move Triggers
-//============================================================ 
+//============================================================
 -	script	dancestep::StepTrigger	-1,1,1,{
 OnTouch:
 	donpcevent "Backdancer#1::OnOmg";
@@ -1322,19 +1321,19 @@ OnDisable:
 }
 
 // Backup Dancers
-//============================================================ 
-job_duncer,63,110,4	script	Backdancer#1::BackDancer	724,{
+//============================================================
+job_duncer,63,110,4	script	Backdancer#1	724,{
 	end;
 
 OnSmile:
-	Emotion e_no1;
+	emotion e_no1;
 	donpcevent "Backdancer#2::OnSmile";
 	donpcevent "Backdancer#3::OnSmile";
 	donpcevent "Backdancer#4::OnSmile";
 	end;
 
 OnOmg:
-	Emotion e_omg;
+	emotion e_omg;
 	donpcevent "Backdancer#2::OnOmg";
 	donpcevent "Backdancer#3::OnOmg";
 	donpcevent "Backdancer#4::OnOmg";
@@ -1345,11 +1344,11 @@ job_duncer,66,113,4	script	Backdancer#2	724,{
 	end;
 
 OnSmile:
-	Emotion e_no1;
+	emotion e_no1;
 	end;
 
 OnOmg:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
@@ -1357,11 +1356,11 @@ job_duncer,72,113,4	script	Backdancer#3	724,{
 	end;
 
 OnSmile:
-	Emotion e_no1;
+	emotion e_no1;
 	end;
 
 OnOmg:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
@@ -1369,17 +1368,17 @@ job_duncer,75,110,4	script	Backdancer#4	724,{
 	end;
 
 OnSmile:
-	Emotion e_no1;
+	emotion e_no1;
 	end;
 
 OnOmg:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 Removed the warp I left here my accident, added a check for using 
 //=     Improved Concentration and arrow shower, people could get away with it
 //=     [Fredzilla]
@@ -1389,14 +1388,15 @@ OnOmg:
 //=     along with some optimization. [Fredzilla]
 //= 1.5 Added Baby Class Support [Fredzilla]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Script check #1. [Lance]
 //= 2.2 Fixed unpassable part, thx2 Alis [Lupus]
 //= 2.3 Updated initnpctimer to attach player to jobDq script [Skotlex]
 //= 2.4 Attached chrid to be able obtain player's SP on mobs death, optimized a bit [Lupus]
 //= 2.5 Final fix of chrid issues, changed 'Improved
-//=	Concentration' to 'Attention Concentrate' [Lupus]
+//=     Concentration' to 'Attention Concentrate' [Lupus]
 //= 3.0 Some optimization, typos, added missing dialogues (4Kb lighter) [Lupus]
 //= 3.1 Implemented JOBLVL as in other quests [Lupus]
+//============================================================
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 125c01034..ddcce606c 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -1,22 +1,20 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Monk Job Quest
 //===== By: ==================================================
 //= Dino9021, Edited / Translated by Celest
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Monk classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
+//=     No longer uses function "F_BlockHigh"
 //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.3a Deleted unused variables. [Samuray22]
 //= 2.4 Added Quest Log commands. [Kisuka]
 //= 2.5 Removed the need for use of 'goto.' [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 prt_monk,59,247,1	script	Guarding Monk#mk	120,6,2,{
 	if (Upper == 1) {
@@ -2600,25 +2598,27 @@ monk_test,137,338,1	script	switchreset#monkmonk	79,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Monsters of Mushroom Collecting
-//============================================================ 
+//============================================================
 job_monk,0,0,0,0	monster	Thief Mushroom	1182,70,0,0,0
 job_monk,0,0,0,0	monster	Thief Bug Larva	1051,20,0,0,0
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 Fixed missing '";'. Now it's loading fine [Lupus]
 //= 1.1+ Edited/Translated 5% [Celest]
 //= 1.2 Made Poetry Quiz passable, Fixed Marathon Part [Lupus]
 //= 1.3 Added Baby Class Support [Lupus]
 //= 1.5 Fixed possible EXP abuse [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus] 1.7 Fixed warps19/20 [Yor]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
+//= 1.7 Fixed warps19/20 [Yor]
 //= 1.8 Fixed bugs. Fixed Green Potion exploit. Getting rid of Jfunc mess [Lupus]
 //= 1.9 Added a missing check in Fuhai and fixed a LOT of Engrish. [Zephiris]
 //= 1.9b Fixed another bug in Fuhai. [Zephiris]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Removed Duplicates [Silent]
+//============================================================
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index e8ce1904f..4c7b5ac4f 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -1,27 +1,25 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Rogue Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.9
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Rogue classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
+//=     No longer uses function "F_BlockHigh"
 //= 2.4a Deleted unused variables. [Samuray22]
 //= 2.4b Changed a Problem with JobLevel what made 
-//=	impossible get a Gladius [3]. (bugreport:481) [Samuray22]
+//=     impossible get a Gladius [3]. (bugreport:481) [Samuray22]
 //= 2.4c Corrected a Typo error ";;" and a typo error with "rouge". (bugreport:909) [Samuray22]
 //= 2.5 Added dummy "OnMyMobDead" labels. (bugreport:1100) [L0ne_W0lf]
 //= 2.6 Fixed a few bugs in the Rogue Guildsman. [L0ne_W0lf]
 //= 2.7 Fixed a bug on Markie question 5, bugreport:1600 [Brainstorm]
 //= 2.8 Moved "Thug" to Morroc Ruins. [L0ne_W0lf]
 //= 2.9 Added Quest Log commands. [Kisuka]
-//============================================================ 
+//============================================================
 
 moc_ruins,86,103,1	script	Thug#rg	118,{
 	mes "[Thug]";
@@ -84,7 +82,7 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 				mes "[Rogue Guildsman]";
 				mes "So what's a kid";
 				mes "like you doin' here?";
-				if (sex == 1) {
+				if (Sex) {
 					mes "Oh, I get it now...";
 					mes "The widdle boy wants";
 				}
@@ -656,14 +654,14 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 		else if (ROGUE_Q == 4) callsub S_CheckItems,511,10,910,10,926,10,964,10;
 		else if (ROGUE_Q == 5) callsub S_CheckItems,508,10,948,10,935,10,940,10;
 		else if (ROGUE_Q == 6) {
-			if (zeny > 9999 && countitem(915) > 4 && countitem(713) > 4 && countitem(1002) > 4 &&
+			if (Zeny > 9999 && countitem(915) > 4 && countitem(713) > 4 && countitem(1002) > 4 &&
 			countitem(953) > 4 && countitem(507) > 4 && countitem(919) > 4 && countitem(715) > 4 &&
 			countitem(913) > 4 && countitem(904) > 4 && countitem(942) > 4 && countitem(528) > 4 &&
 			countitem(914) > 4 && countitem(705) > 4 && countitem(916) > 4 && countitem(917) > 4 &&
 			countitem(908) > 4 && countitem(945) > 4) {
 				mes "[Mr. Smith]";
 				mes "Ummm...let's see...";
-				set zeny,zeny-10000;
+				set Zeny, Zeny-10000;
 				delitem 915,5; //Chrysalis
 				delitem 713,5; //Empty_Bottle
 				delitem 1002,5; //Iron_Ore
@@ -976,7 +974,7 @@ S_CheckItems:
 	if (Zeny > 9999 && countitem(getarg(0)) >= getarg(1) && countitem(getarg(2)) >= getarg(3) && countitem(getarg(4)) >= getarg(5) && countitem(getarg(6)) >= getarg(7)) {
 		mes "[Mr. Smith]";
 		mes "Okay, we've got the application fee, ^FF000010,000 zeny^000000, "+getarg(1)+" "+getitemname(getarg(0))+", "+getarg(3)+" "+getitemname(getarg(2))+", "+getarg(5)+" "+getitemname(getarg(4))+" and "+getarg(7)+" "+getitemname(getarg(6))+"...";
-		set zeny,zeny-10000;
+		set Zeny, Zeny-10000;
 		delitem getarg(0),getarg(1);
 		delitem getarg(2),getarg(3);
 		delitem getarg(4),getarg(5);
@@ -2012,19 +2010,20 @@ in_rogue,399,286,1	script	switch#rogreset	88,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 fixed 3 wrong questions, added missing lines [Lupus]
 //= 1.3 Baby Class Support + 40/50 JobLevel Item fix [Lupus]
 //= 1.5 Fixed possible EXP abuse [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Removed Duplicates [Silent]
 //= 2.2 Merged JFunc [Lupus]
 //= 2.3 Added a possibility for players doing Meginjyard quest
-//= to enter Rogue guild as there's a NPC inside [SinSloth]
+//=     to enter Rogue guild as there's a NPC inside [SinSloth]
 //= 2.3a fixed test4 person interaction, let BABY thieves pass
-//=	the test, too [Lupus]
+//=     the test, too [Lupus]
+//============================================================
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 1e188778e..a425495b3 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -4,14 +4,14 @@
 //= jAthena (0.9) - I guess
 //= Unknown Translator (1.0)
 //= Darkchild (1.2)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.8
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Sage classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.1 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
+//=     No longer uses function "F_BlockHigh"
 //= 2.2 Small bug fix (== -> !=) thanks to Saithis. [L0ne_W0lf]
 //= 2.2b ANotehr smaLL bugfix, pointed out by Cara. [L0ne_W0lf]
 //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
@@ -19,13 +19,13 @@
 //= 2.4a Deleted unused variables. [Samuray22]
 //= 2.5 Updated waiting room. (Removes global var) [L0ne_W0lf]
 //= 2.5a Corrected some "mes"s without the getitemname. (bugreport:1564) [Samuray22]
-//	-Changed an incorrect "!=" to "==". (bugreport:1572) 
-//	-And Small Typo Error
+//=     -Changed an incorrect "!=" to "==". (bugreport:1572) 
+//=     -And Small Typo Error
 //= 2.6 Fixed Kayron Grik cutin not being removed as reported by jc1991, bugreport:1825 [Brainstorm]
 //= 2.6a Fixed a Little Bug with Whispers Summoned in the Last Test. (bugreport:2253) [Samuray22]
 //= 2.7 Added Quest Log commands. [Kisuka]
 //= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 yuno_in02,38,61,5	script	Dean of the Academy#sa	743,{
 	cutin "job_sage_kayron",2;
@@ -343,7 +343,7 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	742,{
 				next;
 				if (select("Pay 70,000 zeny.:Give him Old Magicbook and Necklace of Wisdom.") == 1) {
 					if (Zeny > 69999) {
-						set zeny,zeny-70000;
+						set Zeny, Zeny-70000;
 						mes "[Metheus Sylphe]";
 						mes "Thank you, your application has been accepted.";
 						mes "Next, you will take an entrance test.";
@@ -515,7 +515,7 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	742,{
 			next;
 		}
 		else if (Zeny > 69999) {
-			set zeny,zeny-70000;
+			set Zeny, Zeny-70000;
 			mes "[Metheus Sylphe]";
 			mes "Well done. Let me proceed with your application request.";
 			set SAGE_Q,4;
@@ -545,7 +545,7 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	742,{
 				if (Zeny > 29999) {
 					for (set .@i, 0; .@i < .@size ; set .@i, .@i+1)
 						delitem .@item[.@i], .@count[.@i];  
-					set zeny,zeny-30000;
+					set Zeny, Zeny-30000;
 					mes "[Metheus Sylphe]";
 					mes "Well done. Let me proceed with your application request.";
 					set .@SAGE_Q_T,SAGE_Q;
@@ -2891,9 +2891,9 @@ OnTimer9000:
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Script mostly based on translated jA script
 //= Written test questions/answers weren't translated 100% corectly
 //= So a lot of those are based upon mRO site and my own info
diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt
index 5e080f304..706722504 100644
--- a/npc/jobs/2-2a/Champion.txt
+++ b/npc/jobs/2-2a/Champion.txt
@@ -3,15 +3,15 @@
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,53,42,3	script	Champion#Valkyrie	52,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt
index 656557647..3c007abe7 100644
--- a/npc/jobs/2-2a/Clown.txt
+++ b/npc/jobs/2-2a/Clown.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //= 1.3a Corrected a Little Typo error. [Samuray22]
-//	-Thanks to Myllena.
-//============================================================ 
+//=     Thanks to Myllena.
+//============================================================
 
 valkyrie,53,54,3	script	Minstrel#Valkyrie	741,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt
index 3b85907e9..0c93c49b2 100644
--- a/npc/jobs/2-2a/Creator.txt
+++ b/npc/jobs/2-2a/Creator.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt
index 95503a1ba..f0a2c2c18 100644
--- a/npc/jobs/2-2a/Gypsy.txt
+++ b/npc/jobs/2-2a/Gypsy.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,53,56,3	script	Gypsy#Valkyrie	101,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-2a/Paladin.txt b/npc/jobs/2-2a/Paladin.txt
index 7589ff3f6..ea240bba2 100644
--- a/npc/jobs/2-2a/Paladin.txt
+++ b/npc/jobs/2-2a/Paladin.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,53,39,3	script	Paladin#Valkyrie	752,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt
index b6b38afdc..cffe3c0e4 100644
--- a/npc/jobs/2-2a/Professor.txt
+++ b/npc/jobs/2-2a/Professor.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,53,47,3	script	Scholar#Valkyrie	743,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-2a/Stalker.txt b/npc/jobs/2-2a/Stalker.txt
index a2a26e135..6f6f86235 100644
--- a/npc/jobs/2-2a/Stalker.txt
+++ b/npc/jobs/2-2a/Stalker.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
 valkyrie,53,58,3	script	Stalker#Valkyrie	747,{
 	if (ADVJOB == 0 || Upper != 1) {
diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index 13520c537..98e8084c1 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -1,26 +1,25 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Soul Linker Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Celestria & Samuray22
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.6
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Soul Linker class.
 //= [Vars Used]
 //= SOUL_Q = Job Change Phase. (Max 4)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.2 Rescripted to Aegis 10.3 standards. [Samuray22]
 //= 1.3 Slight updates and fixes to the script. [L0ne_W0lf]
-//=	Removes the use of labels, and corrects other errors.
-//=	Removed the GM-use only NPC from the sec_in map. 
-//=	No longer used a global var, uses an NPC var instead.
+//=     Removes the use of labels, and corrects other errors.
+//=     Removed the GM-use only NPC from the sec_in map. 
+//=     No longer used a global var, uses an NPC var instead.
 //= 1.3a Deleted Empty Color Tag. (bugreport:1572) [Samuray22]
 //= 1.4 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.5 Added Quest Log commands. [Kisuka]
-//============================================================ 
+//= 1.6 Updated to match the latest official script. [Euphy]
+//============================================================
 
 morocc_in,174,30,6	script	Kid#link1	716,{
 	if (Class == Job_Soul_Linker) {
@@ -399,6 +398,13 @@ OnTouch:
 				mes "if you talk to me later...";
 				close;
 			}
+			if (ismounting()) {
+				mes "[Maia]";
+				mes "You are on a riding pet,";
+				mes "so you cannot change your job.";
+				mes "Please unequip your riding pet and try again!";
+				close;
+			}
 			mes "[Maia]";
 			mes "Then let us begin the";
 			mes "ceremony. These items will";
@@ -432,9 +438,13 @@ OnTouch:
 			mes "powers as a Soul Linker";
 			mes "wisely and for just purposes.";
 			next;
+			if (SkillPoint) {
+				mes "^0000ffYou still have unused skill points. Please use all remaining skill points and try again!^000000";
+				close;
+			}
 			completequest 6008;
 			callfunc "Job_Change",Job_Soul_Linker;
-			callfunc "F_ClearJobVar";		// clears all job variables for the current player
+			callfunc "F_ClearJobVar";	// clears all job variables for the current player
 			set SOUL_Q,0;
 			mes "[Maia]";
 			mes "I wish the best of luck";
@@ -653,11 +663,48 @@ OnTimer183000:
 	stopnpctimer;
 }
 
-//============================================================ 
+sec_in02,35,153,0	script	Soul Linker Var	871,{
+	callfunc "F_GM_NPC";
+	mes "[Soul Linker Var]";
+	mes "I can reset the Soul Linker";
+	mes "NPCs if a Soul Linker candidate";
+	mes "encounters a problem during the";
+	mes "end of the job quest. Please do";
+	mes "not use this function if players are still in the Quest Map.";
+	next;
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "[Soul Linker Var]";
+		mes "Password";
+		mes "is incorrect.";
+		close;
+	} else {
+		mes "[Soul Linker Var]";
+		mes "Would you like to";
+		mes "reset the Soul Linker";
+		mes "Global Variable?";
+		next;
+		switch(select("Reset:Cancel")) {
+		case 1:
+			mes "[Soul Linker Var]";
+			mes "The Soul Linker";
+			mes "Job Quest NPCs";
+			mes "have been reset.";
+			set getvariableofnpc(.SoulLinkerTest,"Kid#link1"),0;
+			close;
+		case 2:
+			mes "[Soul Linker Var]";
+			mes "You have canceled";
+			mes "this command.";
+			close;
+		}
+	}
+}
+
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= A temp Soul Linker Job Changer based on the kRO quest.
 //= Quest info from RagnaInfo. Sprites from kRO screenshots
-//= 1.0	Optimized and updated [Lupus]
+//= 1.0 Optimized and updated [Lupus]
 //= 1.1 Fixed NPC names according to iRO [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index 4720d7283..434ead038 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.txt
@@ -1,24 +1,22 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Super Novice Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Darkchild
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN r15340+
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Super Novice Job Change Npc
 //= Super Novice Cart Rental Npc
 //= Some Other Useless Super Novice Npc
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.9 Rescripted to the Aegis 10.3 Standars. [Samuray22]
 //= 2.0 Rescripted again, this time using an iRO base. [L0ne_W0lf]
 //= 2.1 Swapped use of baseclass for basejob. [L0ne_W0lf]
 //= 2.2 Added Quest Log commands. [Kisuka]
 //= 2.3 NPC "Esseray" calls Ex. Super Novice script when enabled. [Euphy]
 //= 2.4 Added an Ex. Super Novice dialog check. [Euphy]
-//============================================================ 
+//============================================================
 
 aldeba_in,223,167,3	script	Tzerero#sn	709,{
 	if (BaseJob == Job_SuperNovice) {
@@ -336,7 +334,8 @@ aldeba_in,216,169,5	script	Esseray#sn	86,{
 		close;
 	}
 	if (BaseJob == Job_SuperNovice) {
-		if (is_function("Esseray_Ex")) callfunc "Esseray_Ex";
+		if (checkre(0))
+			callfunc "Esseray_Ex";
 		mes "[Esseray]";
 		mes "Hm? Hey, you're a member";
 		mes "of our great Novice Society,";
@@ -432,7 +431,7 @@ aldebaran,54,238,5	script	Kafra Employee#sn	117,{
 				}
 				if (Zeny >= 1899) {
 					set RESRVPTS, RESRVPTS + 190;
-					set zeny,zeny-1900;
+					set Zeny, Zeny-1900;
 					if (getskilllv("MC_PUSHCART") > 0) setcart;
 					mes "[Kafra Employee]";
 					mes "Thank you for using my service.";
@@ -468,14 +467,14 @@ aldebaran,54,238,5	script	Kafra Employee#sn	117,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Dialogs From Some Other Scripts (Most Of It)
 //= 1.3-1.5 Added Baby class support (and to the Kafta SN Cart
-//= renter, too) [Lupus]
+//=     renter, too) [Lupus]
 //= 1.6 Added a fix which prevent High Novices passing
-//= this Job Quests again. [Lupus]
+//=     this Job Quests again. [Lupus]
 //= 1.7 Fixed Baby Class Support. [Lupus]
 //= 1.8 Now a Baby can become a Super Baby [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index c2357d0bb..8b44c6d34 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -1,17 +1,15 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Valkyrie Realm
 //===== By: ==================================================
 //= Nana, fixes by Poki
 //= finished, optimized and tested by Lupus
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.1
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Quest to become a Tranceded Class. (Advanced/Rebirthed)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Made all into functions,additional checks,quest skills,now Valhallana can return you back. She also makes reborn process only when you got no Zeny/items (as in kRO) [Lupus]
 //= 1.2 now alternative classes can use their 1-1 job NPC to become Advanced 1st Class [Lupus]
 //= 1.4 added Baby Class support [Lupus]
@@ -28,17 +26,17 @@
 //= 2.5 Fixed a stuck bug [Lupus]
 //= 2.6a Adding proper dialogues [Lupus]
 //= 2.7 Rescripted to Aegis 10.3 standards. [L0ne_W0;f]
-//=	Removed all functions as they are no longer required.
-//=	Correct job level requirements for 1-1 -> 2-x.
+//=     Removed all functions as they are no longer required.
+//=     Correct job level requirements for 1-1 -> 2-x.
 //= 2.7a Added Function "F_BlockHigh" back in until rewriteing of the 2-x [L0ne_W0lf]
-//=	scripts are comepleted.
+//=     scripts are comepleted.
 //= 2.7b Removed function "F_BlockHigh" as it's no longer used. [L0ne_W0lf]
 //= 2.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.9 Corrected Valkyrie case spicifying where to warp after rebirthing. [L0ne_W0lf]
 //= 2.9b Fixed Verdandi typo, fixed resetting vars [Lupus]
 //= 3.0 Added quest log commands. [L0ne_W0lf]
-//= 3.1 Added Izlude Renewal coordinates. [L0ne_W0lf]
-//============================================================ 
+//= 3.1 Added Izlude Renewal coordinates.
+//============================================================
 
 valkyrie,48,86,4	script	Valkyrie#	811,{
 	if (ADVJOB != 0 || Upper == 1) {
@@ -54,7 +52,7 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 		mes "Honor to the warriors!";
 		close;
 	}
-	else if (Baselevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
+	else if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
 		mes "[Valkyrie]";
 		mes "Welcome";
 		mes "to Valhalla,";
@@ -173,10 +171,8 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 			switch (ADVJOB) {
 			case 4008:
 			case 4015:
-				if (checkre(0))
-					warp "izlude",129,97;
-				else
-					warp "izlude",94,103;
+				if (checkre(0)) warp "izlude",129,97;
+				else warp "izlude",94,103;
 				break;
 			case 4009:
 			case 4016:
@@ -215,7 +211,7 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 }
 
 yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
-	if (Baselevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
+	if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
 		if (valkyrie_Q == 0) {
 			mes "[Metheus Sylphe]";
 			mes "Welcome to the Library of the Schweicherbil Magic Academy.";
@@ -235,7 +231,7 @@ yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
 			next;
 			if (select("Donate.:Cancel.") == 1) {
 				if (Zeny >= 1285000) {
-					set zeny,zeny-1285000;
+					set Zeny, Zeny-1285000;
 					set valkyrie_Q,1;
 					mes "[Metheus Sylphe]";
 					mes "Thank you, your donation will be used for a good cause. You may";
@@ -280,7 +276,7 @@ yuno_in02,93,207,1	script	Book of Ymir	111,{
 		warp "valkyrie",48,8;
 		end;
 	}
-	else if (Baselevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
+	else if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
 		if (valkyrie_Q != 0) {
 			mes "[The Book of Ymir]";
 			mes "...Therefore, ancient heroes were";
@@ -348,7 +344,7 @@ yuno_in02,93,207,1	script	Book of Ymir	111,{
 }
 
 yuno_in05,49,43,1	script	Heart of Ymir	111,{
-	if (Baselevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
+	if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
 		if (valkyrie_Q == 2) warp "valkyrie",48,8;
 	}
 	end;
@@ -382,10 +378,8 @@ valkyrie,44,33,5	script	Teleporter	124,{
 		case 4: callsub S_Warpchar,"geffen",120,39;
 		case 5: callsub S_Warpchar,"alberta",117,56;
 		case 6:
-			if (checkre(0))
-				callsub S_Warpchar,"izlude",129,97;
-			else
-				callsub S_Warpchar,"izlude",94,103;
+			if (checkre(0)) callsub S_Warpchar,"izlude",129,97;
+			else callsub S_Warpchar,"izlude",94,103;
 		case 7: callsub S_Warpchar,"aldebaran",91,105;
 		case 8: callsub S_Warpchar,"comodo",209,143;
 		case 9: callsub S_Warpchar,"yuno",328,101;
@@ -401,7 +395,7 @@ S_WarpChar:
 }
 
 // Warps
-//============================================================ 
+//============================================================
 valkyrie,48,73,0	warp	valk01#1	1,1,valkyrie,48,64
 valkyrie,48,66,0	warp	valk01#2	1,1,valkyrie,48,75